Changeset 10033 for trunk/src/user32/win32dlg.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/win32dlg.cpp (modified) (4 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