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

Timestamp:

Nov 3, 1999, 8:51:44 PM (26 years ago)

Author:

sandervl

Message:

mouse activate + CreateIconIndirect fix

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.73 1999-11-03 18:00:27 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.74 1999-11-03 19:51:43 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1026 +1026 @@
     return  SendInternalMessageA(WM_KILLFOCUS, hwnd, 0);
 }
-//******************************************************************************
 //******************************************************************************
 //******************************************************************************
@@ -1102 +1101 @@
     }
 
-    if(fClick) {
+    if(fClick) 
+    {
+     HWND hwndTop;
+
         /* Activate the window if needed */
-        HWND hwndTop = (getTopParent()) ? getTopParent()->getWindowHandle() : 0;
-
-        if (getWindowHandle() != GetActiveWindow())
+        if(isSubclassedOS2Wnd()) {
+                Win32BaseWindow *parentwnd = GetWindowFromOS2FrameHandle(OSLibWinQueryWindow(OS2Hwnd, QWOS_PARENT));
+                if(parentwnd) {
+                        hwndTop = (parentwnd->GetTopParent()) ? parentwnd->GetTopParent()->getWindowHandle() : 0;
+                }
+                else    hwndTop = 0;
+        }
+        else    hwndTop = (GetTopParent()) ? GetTopParent()->getWindowHandle() : 0;
+
+        if (hwndTop && getWindowHandle() != GetActiveWindow())
         {
                 LONG ret = SendMessageA(WM_MOUSEACTIVATE, hwndTop,
@@ -1864 +1873 @@
         window = parentwindow;
    }
-}
-//******************************************************************************
-//******************************************************************************
-Win32BaseWindow *Win32BaseWindow::getTopParent()
-{
- Win32BaseWindow *tmpWnd = this;
-
-    while( tmpWnd && (tmpWnd->getStyle() & WS_CHILD))
-    {
-        tmpWnd = tmpWnd->getParent();
-    }
-    return tmpWnd;
 }
 //******************************************************************************