Fixes for application not closing after last top level

[wxWidgets.git] / src / msw / evtloop.cpp

diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index 4ba8547aee26d9c19c56095deec9e01b9cbddaca..7810e76c0b32f9963223928ce0bc36bf9b5b7ee3 100644 (file)
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -60,7 +60,7 @@ class WXDLLEXPORT wxEventLoopImpl
 {
 public:
     // ctor
 {
 public:
     // ctor

-    wxEventLoopImpl() { SetExitCode(0); }
+    wxEventLoopImpl() { m_exitcode = 0; m_shouldExit = false; }

 
     // process a message
     void ProcessMessage(MSG *msg);
 
     // process a message
     void ProcessMessage(MSG *msg);


@@ -69,8 +69,9 @@ public:
     bool SendIdleMessage();
 
     // set/get the exit code
     bool SendIdleMessage();
 
     // set/get the exit code

-    void SetExitCode(int exitcode) { m_exitcode = exitcode; }
+    void Exit(int exitcode) { m_exitcode = exitcode; m_shouldExit = true; }

     int GetExitCode() const { return m_exitcode; }
     int GetExitCode() const { return m_exitcode; }

+    bool ShouldExit() const { return m_shouldExit; }

 
 private:
     // preprocess a message, return TRUE if processed (i.e. no further
 
 private:
     // preprocess a message, return TRUE if processed (i.e. no further


@@ -79,6 +80,9 @@ private:
 
     // the exit code of the event loop
     int m_exitcode;
 
     // the exit code of the event loop
     int m_exitcode;

+
+    // true if we were asked to terminate
+    bool m_shouldExit;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -240,39 +244,45 @@ 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;
+            // if the "should exit" flag is set, the loop should terminate but
+            // not before processing any remaining messages so while Pending()
+            // returns true, do process them
+            if ( m_impl->ShouldExit() )
+            {
+                while ( Pending() )
+                    Dispatch();
+
+                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();
 }


@@ -281,9 +291,18 @@ void wxEventLoop::Exit(int rc)
 {
     wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") );
 
 {
     wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") );
 

-    m_impl->SetExitCode(rc);
+    m_impl->Exit(rc);
+
+    OnExit();

 
 

-    ::PostQuitMessage(rc);
+    // all we have to do to exit from the loop is to (maybe) wake it up so that
+    // it can notice that Exit() had been called
+    //
+    // in particular, we do *not* use PostQuitMessage() here because we're not
+    // sure that WM_QUIT is going to be processed by the correct event loop: it
+    // is possible that another one is started before this one has a chance to
+    // process WM_QUIT
+    ::PostMessage(NULL, WM_NULL, 0, 0);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------