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

Timestamp:

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

Author:

sandervl

Message:

SetParent bugfix

File:

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

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 {