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

Timestamp:

Oct 19, 1999, 2:52:31 PM (26 years ago)

Author:

sandervl

Message:

MDI fix + desktop as parent for main windows

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.54 1999-10-18 11:59:58 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.55 1999-10-19 12:52:30 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -394 +394 @@
   else
   {
-        if (!cs->hwndParent) {
+        SetParent(windowDesktop->getWindowHandle());
+        if (!cs->hwndParent || cs->hwndParent == windowDesktop->getWindowHandle()) {
             owner = NULL;
         }
         else
         {
-            owner = GetWindowFromHandle(cs->hwndParent);
+            owner = GetWindowFromHandle(cs->hwndParent)->GetTopParent();
             if(owner == NULL)
             {
@@ -2093 +2094 @@
    else oldhwnd = 0;
 
-   if(hwndNewParent == 0) {//desktop window = parent
-        setParent(NULL);
-        OSLibWinSetParent(getOS2WindowHandle(), OSLIB_HWND_DESKTOP);
-        return oldhwnd;
-   }
    newparent = GetWindowFromHandle(hwndNewParent);
    if(newparent)
@@ -2114 +2110 @@
 {
     if(getParent()) {
-        return getParent()->getWindowHandle() == hwndParent;
+          return getParent()->getWindowHandle() == hwndParent;
     }
     else  return 0;
@@ -2179 +2175 @@
  Win32BaseWindow *prevchild = 0, *child = 0;
 
-        dprintf(("EnumChildWindows of %x parameter %x %x (%x)", getWindowHandle(), lpfn, lParam, getFirstChild()));
+    dprintf(("EnumChildWindows of %x parameter %x %x (%x)", getWindowHandle(), lpfn, lParam, getFirstChild()));
     for (child = (Win32BaseWindow *)getFirstChild(); child; child = (Win32BaseWindow *)child->getNextChild())
     {
@@ -2627 +2623 @@
 WORD Win32BaseWindow::GetWindowWord(int index)
 {
-   if(index >= 0 && index/4 < nrUserWindowLong)
-   {
+    if(index >= 0 && index/4 < nrUserWindowLong)
+    {
         return ((WORD *)userWindowLong)[index/2];
-   }
-   SetLastError(ERROR_INVALID_PARAMETER);
-   return 0;
+    }
+    SetLastError(ERROR_INVALID_PARAMETER);
+    return 0;
 }
 //******************************************************************************
@@ -2638 +2634 @@
 void Win32BaseWindow::setWindowId(DWORD id)
 {
-   windowId = id;
-   OSLibSetWindowID(OS2HwndFrame, id);
+    windowId = id;
+    OSLibSetWindowID(OS2HwndFrame, id);
 }
 //******************************************************************************
@@ -2647 +2643 @@
  Win32BaseWindow *window;
 
-   if(hwnd == NULL && windowDesktop)
-    return windowDesktop;
-
-   if(HwGetWindowHandleData(hwnd, (DWORD *)&window) == TRUE) {
-        return window;
-   }
-   else return NULL;
+    if(hwnd == NULL && windowDesktop)
+         return windowDesktop;
+
+    if(HwGetWindowHandleData(hwnd, (DWORD *)&window) == TRUE) {
+         return window;
+    }
+    else return NULL;
 }
 //******************************************************************************