Changeset 3663 for trunk/src/user32/window.cpp

Timestamp:

Jun 7, 2000, 11:45:52 PM (25 years ago)

Author:

sandervl

Message:

Set/GetParent changes/fixes

File:

• trunk/src/user32/window.cpp (modified) (4 diffs)

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.68 2000-06-07 14:51:33 sandervl Exp $ */
+/* $Id: window.cpp,v 1.69 2000-06-07 21:45:52 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -318 +318 @@
         return 0;
     }
+    if(window->isDesktopWindow()) {
+        dprintf(("WARNING: Trying to destroy desktop window!"));
+        return FALSE;
+    }
     return window->DestroyWindow();
 }
@@ -353 +357 @@
 HWND WIN32API SetParent( HWND hwndChild, HWND hwndNewParent)
 {
-  Win32BaseWindow *window;
+  Win32BaseWindow *window, *parent;
 
     window = Win32BaseWindow::GetWindowFromHandle(hwndChild);
@@ -360 +364 @@
         SetLastError(ERROR_INVALID_WINDOW_HANDLE);
         return 0;
+    }
+    if(hwndNewParent == HWND_DESKTOP) {
+        hwndNewParent = GetDesktopWindow();
+    } 
+    else {
+        parent = Win32BaseWindow::GetWindowFromHandle(hwndNewParent);
+        if(!window) {
+                dprintf(("SetParent, parent %x not found", hwndNewParent));
+                SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+                return 0;
+        }
     }
     dprintf(("SetParent %x %x", hwndChild, hwndNewParent));