user32/listbox: Use is_item_selected in more places.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Gabriel Ivăncescu 2019-02-14 14:06:46 +02:00 committed by Alexandre Julliard
parent 8ffe69d705
commit e0e939501f

View file

@ -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;