commit 15c58c42398e68c7830d5c488bfe0e02e3276222
author Abey George <abey@macadamian.com> Sat Aug 07 14:10:04 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Aug 07 14:10:04 1999 +0000
tree 5b524faad7cdb60c567bca2c76772d7ce2b96bed
parent acc19d320bf3ba331dae4ba59252bf27deb86ded

Set focus to the dialog in EndDialog.

windows/defdlg.c

diff --git a/windows/defdlg.c b/windows/defdlg.c
index 05f234c..133dd09 100644
--- a/windows/defdlg.c
+++ b/windows/defdlg.c
@@ -53,7 +53,11 @@
 {
     if (!infoPtr->hwndFocus || IsIconic(hwnd)) return FALSE;
     if (!IsWindow( infoPtr->hwndFocus )) return FALSE;
-    DEFDLG_SetFocus( hwnd, infoPtr->hwndFocus );
+
+    /* Don't set the focus back to controls if EndDialog is already called.*/
+    if (!(infoPtr->flags & DF_END))
+       DEFDLG_SetFocus( hwnd, infoPtr->hwndFocus );
+
     /* This used to set infoPtr->hwndFocus to NULL for no apparent reason,
        sometimes losing focus when receiving WM_SETFOCUS messages. */
     return TRUE;