Changeset 6166 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

SetParent bugfix

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (4 diffs)
• win32wbase.cpp (modified) (5 diffs)
• win32wbase.h (modified) (3 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)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.271 2001-06-17 21:08:01 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.272 2001-07-04 09:29:51 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -106 +106 @@
   fInternalMsg     = FALSE;
   fNoSizeMsg       = FALSE;
+  fParentChange    = FALSE;
   fIsDestroyed     = FALSE;
   fDestroyWindowCalled = FALSE;
@@ -2787 +2788 @@
    }
    if(oldparent) {
+        //release parent here (increased refcount during creation)
         RELEASE_WNDOBJ(oldparent);
    }
@@ -2794 +2796 @@
         setParent(newparent);
         getParent()->addChild(this);
+        fParentChange = TRUE;
+
         OSLibWinSetParent(getOS2FrameWindowHandle(), getParent()->getOS2WindowHandle());
         if(!(getStyle() & WS_CHILD))
@@ -2805 +2809 @@
             }
         }
+        //SvL: Even though the win32 coordinates might not change, the PM
+        //     coordinates can. We must make sure the control stays at the
+        //     same position (y) relative to the (new) parent.
+        SetWindowPos(HWND_TOPMOST, rectWindow.left, rectWindow.top, 0, 0,
+                     SWP_NOACTIVATE|SWP_NOSIZE);
+        fParentChange = FALSE;
    }
    else {

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.121 2001-06-22 18:32:11 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.122 2001-07-04 09:29:52 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -253 +253 @@
          HWND   getOS2HwndModalDialog()       { return OS2HwndModalDialog; };
          BOOL   CanReceiveSizeMsgs()          { return !fNoSizeMsg; };
+         BOOL   IsParentChanging()            { return fParentChange; };
          BOOL   IsWindowCreated()             { return fCreated; }
          BOOL   IsWindowDestroyed()           { return fIsDestroyed; };
@@ -373 +374 @@
                                          //sent by PM and those sent by apps
                  fNoSizeMsg:1,
+                 fParentChange:1,
                  fIsDestroyed:1,
                  fDestroyWindowCalled:1, //DestroyWindow was called for this window