backport r61269, fixes #10986

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_9_0_BRANCH@61420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-13 05:12:22 +00:00
parent 788c9a27ad
commit fc5875fca8
1 changed files with 4 additions and 11 deletions
--- a/src/osx/carbon/dialog.cpp
+++ b/src/osx/carbon/dialog.cpp
@@ -47,17 +47,10 @@ void wxDialog::DoShowModal()
    }
    BeginAppModalStateForWindow(windowRef) ;

-    wxEventLoop * const
-        loop = static_cast<wxEventLoop *>(wxEventLoop::GetActive());
-        
-    
-    wxASSERT_MSG( loop , wxT("No Event Loop in place") );
-        
-    if ( loop )
-    {
-        while ( IsModal() )
-            loop->Dispatch();
-    }
+    wxEventLoopGuarantor ensureHasLoop;
+    wxEventLoopBase * const loop = wxEventLoop::GetActive();
+    while ( IsModal() )
+        loop->Dispatch();

    EndAppModalStateForWindow(windowRef) ;
    if ( resetGroupParent )