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

Timestamp:

Jul 4, 2001, 11:29:52 AM (24 years ago)

Author:

sandervl

Message:

SetParent bugfix

File:

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

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.137 2001-06-17 21:08:00 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.138 2001-07-04 09:29:51 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -494 +494 @@
 
     case WM_TIMER:
+        dprintf(("WM_TIMER %x %x time %x", win32wnd->getWindowHandle(), pWinMsg->wParam, GetTickCount()));
         win32wnd->DispatchMsgA(pWinMsg);
         goto RunDefWndProc;
@@ -751 +752 @@
         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));
 
+        if(win32wnd->IsParentChanging()) {
+            rc = 0;
+            break;
+        }
+
         if(pswp->fl & SWP_NOADJUST) {
             //ignore weird messages (TODO: why are they sent?)
@@ -877 +883 @@
 
         dprintf(("PMFRAME:WM_WINDOWPOSCHANGED (%x) %x %x (%d,%d) (%d,%d)", mp2, win32wnd->getWindowHandle(), pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
+        if(win32wnd->IsParentChanging()) {
+            goto PosChangedEnd;
+        }
 
         if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0)