From: Gabriel Ivăncescu Subject: [PATCH v5 7/9] comctl32/listbox: Use is_item_selected in more places Message-Id: <27e5a491b67129c4500d15a15d1495e8b7158835.1550068339.git.gabrielopcode@gmail.com> Date: Wed, 13 Feb 2019 16:36:18 +0200 In-Reply-To: <11333f7ce22359311af049afdfeb56e71fc1a611.1550068339.git.gabrielopcode@gmail.com> References: <11333f7ce22359311af049afdfeb56e71fc1a611.1550068339.git.gabrielopcode@gmail.com> Signed-off-by: Gabriel Ivăncescu --- dlls/comctl32/listbox.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index a6f7bd5..47c76ad 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1434,7 +1434,7 @@ static LRESULT LISTBOX_SelectItemRange( LB_DESCR *descr, INT first, { for (i = first; i <= last; i++) { - if (descr->items[i].selected) continue; + if (is_item_selected(descr, i)) continue; descr->items[i].selected = TRUE; LISTBOX_InvalidateItemRect(descr, i); } @@ -1443,7 +1443,7 @@ static LRESULT LISTBOX_SelectItemRange( LB_DESCR *descr, INT first, { for (i = first; i <= last; i++) { - if (!descr->items[i].selected) continue; + if (!is_item_selected(descr, i)) continue; descr->items[i].selected = FALSE; LISTBOX_InvalidateItemRect(descr, i); } @@ -2079,7 +2079,7 @@ static LRESULT LISTBOX_HandleLButtonDown( LB_DESCR *descr, DWORD keys, INT x, IN { LISTBOX_SetCaretIndex( descr, index, FALSE ); LISTBOX_SetSelection( descr, index, - !descr->items[index].selected, + !is_item_selected(descr, index), (descr->style & LBS_NOTIFY) != 0); } else @@ -2089,13 +2089,13 @@ static LRESULT LISTBOX_HandleLButtonDown( LB_DESCR *descr, DWORD keys, INT x, IN if (descr->style & LBS_EXTENDEDSEL) { LISTBOX_SetSelection( descr, index, - descr->items[index].selected, + is_item_selected(descr, index), (descr->style & LBS_NOTIFY) != 0 ); } else { LISTBOX_SetSelection( descr, index, - !descr->items[index].selected, + !is_item_selected(descr, index), (descr->style & LBS_NOTIFY) != 0 ); } } @@ -2415,7 +2415,7 @@ static LRESULT LISTBOX_HandleKeyDown( LB_DESCR *descr, DWORD key ) else if (descr->style & LBS_MULTIPLESEL) { LISTBOX_SetSelection( descr, descr->focus_item, - !descr->items[descr->focus_item].selected, + !is_item_selected(descr, descr->focus_item), (descr->style & LBS_NOTIFY) != 0 ); } break; -- 2.20.1