commit 53c2028b52770cf0e63d4672199a6f983fd8b4fa
author Per Ångström <pang@mbox304.swipnet.se> Sun Jul 04 12:46:37 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Jul 04 12:46:37 1999 +0000
tree 1c02c6c354eb510db9a3623e11fb0c92d6e8fbf1
parent 423813e30c7f5183f3d1eb25fe0979f6eb42be87

Fixed a problem with apps that override the default behaviour on
WM_MOUSEACTIVATE message (main window was not activated).

windows/message.c

diff --git a/windows/message.c b/windows/message.c
index c956043..4673aa2 100644
--- a/windows/message.c
+++ b/windows/message.c
@@ -316,7 +316,7 @@
 
             /* Activate the window if needed */
 
-            if (hWnd != GetActiveWindow() && hWnd != GetDesktopWindow())
+            if (hwndTop != GetForegroundWindow() && hwndTop != GetDesktopWindow())
             {
                 LONG ret = SendMessageA( hWnd, WM_MOUSEACTIVATE, hwndTop,
                                           MAKELONG( hittest, message ) );
@@ -324,10 +324,11 @@
                 if ((ret == MA_ACTIVATEANDEAT) || (ret == MA_NOACTIVATEANDEAT))
                          eatMsg = TRUE;
 
-                if (((ret == MA_ACTIVATE) || (ret == MA_ACTIVATEANDEAT)) 
-                      && hwndTop != GetActiveWindow() )
+                if (((ret == MA_ACTIVATE) || (ret == MA_ACTIVATEANDEAT)))
+                {
                       if (!WINPOS_SetActiveWindow( hwndTop, TRUE , TRUE ))
 			 eatMsg = TRUE;
+                }
             }
 	}
     } else sendSC = (remove && sendSC);