Changeset 3251 for trunk/src

Timestamp:

Mar 27, 2000, 11:41:47 PM (25 years ago)

Author:

sandervl

Message:

SetParent bugfix

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.174 2000-03-18 16:13:38 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.175 2000-03-27 21:41:47 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2255 +2255 @@
  HWND oldhwnd;
  Win32BaseWindow *newparent;
-
-   if(getParent()) {
-        oldhwnd = getParent()->getWindowHandle();
-        getParent()->RemoveChild(this);
+ Win32BaseWindow *oldparent = (Win32BaseWindow *)ChildWindow::GetParent();
+
+   if(oldparent) {
+        oldhwnd = oldparent->getWindowHandle();
+        oldparent->RemoveChild(this);
    }
    else oldhwnd = 0;
@@ -2740 +2741 @@
                     return value;
 
-                value &= ~WS_CHILD;      /* Some bits can't be changed this way (WINE) */
+                value &= ~(WS_CHILD|WS_VISIBLE);      /* Some bits can't be changed this way (WINE) */
                 ss.styleOld = getStyle();
-                ss.styleNew = value | (ss.styleOld & WS_CHILD);
+                ss.styleNew = value | (ss.styleOld & (WS_CHILD|WS_VISIBLE));
                 dprintf(("SetWindowLong GWL_STYLE %x old %x new style %x", getWindowHandle(), ss.styleOld, ss.styleNew));
                 SendInternalMessageA(WM_STYLECHANGING,GWL_STYLE,(LPARAM)&ss);