[PATCH 7/9] user32/listbox: Use is_item_selected in more places
Gabriel Ivăncescu
gabrielopcode at gmail.com
Thu Feb 14 06:06:46 CST 2019
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
---
dlls/user32/listbox.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c
index 7646486..f2d12ed 100644
--- a/dlls/user32/listbox.c
+++ b/dlls/user32/listbox.c
@@ -1442,7 +1442,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);
}
@@ -1451,7 +1451,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);
}
@@ -2091,7 +2091,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
@@ -2101,13 +2101,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 );
}
}
@@ -2427,7 +2427,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
More information about the wine-devel
mailing list