Changeset 10033 for trunk/src

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

Location:

trunk/src/user32

Files:

• win32dlg.cpp (modified) (4 diffs)
• win32wbase.cpp (modified) (8 diffs)
• win32wfake.cpp (modified) (2 diffs)

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.80 2002-12-18 14:04:24 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.81 2003-04-24 13:59:14 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -27 +27 @@
 #include <math.h>
 #include <unicode.h>
+#include "user32api.h"
 
 #define DBG_LOCALLOG    DBG_win32dlg
@@ -34 +35 @@
 
 #define GET_SHORT(ptr)     (*(SHORT *)(ptr))
+
 
 //******************************************************************************
@@ -1137 +1139 @@
     /* Windows sets the focus to the dialog itself in EndDialog */
 
+#ifdef __WIN32OS2__
+    if (::IsChild(hwnd, GetFocus()))
+    {
+       ::SetFocus( hwnd );
+       //SvL: Enable the owner if the focus is on one of its children.
+       //     If we don't, then PM will switch focus to another app since
+       //     we hide the window below (hidden windows cannot have focus)
+       HWND owner = ::GetWindow( hwnd, GW_OWNER);
+       if(owner)
+           ::EnableWindow(owner, TRUE);
+    }
+#else
     if (::IsChild(hwnd, GetFocus()))
        ::SetFocus( hwnd );
+#endif
 
     /* Don't have to send a ShowWindow(SW_HIDE), just do

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;
 }

trunk/src/user32/win32wfake.cpp

@@ -1 @@
-/* $Id: win32wfake.cpp,v 1.3 2003-04-23 18:01:01 sandervl Exp $ */
+/* $Id: win32wfake.cpp,v 1.4 2003-04-24 13:59:15 sandervl Exp $ */
 /*
  * Win32 Fake Window Class for OS/2
@@ -251 +251 @@
         DebugInt3();
     }
-    dprintf(("Win32FakeWindow::GetWindowFromOS2Handle(%x) -> null", hwndOS2));
+    dprintf2(("Win32FakeWindow::GetWindowFromOS2Handle(%x) -> null", hwndOS2));
     return NULL;
 }