commit 70cd8cb4aea84da31cf117f39486bd2fd3898326
author Luc Tourangeau <luc@macadamian.com> Sat Jul 10 11:57:29 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Jul 10 11:57:29 1999 +0000
tree 5818a3eec57928e2a66872879e80bd86ea3e6de1
parent c4804be1396ef68d458839e1f0b5d81277750eb1

Added BN_CLICKED notification in WM_SETFOCUS.

controls/button.c

diff --git a/controls/button.c b/controls/button.c
index aa8f0f7..12937b9 100644
--- a/controls/button.c
+++ b/controls/button.c
@@ -138,8 +138,8 @@
     case WM_LBUTTONDOWN:
     case WM_LBUTTONDBLCLK:
         SendMessageA( hWnd, BM_SETSTATE, TRUE, 0 );
-        SetFocus( hWnd );
         SetCapture( hWnd );
+        SetFocus( hWnd );
         break;
 
     case WM_LBUTTONUP:
@@ -199,9 +199,16 @@
         return infoPtr->hFont;
 
     case WM_SETFOCUS:
+        if ((style == BS_AUTORADIOBUTTON) && (GetCapture() != hWnd) &&
+            !(SendMessageA(hWnd, BM_GETCHECK, 0, 0) & BST_CHECKED))
+	{
+            /* The notification is sent when the button (BS_AUTORADIOBUTTON) 
+               is unckecked and the focus was not given by a mouse click. */
+            SendMessageA( hWnd, BM_SETCHECK, TRUE, 0 );
+            SendMessageA( GetParent(hWnd), WM_COMMAND,
+                          MAKEWPARAM( wndPtr->wIDmenu, BN_CLICKED ), hWnd);
+        }
         infoPtr->state |= BUTTON_HASFOCUS;
-	if (style == BS_AUTORADIOBUTTON)
-	    SendMessageA( hWnd, BM_SETCHECK, 1, 0 );
         PAINT_BUTTON( wndPtr, style, ODA_FOCUS );
         break;