Changeset 841 for trunk/src

Timestamp:

Sep 5, 1999, 8:32:27 PM (26 years ago)

Author:

sandervl

Message:

AddChild bugfix + parent-child relation bugfix

Location:

trunk/src/user32/new

Files:

• win32wbase.cpp (modified) (5 diffs)
• win32wndchild.cpp (modified) (2 diffs)

trunk/src/user32/new/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.12 1999-09-05 17:14:03 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.13 1999-09-05 18:32:26 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1627 +1627 @@
 {
   if(getParent()) {
-    return getParent()->getWindowHandle();
+        return getParent()->getWindowHandle();
   }
   else  return 0;
@@ -1640 +1640 @@
    if(getParent()) {
         oldhwnd = getParent()->getWindowHandle();
+        getParent()->RemoveChild(this);
    }
    else oldhwnd = 0;
 
    if(hwndNewParent == 0) {//desktop window = parent
-    setParent(NULL);
+        setParent(NULL);
         OSLibWinSetParent(getOS2WindowHandle(), OSLIB_HWND_DESKTOP);
         return oldhwnd;
@@ -1652 +1653 @@
    {
         setParent(newparent);
+        getParent()->AddChild(this);
         OSLibWinSetParent(getOS2WindowHandle(), getParent()->getOS2WindowHandle());
         return oldhwnd;
@@ -1663 +1665 @@
 {
   if(getParent()) {
-    return getParent()->getWindowHandle() == hwndParent;
+        return getParent()->getWindowHandle() == hwndParent;
   }
   else  return 0;

trunk/src/user32/new/win32wndchild.cpp

@@ -1 @@
-/* $Id: win32wndchild.cpp,v 1.3 1999-08-31 10:36:23 sandervl Exp $ */
+/* $Id: win32wndchild.cpp,v 1.4 1999-09-05 18:32:27 sandervl Exp $ */
 /*
  * Win32 Child/Parent window class for OS/2
@@ -51 +51 @@
                 curchild = curchild->getNextChild();
         }
-        curchild->setNextChild(this);
+        curchild->setNextChild(child);
    }
    child->setNextChild(NULL);