don't crash when restoring focus after showing a modal dialog

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index ad9de2c9698be90dd3e843e6fc20ca64a5e46a81..581c50198fca8bc6dfda8f1a0063442071f6dce9 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -167,18 +167,8 @@ void wxDialog::DoShowModal()
 
     wxModalDialogs.Append(this);
 
-      wxWindow *parent = GetParent();
+    wxWindow *parent = GetParent();
 
-    // remember where the focus was
-    wxWindow *winFocus = FindFocus();
-    if ( !winFocus )
-    {
-        winFocus = parent;
-    }
-    if ( !winFocus )
-    {
-        winFocus = wxTheApp->GetTopWindow();
-    }
 #if TARGET_CARBON
     BeginAppModalStateForWindow(  (WindowRef) MacGetWindowRef()) ;
 #else
@@ -198,13 +188,6 @@ void wxDialog::DoShowModal()
     // TODO probably reenable the parent window if any
     s_macIsInModalLoop = formerModal ;
 #endif
-
-
-    // and restore focus
-    if ( winFocus )
-    {
-        winFocus->SetFocus();
-    }
 }
 
 

diff --git a/src/mac/dialog.cpp b/src/mac/dialog.cpp
index ad9de2c9698be90dd3e843e6fc20ca64a5e46a81..581c50198fca8bc6dfda8f1a0063442071f6dce9 100644 (file)
--- a/src/mac/dialog.cpp
+++ b/src/mac/dialog.cpp
@@ -167,18 +167,8 @@ void wxDialog::DoShowModal()
 
     wxModalDialogs.Append(this);
 
-      wxWindow *parent = GetParent();
+    wxWindow *parent = GetParent();
 
-    // remember where the focus was
-    wxWindow *winFocus = FindFocus();
-    if ( !winFocus )
-    {
-        winFocus = parent;
-    }
-    if ( !winFocus )
-    {
-        winFocus = wxTheApp->GetTopWindow();
-    }
 #if TARGET_CARBON
     BeginAppModalStateForWindow(  (WindowRef) MacGetWindowRef()) ;
 #else
@@ -198,13 +188,6 @@ void wxDialog::DoShowModal()
     // TODO probably reenable the parent window if any
     s_macIsInModalLoop = formerModal ;
 #endif
-
-
-    // and restore focus
-    if ( winFocus )
-    {
-        winFocus->SetFocus();
-    }
 }