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

Timestamp:

Oct 5, 2000, 3:47:06 PM (25 years ago)

Author:

sandervl

Message:

GetWindow & EnumDisplaySettingsA fixes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.212 2000-09-07 18:14:34 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.213 2000-10-05 13:47:06 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2768 +2768 @@
     {
     case GW_HWNDFIRST:
-        hwndRelated = OSLibWinQueryWindow(getOS2WindowHandle(), QWOS_TOP);
-        window = GetWindowFromOS2Handle(hwndRelated);
-        if(window) {
-             hwndRelated = window->getWindowHandle();
-        }
-        else hwndRelated = 0;
+        if(getParent()) {
+            window = (Win32BaseWindow *)getParent();
+            hwndRelated = OSLibWinQueryWindow(window->getOS2WindowHandle(), QWOS_TOP);
+        }
+        else hwndRelated = 0; //TODO: not correct; should get first child in z-order of desktop
         break;
 
@@ -2810 +2809 @@
 
     case GW_CHILD:
-        if(getFirstChild()) {
-            hwndRelated = ((Win32BaseWindow *)getFirstChild())->getWindowHandle();
-        }
+        hwndRelated = OSLibWinQueryWindow(getOS2WindowHandle(), QWOS_TOP);
+        window = GetWindowFromOS2Handle(hwndRelated);
+        if(window) {
+             hwndRelated = window->getWindowHandle();
+        }
+        else hwndRelated = 0;
         break;
     }