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

Timestamp:

Oct 15, 1999, 12:03:16 PM (26 years ago)

Author:

sandervl

Message:

GetWindow + EB's message bugfixes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.43 1999-10-14 19:31:32 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.44 1999-10-15 10:03:15 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2258 +2258 @@
  ULONG         magic;
  ULONG         getcmd = 0;
- HWND          hwndRelated;
+ HWND          hwndRelated, hwnd;
 
     dprintf(("GetWindow %x %d NOT COMPLETE", getWindowHandle(), uCmd));
+    hwnd = OS2Hwnd;
     switch(uCmd)
     {
@@ -2268 +2269 @@
         case GW_HWNDFIRST:
             if(getParent()) {
+                    hwnd = getParent()->getOS2WindowHandle();
                     getcmd = QWOS_TOP; //top of child windows
             }
@@ -2274 +2276 @@
         case GW_HWNDLAST:
             if(getParent()) {
+                    hwnd = getParent()->getOS2WindowHandle();
                     getcmd = QWOS_BOTTOM; //bottom of child windows
             }
@@ -2290 +2293 @@
             else    return 0;
     }
-    hwndRelated = OSLibWinQueryWindow(OS2Hwnd, getcmd);
+    hwndRelated = OSLibWinQueryWindow(hwnd, getcmd);
     if(hwndRelated)
     {
+        win32wnd = (Win32BaseWindow *)OSLibWinGetWindowULong(hwndRelated, OFFSET_WIN32WNDPTR);
+        magic    = OSLibWinGetWindowULong(hwndRelated, OFFSET_WIN32PM_MAGIC);
+        if(CheckMagicDword(magic) && win32wnd)
+        {
+            return win32wnd->getWindowHandle();
+        }
+
+    hwndRelated = OSLibWinWindowFromID(hwndRelated, OSLIB_FID_CLIENT);
         win32wnd = (Win32BaseWindow *)OSLibWinGetWindowULong(hwndRelated, OFFSET_WIN32WNDPTR);
         magic    = OSLibWinGetWindowULong(hwndRelated, OFFSET_WIN32PM_MAGIC);