Changeset 6773 for trunk/src/user32/win32wbase.cpp

Timestamp:

Sep 20, 2001, 2:57:15 PM (24 years ago)

Author:

sandervl

Message:

WM_MOUSEACTIVATE & WM_NEXTMENU fixes

File:

• trunk/src/user32/win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.282 2001-09-19 15:39:50 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.283 2001-09-20 12:57:15 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1077 +1077 @@
                                                 MAKELONG( lastHitTestVal, msg->message) );
 
+                dprintf2(("WM_MOUSEACTIVATE returned %d", ret));
 #if 0
                 if ((ret == MA_ACTIVATEANDEAT) || (ret == MA_NOACTIVATEANDEAT))
                          eatMsg = TRUE;
 #endif
-                if(((ret == MA_ACTIVATE) || (ret == MA_ACTIVATEANDEAT))
+                //SvL: 0 is not documented, but experiments in NT4 show that
+                //     the window will get activated when it returns this.
+                //     (FreeCell is an example)
+                if(((ret == MA_ACTIVATE) || (ret == MA_ACTIVATEANDEAT) || (ret == 0))
                    && (hwndTop != GetForegroundWindow()) )
                 {