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

Timestamp:

Sep 7, 2000, 8:14:35 PM (25 years ago)

Author:

sandervl

Message:

MAJOR GetWindow bugfix

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.211 2000-09-05 19:20:36 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.212 2000-09-07 18:14:34 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2189 +2189 @@
    RECT oldClientRect = rectClient;
 
+    if(getWindowHandle() == 0x68000004) {
+        rc = FALSE;
+    }
     if (fuFlags &
        ~(SWP_NOSIZE     | SWP_NOMOVE     | SWP_NOZORDER     |
@@ -2761 +2764 @@
  Win32BaseWindow *window;
 
+#if 1
+    switch(uCmd)
+    {
+    case GW_HWNDFIRST:
+        hwndRelated = OSLibWinQueryWindow(getOS2WindowHandle(), QWOS_TOP);
+        window = GetWindowFromOS2Handle(hwndRelated);
+        if(window) {
+             hwndRelated = window->getWindowHandle();
+        }
+        else hwndRelated = 0;
+        break;
+
+    case GW_HWNDLAST:
+        hwndRelated = OSLibWinQueryWindow(getOS2WindowHandle(), QWOS_BOTTOM);
+        window = GetWindowFromOS2Handle(hwndRelated);
+        if(window) {
+             hwndRelated = window->getWindowHandle();
+        }
+        else hwndRelated = 0;
+        break;
+
+    case GW_HWNDNEXT:
+        hwndRelated = OSLibWinQueryWindow(getOS2WindowHandle(), QWOS_NEXT);
+        window = GetWindowFromOS2Handle(hwndRelated);
+        if(window) {
+             hwndRelated = window->getWindowHandle();
+        }
+        else hwndRelated = 0;
+        break;
+
+    case GW_HWNDPREV:
+        hwndRelated = OSLibWinQueryWindow(getOS2WindowHandle(), QWOS_PREV);
+        window = GetWindowFromOS2Handle(hwndRelated);
+        if(window) {
+             hwndRelated = window->getWindowHandle();
+        }
+        else hwndRelated = 0;
+        break;
+
+    case GW_OWNER:
+        if(getOwner()) {
+            hwndRelated = getOwner()->getWindowHandle();
+        }
+        break;
+
+    case GW_CHILD:
+        if(getFirstChild()) {
+            hwndRelated = ((Win32BaseWindow *)getFirstChild())->getWindowHandle();
+        }
+        break;
+    }
+#else
     switch(uCmd)
     {
@@ -2825 +2880 @@
         break;
     }
+#endif
 end:
     dprintf(("GetWindow %x %d returned %x", getWindowHandle(), uCmd, hwndRelated));
@@ -3481 +3537 @@
 
     dprintf(("Window style:   %x %s", dwStyle, style));
-    dprintf(("Window exStyle: %x %s (FS = %x)", dwExStyle, exstyle, GetFS()));
+    dprintf(("Window exStyle: %x %s", dwExStyle, exstyle));
 }
 #endif