Changeset 9297 for trunk/src

Timestamp:

Sep 26, 2002, 6:04:35 PM (23 years ago)

Author:

sandervl

Message:

WM_ADJUSTFRAMEPOS change for preventing z-order changes of child windows

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (3 diffs)
• windlg.cpp (modified) (2 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.188 2002-08-23 15:06:00 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.189 2002-09-26 16:04:34 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -1377 +1377 @@
       RECTL     rect;
 
-        dprintf(("PMFRAME:WM_WINDOWPOSCHANGED (%x) %x %x (%s) (%d,%d) (%d,%d)", mp2, win32wnd->getWindowHandle(), pswp->fl, DbgGetStringSWPFlags(pswp->fl), pswp->x, pswp->y, pswp->cx, pswp->cy));
+        dprintf(("PMFRAME:WM_WINDOWPOSCHANGED (%x) %x %x (%s) (%d,%d) (%d,%d) z %x", mp2, win32wnd->getWindowHandle(), pswp->fl, DbgGetStringSWPFlags(pswp->fl), pswp->x, pswp->y, pswp->cx, pswp->cy, Win32BaseWindow::GetWindowFromOS2Handle(pswp->hwndInsertBehind)));
         if(win32wnd->IsParentChanging()) {
             goto PosChangedEnd;
@@ -1802 +1802 @@
         break;
 
+    case WM_ADJUSTFRAMEPOS:
+    {
+        PSWP pswp   = (PSWP)mp1;
+
+        dprintf(("PMFRAME:WM_ADJUSTFRAMEPOS %x %x %x (%s) (%d,%d) (%d,%d)", win32wnd->getWindowHandle(), pswp->hwnd, pswp->fl, DbgGetStringSWPFlags(pswp->fl), pswp->x, pswp->y, pswp->cx, pswp->cy));
+        //hack alert: the PM frame control changes the z-order of a child window
+        //            if it receives focus after a window has been destroyed
+        //            We can't let this happen as this messes up assumptions
+        //            elsewhere (e.g. GetNextDlgGroupItem)
+        //            By returning 0 here, we prevent the default frame handler
+        //            from messing things up. (one example is a group of radio buttons)
+        //NOTE: We really need to get rid of frame & client windows for each
+        //      win32 window
+        if(pswp->fl == SWP_FOCUSACTIVATE && win32wnd->isChild()) {
+            rc = 0;
+            break;
+        }
+        goto RunDefFrameWndProc;
+    }
+
 #ifdef DEBUG
-    case WM_ADJUSTFRAMEPOS:
-    {
-        PSWP pswp   = (PSWP)mp1;
-
-        dprintf(("PMFRAME:WM_ADJUSTFRAMEPOS %x %x %x (%s) (%d,%d) (%d,%d)", win32wnd->getWindowHandle(), pswp->hwnd, pswp->fl, DbgGetStringSWPFlags(pswp->fl), pswp->x, pswp->y, pswp->cx, pswp->cy));
-        goto RunDefFrameWndProc;
-    }
-
     case WM_OWNERPOSCHANGE:
     {

trunk/src/user32/windlg.cpp

@@ -1 @@
-/* $Id: windlg.cpp,v 1.34 2002-06-10 09:12:35 sandervl Exp $ */
+/* $Id: windlg.cpp,v 1.35 2002-09-26 16:04:35 sandervl Exp $ */
 /*
  * Win32 dialog apis for OS/2
@@ -545 +545 @@
 }
 //******************************************************************************
+//Note: This implementation is correct, but it can't cope with z-order changes
+//      of dialog controls. That's ok, since Windows can't either.
 //******************************************************************************
 HWND WIN32API GetNextDlgGroupItem( HWND hwndDlg, HWND hwndCtrl, BOOL fPrevious)