Changeset 20094

Timestamp:

Dec 28, 2002, 10:30:55 AM (22 years ago)

Author:

sandervl

Message:

changed default WM_MOUSEACTIVATE handler; support SWP_ASYNCWINDOWPOS flag

File:

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

tags/trunk/src/user32/win32wbase.cpp ¶

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.346 2002-12-18 12:28:07 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.347 2002-12-28 09:30:55 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1668 +1668 @@
     case WM_VKEYTOITEM:
     case WM_CHARTOITEM:
-             return -1;
+        return -1;
 
     case WM_PARENTNOTIFY:
@@ -1675 +1675 @@
     case WM_MOUSEACTIVATE:
     {
+        HWND hwnd = getWindowHandle();
+
         dprintf(("DefWndProc: WM_MOUSEACTIVATE for %x Msg %s", Win32Hwnd, GetMsgText(HIWORD(lParam))));
-        if(getStyle() & WS_CHILD && !(getExStyle() & WS_EX_NOPARENTNOTIFY) )
-        {
-            if(getParent()) {
-                LRESULT rc = SendMessageA(getParent()->getWindowHandle(), WM_MOUSEACTIVATE, wParam, lParam );
-                if(rc)  return rc;
-            }
-        }
-        return (LOWORD(lParam) == HTCAPTION) ? MA_NOACTIVATE : MA_ACTIVATE;
+        if (::GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD)
+        {
+            LONG ret = ::SendMessageW( ::GetParent(hwnd), WM_MOUSEACTIVATE, wParam, lParam );
+            if (ret) return ret;
+        }
+
+        /* Caption clicks are handled by the NC_HandleNCLButtonDown() */
+        return (LOWORD(lParam) >= HTCLIENT) ? MA_ACTIVATE : MA_NOACTIVATE;
     }
 
@@ -2438 +2440 @@
          SWP_SHOWWINDOW | SWP_HIDEWINDOW | SWP_NOCOPYBITS   |
          SWP_NOOWNERZORDER | SWP_NOSENDCHANGING | SWP_DEFERERASE |
-         SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE))
+         SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_ASYNCWINDOWPOS))
     {
         dprintf(("ERROR: SetWindowPos; UNKNOWN flag"));
@@ -2444 +2446 @@
     }
 
-    if( fuFlags & (SWP_DEFERERASE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE)) {
+    if( fuFlags & (SWP_DEFERERASE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_ASYNCWINDOWPOS)) {
         dprintf(("WARNING: SetWindowPos; unsupported flag"));
     }