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

src/msw/evtloop.cpp

@@ -240,20 +240,13 @@ int wxEventLoop::Run()
     wxEventLoopActivator activate(&ms_activeLoop, this);
     wxEventLoopImplTiedPtr impl(&m_impl, new wxEventLoopImpl);
 
-    class CallEventLoopMethod
+    // 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
     {
-    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 ( ;; )
         {
 #if wxUSE_THREADS
@@ -273,6 +266,8 @@ int wxEventLoop::Run()
                 break;
             }
         }
+    }
+    wxCATCH_ALL( OnExit(); )
 
     return m_impl->GetExitCode();
 }
@@ -283,6 +278,8 @@ void wxEventLoop::Exit(int rc)
 
     m_impl->SetExitCode(rc);
 
+    OnExit();
+
     ::PostQuitMessage(rc);
 }