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

Timestamp:

Apr 24, 2003, 3:59:15 PM (22 years ago)

Author:

sandervl

Message:

EndDialog: Enable owner window regardless of whether it was enabled before dialog creation & check for fake windows in GetWindowFromOS2Handle

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.367 2003-04-23 18:00:59 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.368 2003-04-24 13:59:14 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -48 +48 @@
 #include <custombuild.h>
 #include "win32wbase.h"
+#include "win32wfake.h"
 #include "wndmsg.h"
 #include "oslibwin.h"
@@ -1143 +1144 @@
                                         MAKELONG( lastHitTestVal, msg->message) );
 
-                dprintf2(("WM_MOUSEACTIVATE returned %d", ret));
+                dprintf2(("WM_MOUSEACTIVATE returned %d foreground %x top %x", ret, GetForegroundWindow(), hwndTop));
 #if 0
                 if ((ret == MA_ACTIVATEANDEAT) || (ret == MA_NOACTIVATEANDEAT))
@@ -1157 +1158 @@
 
                     //SvL: Calling OSLibSetActiveWindow(hwndTop); causes focus problems
-                    if (win32top && !win32top->isFakeWindow()) {
+                    if (win32top) {
                         //Must use client window handle (not frame!!)
                         SetFocus(win32top->getWindowHandle());
@@ -2625 +2626 @@
             NotifyFrameChanged(&wpos, &oldClientRect);
         }
-        if(!fShowWindow && !(getStyle() & WS_MINIMIZE) && !(fuFlags & (SWP_NOSIZE | SWP_NOMOVE)))
+        if(!fShowWindow && !(getStyle() & (WS_MINIMIZE|WS_MAXIMIZE)) && !(fuFlags & (SWP_NOSIZE | SWP_NOMOVE)))
         {
             //Restore position always changes when the window position is changed
@@ -2700 +2701 @@
         NotifyFrameChanged(&wpos, &oldClientRect);
     }
-    if(!fShowWindow && !(getStyle() & WS_MINIMIZE))
+    if(!fShowWindow && !(getStyle() & (WS_MINIMIZE|WS_MAXIMIZE)))
     {
         //Restore position always changes when the window position is changed
@@ -3617 +3618 @@
 }
 //******************************************************************************
-//WM_ENABLE is sent to hwnd, but not to it's children (as it should be)
+//WM_ENABLE is sent to hwnd, but not to its children (as it should be)
 //******************************************************************************
 BOOL Win32BaseWindow::EnableWindow(BOOL fEnable)
@@ -4115 +4116 @@
     }
 //  dprintf2(("Win32BaseWindow::GetWindowFromOS2Handle: not an Odin os2 window %x", hwndOS2));
+
+    //Now check if it's a fake window 
+    Win32FakeWindow *window = Win32FakeWindow::GetWindowFromOS2Handle(hwndOS2);
+    if(window) {
+        return window;
+    }
     return 0;
 }