commit 61b15de4bae3ffbba72189ad3cd65eaab765f82e
author Rein Klazes <rklazes@casema.net> Mon Sep 27 11:38:47 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Sep 27 11:38:47 1999 +0000
tree 30636963cf62965bbd319ef84f2a92c59630ace2
parent 3d06d20bab37ad4e3bd86cbbfe2aeefac7dee2d9

Use an extra bit in the button status byte to flag whether the
DefButtonWndProc should process the WM_LBUTTONUP message.

controls/button.c

diff --git a/controls/button.c b/controls/button.c
index 147d82b..5ca6457 100644
--- a/controls/button.c
+++ b/controls/button.c
@@ -137,27 +137,31 @@
         break;
 
     case WM_LBUTTONDBLCLK:
-	if(wndPtr->dwStyle & BS_NOTIFY || 
-		style==BS_RADIOBUTTON ||
-		style==BS_USERBUTTON ||
-		style==BS_OWNERDRAW){
-	    SendMessageA( GetParent(hWnd), WM_COMMAND,
-		    MAKEWPARAM( wndPtr->wIDmenu, BN_DOUBLECLICKED ), hWnd);
-	    break;
-	}
-	/* fall through */
+        if(wndPtr->dwStyle & BS_NOTIFY || 
+                style==BS_RADIOBUTTON ||
+                style==BS_USERBUTTON ||
+                style==BS_OWNERDRAW) {
+            SendMessageA( GetParent(hWnd), WM_COMMAND,
+                    MAKEWPARAM( wndPtr->wIDmenu, BN_DOUBLECLICKED ), hWnd);
+            break;
+        }
+        /* fall through */
     case WM_LBUTTONDOWN:
         SetCapture( hWnd );
         SetFocus( hWnd );
         SendMessageA( hWnd, BM_SETSTATE, TRUE, 0 );
+        infoPtr->state |= BUTTON_BTNPRESSED;
         break;
 
     case WM_LBUTTONUP:
-	/* FIXME: real windows uses extra flags in the status for this */
-        if (GetCapture() != hWnd) break;
-        ReleaseCapture();
-        if (!(infoPtr->state & BUTTON_HIGHLIGHTED)) break;
+        if (!(infoPtr->state & BUTTON_BTNPRESSED)) break;
+        infoPtr->state &= BUTTON_NSTATES;
+        if (!(infoPtr->state & BUTTON_HIGHLIGHTED)) {
+            ReleaseCapture();
+            break;
+        }
         SendMessageA( hWnd, BM_SETSTATE, FALSE, 0 );
+        ReleaseCapture();
         GetClientRect( hWnd, &rect );
         if (PtInRect( &rect, pt ))
         {
@@ -181,6 +185,14 @@
         }
         break;
 
+    case WM_CAPTURECHANGED:
+        if (infoPtr->state & BUTTON_BTNPRESSED) {
+            infoPtr->state &= BUTTON_NSTATES;
+            if (infoPtr->state & BUTTON_HIGHLIGHTED) 
+                SendMessageA( hWnd, BM_SETSTATE, FALSE, 0 );
+        }
+        break;
+
     case WM_MOUSEMOVE:
         if (GetCapture() == hWnd)
         {