Changeset 6762 for trunk/src/user32/pmwindow.cpp

Timestamp:

Sep 19, 2001, 5:39:52 PM (24 years ago)

Author:

sandervl

Message:

ported the Wine MDI control + some menu fixes

File:

• trunk/src/user32/pmwindow.cpp (modified) (7 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.146 2001-09-17 13:31:30 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.147 2001-09-19 15:39:49 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -44 +44 @@
 #include "syscolor.h"
 #include "options.h"
-
+#include "menu.h"
 
 #define DBG_LOCALLOG    DBG_pmwindow
@@ -787 +787 @@
         if(pswp->fl & SWP_NOADJUST) {
             //ignore weird messages (TODO: why are they sent?)
+            dprintf(("WARNING: WM_ADJUSTWINDOWPOS with SWP_NOADJUST flag!!"));
             break;
         }
@@ -815 +816 @@
                         hParent = win32wnd->getParent()->getOS2WindowHandle();
                 }
-                else    goto RunDefWndProc;
+                else    goto RunDefFrameWndProc;
             }
         }
@@ -839 +840 @@
         win32wnd->MsgPosChanging((LPARAM)&wp);
 
-        if(win32wnd->getOldStyle() != win32wnd->getStyle()) {
+        if(win32wnd->getOldStyle() != win32wnd->getStyle()) 
+        {
              OSLibSetWindowStyle(win32wnd->getOS2FrameWindowHandle(), win32wnd->getOS2WindowHandle(), win32wnd->getStyle(), win32wnd->getExStyle());
              if(fOS2Look) {
@@ -901 +903 @@
                 ret |= AWP_DEACTIVATE;
             }
-            if(ulFlags & SWP_ACTIVATE) {
-                ret |= AWP_ACTIVATE;
+            if(ulFlags & SWP_ACTIVATE) 
+            {
+                ULONG ulFrameFlags;
+
+                if(ulFlags & SWP_ZORDER) {
+                    ulFrameFlags = WinQueryWindowUShort(hwnd, QWS_FLAGS);
+                    WinSetWindowUShort(hwnd, QWS_FLAGS, ulFrameFlags | FF_NOACTIVATESWP);
+                }
+
+                if(!(ulFlags & SWP_SHOW))
+                {
+                    ret |= AWP_ACTIVATE;
+                }
+                else
+                {
+                    WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, FID_CLIENT));
+    
+                    ulFrameFlags  = WinQueryWindowUShort(hwnd, QWS_FLAGS);
+                    ulFrameFlags &= ~FF_NOACTIVATESWP;
+                    WinSetWindowUShort(hwnd, QWS_FLAGS, ulFrameFlags);
+                }
             }
             rc = (MRESULT)ret;
@@ -911 +932 @@
             ret |= AWP_DEACTIVATE;
         }
-        if(ulFlags & SWP_ACTIVATE) {
-            ret |= AWP_ACTIVATE;
+        if(ulFlags & SWP_ACTIVATE) 
+        {
+            ULONG ulFrameFlags;
+
+            if(ulFlags & SWP_ZORDER) {
+                ulFrameFlags = WinQueryWindowUShort(hwnd, QWS_FLAGS);
+                WinSetWindowUShort(hwnd, QWS_FLAGS, ulFrameFlags | FF_NOACTIVATESWP);
+            }
+
+            if(!(ulFlags & SWP_SHOW))
+            {
+                ret |= AWP_ACTIVATE;
+            }
+            else
+            {
+                WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, FID_CLIENT));
+
+                ulFrameFlags  = WinQueryWindowUShort(hwnd, QWS_FLAGS);
+                ulFrameFlags &= ~FF_NOACTIVATESWP;
+                WinSetWindowUShort(hwnd, QWS_FLAGS, ulFrameFlags);
+            }
         }
         rc = (MRESULT)ret;