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

Timestamp:

Sep 17, 2001, 3:31:30 PM (24 years ago)

Author:

sandervl

Message:

activation + sc_close fixes

File:

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

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.145 2001-09-15 15:23:12 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.146 2001-09-17 13:31:30 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -772 +772 @@
       SWP      swpOld;
       WINDOWPOS wp,wpOld;
+      ULONG     ulFlags;
+      ULONG     ret = 0;
       HWND      hParent = NULLHANDLE, hwndAfter;
 
         dprintf(("PMFRAME:WM_ADJUSTWINDOWPOS %x %x %x (%d,%d) (%d,%d)", win32wnd->getWindowHandle(), pswp->hwnd, pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
+
+        ulFlags = pswp->fl;
 
         if(win32wnd->IsParentChanging()) {
@@ -892 +896 @@
             pswp->hwnd = hwnd;
 
-            rc = (MRESULT)0xf;
+            ret = 0xf;
+            //Setting these flags is necessary to avoid activation/focus problems
+            if(ulFlags & SWP_DEACTIVATE) {
+                ret |= AWP_DEACTIVATE;
+            }
+            if(ulFlags & SWP_ACTIVATE) {
+                ret |= AWP_ACTIVATE;
+            }
+            rc = (MRESULT)ret;
             break;
         }
-        rc = 0;
+        //Setting these flags is necessary to avoid activation/focus problems
+        if(ulFlags & SWP_DEACTIVATE) {
+            ret |= AWP_DEACTIVATE;
+        }
+        if(ulFlags & SWP_ACTIVATE) {
+            ret |= AWP_ACTIVATE;
+        }
+        rc = (MRESULT)ret;
         break;
     }
@@ -925 +944 @@
                 WinShowWindow(win32wnd->getOS2WindowHandle(), 0);
             }
-/*
-            if(pswp->fl & SWP_ACTIVATE)
-            {
-                //Only send PM WM_ACTIVATE to top-level windows (frame windows)
-                if(!(WinQueryWindowULong(WinWindowFromID(hwnd,FID_CLIENT), OFFSET_WIN32FLAGS) & WINDOWFLAG_ACTIVE))
-                {
-                    WinSendDlgItemMsg(hwnd, FID_CLIENT, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
-//                    WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
-                }
-            }
-            else
-            if(pswp->fl & SWP_DEACTIVATE)
-            {
-                //Only send PM WM_ACTIVATE to top-level windows (frame windows)
-                if(WinQueryWindowULong(WinWindowFromID(hwnd,FID_CLIENT), OFFSET_WIN32FLAGS) & WINDOWFLAG_ACTIVE)
-                {
-                    WinSendDlgItemMsg(hwnd, FID_CLIENT, WM_ACTIVATE, (MPARAM)FALSE, (MPARAM)hwnd);
-//                    WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)FALSE, (MPARAM)hwnd);
-                }
-            }
-*/
-//            goto RunDefWndProc;
             goto RunDefFrameWndProc;
         }
@@ -1080 +1077 @@
         }
 #endif
-
-        if(pswp->fl & SWP_ACTIVATE)
-        {
-             //Only send PM WM_ACTIVATE to top-level windows (frame windows)
-             if(!(WinQueryWindowULong(WinWindowFromID(hwnd,FID_CLIENT), OFFSET_WIN32FLAGS) & WINDOWFLAG_ACTIVE))
-             {
-//                WinSendDlgItemMsg(hwnd, FID_CLIENT, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
-                WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
-             }
-        }
-        else
-        if(pswp->fl & SWP_DEACTIVATE)
-        {
-            //Only send PM WM_ACTIVATE to top-level windows (frame windows)
-            if(WinQueryWindowULong(WinWindowFromID(hwnd,FID_CLIENT), OFFSET_WIN32FLAGS) & WINDOWFLAG_ACTIVE)
-            {
-//                WinSendDlgItemMsg(hwnd, FID_CLIENT, WM_ACTIVATE, (MPARAM)FALSE, (MPARAM)hwnd);
-                    WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)FALSE, (MPARAM)hwnd);
-            }
-        }
 
 PosChangedEnd: