fixed (recently reintroduced) activation bug when the modal dialog was dismissed

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

diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index 4ba8547aee26d9c19c56095deec9e01b9cbddaca..6c7e74c00ff73d6b30bd763c389c84c00974437b 100644 (file)
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -240,39 +240,34 @@ int wxEventLoop::Run()
     wxEventLoopActivator activate(&ms_activeLoop, this);
     wxEventLoopImplTiedPtr impl(&m_impl, new wxEventLoopImpl);
 
     wxEventLoopActivator activate(&ms_activeLoop, this);
     wxEventLoopImplTiedPtr impl(&m_impl, new wxEventLoopImpl);
 

-    class CallEventLoopMethod
-    {
-    public:
-        typedef void (wxEventLoop::*FuncType)();
-
-        CallEventLoopMethod(wxEventLoop *evtLoop, FuncType fn)
-            : m_evtLoop(evtLoop), m_fn(fn) { }
-        ~CallEventLoopMethod() { (m_evtLoop->*m_fn)(); }
-
-    private:
-        wxEventLoop *m_evtLoop;
-        FuncType m_fn;
-    } callOnExit(this, &wxEventLoop::OnExit);
-
-    for ( ;; )
+    // we must ensure that OnExit() is called even if an exception is thrown
+    // from inside Dispatch() but we must call it from Exit() in normal
+    // situations because it is supposed to be called synchronously,
+    // wxModalEventLoop depends on this (so we can't just use ON_BLOCK_EXIT or
+    // something similar here)
+    wxTRY

     {
     {

+        for ( ;; )
+        {

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-        wxMutexGuiLeaveOrEnter();
+            wxMutexGuiLeaveOrEnter();

 #endif // wxUSE_THREADS
 
 #endif // wxUSE_THREADS
 

-        // generate and process idle events for as long as we don't have
-        // anything else to do
-        while ( !Pending() && m_impl->SendIdleMessage() )
-            ;
+            // generate and process idle events for as long as we don't have
+            // anything else to do
+            while ( !Pending() && m_impl->SendIdleMessage() )
+                ;

 
 

-        // a message came or no more idle processing to do, sit in
-        // Dispatch() waiting for the next message
-        if ( !Dispatch() )
-        {
-            // we got WM_QUIT
-            break;
+            // a message came or no more idle processing to do, sit in
+            // Dispatch() waiting for the next message
+            if ( !Dispatch() )
+            {
+                // we got WM_QUIT
+                break;
+            }

         }
     }
         }
     }

+    wxCATCH_ALL( OnExit(); )

 
     return m_impl->GetExitCode();
 }
 
     return m_impl->GetExitCode();
 }


@@ -283,6 +278,8 @@ void wxEventLoop::Exit(int rc)
 
     m_impl->SetExitCode(rc);
 
 
     m_impl->SetExitCode(rc);
 

+    OnExit();
+

     ::PostQuitMessage(rc);
 }
 
     ::PostQuitMessage(rc);
 }