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

Timestamp:

Oct 9, 1999, 8:16:58 PM (26 years ago)

Author:

sandervl

Message:

Desktop window lookup bugfix

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.32 1999-10-09 09:45:27 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.33 1999-10-09 18:16:57 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -39 +39 @@
 #include "dc.h"
 #include "pmframe.h"
+#include "win32wdesktop.h"
 
 #define HAS_DLGFRAME(style,exStyle) \
@@ -2530 +2531 @@
  Win32BaseWindow *window;
 
+   if(hwnd == NULL && windowDesktop) 
+        return windowDesktop;
+
    if(HwGetWindowHandleData(hwnd, (DWORD *)&window) == TRUE) {
         return window;
@@ -2590 +2594 @@
                 return window->getWindowHandle();
         }
-        else  return hwnd;    //OS/2 window handle
+        window = GetWindowFromOS2FrameHandle(hwnd);
+        if(window) {
+                return window->getWindowHandle();
+        }  
+        else    return hwnd;    //OS/2 window handle
 }
 //******************************************************************************