commit 7c55bc0cd61ba72130b4d1699d163150f64acddb
author Ulrich Czekalla <ulrichc@codeweavers.com> Fri Dec 15 22:58:25 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Dec 15 22:58:25 2000 +0000
tree 444e6225defc32a92542920380d8da670d24bb5e
parent 7d6467649f09c4131a62ba86486f98c95d89de59

Only capture mouse when an item is selected.

controls/listbox.c

diff --git a/controls/listbox.c b/controls/listbox.c
index aa63fa7..06faf13 100644
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -1927,39 +1927,39 @@
                                              : descr->lphc->self->hwndSelf );
     }
 
-    if (index != -1)
-    {
-        if (descr->style & LBS_EXTENDEDSEL)
-        {
-	    /* we should perhaps make sure that all items are deselected
-	       FIXME: needed for !LBS_EXTENDEDSEL, too ?
-	    if (!(wParam & (MK_SHIFT|MK_CONTROL)))
-		LISTBOX_SetSelection( wnd, descr, -1, FALSE, FALSE);
-	    */
+    if (index == -1) return 0;
 
-            if (!(wParam & MK_SHIFT)) descr->anchor_item = index;
-            if (wParam & MK_CONTROL)
-            {
-                LISTBOX_SetCaretIndex( wnd, descr, index, FALSE );
-                LISTBOX_SetSelection( wnd, descr, index,
-                                      !descr->items[index].selected,
-                                      (descr->style & LBS_NOTIFY) != 0);
-            }
-            else LISTBOX_MoveCaret( wnd, descr, index, FALSE );
-        }
-        else
+    if (descr->style & LBS_EXTENDEDSEL)
+    {
+        /* we should perhaps make sure that all items are deselected
+           FIXME: needed for !LBS_EXTENDEDSEL, too ?
+           if (!(wParam & (MK_SHIFT|MK_CONTROL)))
+           LISTBOX_SetSelection( wnd, descr, -1, FALSE, FALSE);
+        */
+
+        if (!(wParam & MK_SHIFT)) descr->anchor_item = index;
+        if (wParam & MK_CONTROL)
         {
-            LISTBOX_MoveCaret( wnd, descr, index, FALSE );
+            LISTBOX_SetCaretIndex( wnd, descr, index, FALSE );
             LISTBOX_SetSelection( wnd, descr, index,
-                                  (!(descr->style & LBS_MULTIPLESEL) ||
-                                   !descr->items[index].selected),
-                                  (descr->style & LBS_NOTIFY) != 0 );
+                                  !descr->items[index].selected,
+                                  (descr->style & LBS_NOTIFY) != 0);
         }
+        else LISTBOX_MoveCaret( wnd, descr, index, FALSE );
+    }
+    else
+    {
+        LISTBOX_MoveCaret( wnd, descr, index, FALSE );
+        LISTBOX_SetSelection( wnd, descr, index,
+                              (!(descr->style & LBS_MULTIPLESEL) ||
+                               !descr->items[index].selected),
+                              (descr->style & LBS_NOTIFY) != 0 );
     }
 
     descr->captured = TRUE;
     SetCapture( wnd->hwndSelf );
-    if (index != -1 && !descr->lphc)
+
+    if (!descr->lphc)
     {
         if (descr->style & LBS_NOTIFY )
             SendMessageA( descr->owner, WM_LBTRACKPOINT, index,