Changeset 7294 for trunk/src/user32/win32dlg.cpp

Timestamp:

Nov 7, 2001, 4:36:10 PM (24 years ago)

Author:

sandervl

Message:

EndDialog fix

File:

• trunk/src/user32/win32dlg.cpp (modified) (2 diffs)

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.71 2001-10-28 10:38:13 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.72 2001-11-07 15:36:10 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -1081 +1081 @@
 BOOL Win32Dialog::endDialog(int retval)
 {
+    HWND hwnd = getWindowHandle();
+
     dialogFlags |= DF_END;
     idResult = retval;
 
+//    BOOL wasEnabled = (dlgInfo.flags & DF_OWNERENABLED);
+
+//    if (wasEnabled && (owner = GetWindow( hwnd, GW_OWNER )))
+//        DIALOG_EnableOwner( owner );
+
+    /* Windows sets the focus to the dialog itself in EndDialog */
+
+    if (::IsChild(hwnd, GetFocus()))
+       ::SetFocus( hwnd );
+
+    /* Don't have to send a ShowWindow(SW_HIDE), just do
+       SetWindowPos with SWP_HIDEWINDOW as done in Windows */
+
+    ::SetWindowPos(hwnd, (HWND)0, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE
+                 | SWP_NOZORDER | SWP_NOACTIVATE | SWP_HIDEWINDOW);
+
+    /* unblock dialog loop */
+    PostMessageA(hwnd, WM_NULL, 0, 0); 
     return TRUE;
 }