X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2a8f35c325aefa509f456f933986e5652191faf9..bcac1ec21b14525db9bb0e7f649dba6f5fcc3605:/src/msw/evtloop.cpp

diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index 6c7e74c00f..55ce24cbe5 100644
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -52,41 +52,10 @@
     WX_DEFINE_OBJARRAY(wxMsgArray);
 #endif // wxUSE_THREADS
 
-// ----------------------------------------------------------------------------
-// wxEventLoopImpl
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxEventLoopImpl
-{
-public:
-    // ctor
-    wxEventLoopImpl() { SetExitCode(0); }
-
-    // process a message
-    void ProcessMessage(MSG *msg);
-
-    // generate an idle message, return TRUE if more idle time requested
-    bool SendIdleMessage();
-
-    // set/get the exit code
-    void SetExitCode(int exitcode) { m_exitcode = exitcode; }
-    int GetExitCode() const { return m_exitcode; }
-
-private:
-    // preprocess a message, return TRUE if processed (i.e. no further
-    // dispatching required)
-    bool PreProcessMessage(MSG *msg);
-
-    // the exit code of the event loop
-    int m_exitcode;
-};
-
 // ----------------------------------------------------------------------------
 // helper class
 // ----------------------------------------------------------------------------
 
-wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoopImpl);
-
 // this object sets the wxEventLoop given to the ctor as the currently active
 // one and unsets it in its dtor
 class wxEventLoopActivator
@@ -112,14 +81,26 @@ private:
 };
 
 // ============================================================================
-// wxEventLoopImpl implementation
+// wxEventLoop implementation
 // ============================================================================
 
+wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
+
 // ----------------------------------------------------------------------------
-// wxEventLoopImpl message processing
+// ctor/dtor
 // ----------------------------------------------------------------------------
 
-void wxEventLoopImpl::ProcessMessage(MSG *msg)
+wxEventLoop::wxEventLoop()
+{
+    m_shouldExit = false;
+    m_exitcode = 0;
+}
+
+// ----------------------------------------------------------------------------
+// wxEventLoop message processing
+// ----------------------------------------------------------------------------
+
+void wxEventLoop::ProcessMessage(WXMSG *msg)
 {
     // give us the chance to preprocess the message first
     if ( !PreProcessMessage(msg) )
@@ -130,7 +111,7 @@ void wxEventLoopImpl::ProcessMessage(MSG *msg)
     }
 }
 
-bool wxEventLoopImpl::PreProcessMessage(MSG *msg)
+bool wxEventLoop::PreProcessMessage(WXMSG *msg)
 {
     HWND hwnd = msg->hwnd;
     wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd);
@@ -141,7 +122,7 @@ bool wxEventLoopImpl::PreProcessMessage(MSG *msg)
     if ( !wndThis )
     {
         // we need to find the dialog containing this control as
-        // IsDialogMessage() just eats all the messages (i.e. returns TRUE for
+        // IsDialogMessage() just eats all the messages (i.e. returns true for
         // them) if we call it for the control itself
         while ( hwnd && ::GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD )
         {
@@ -169,7 +150,7 @@ bool wxEventLoopImpl::PreProcessMessage(MSG *msg)
     // grab Ctrl-C/V/X, even if they are also accelerators in some parent)
     if ( !wndThis->MSWShouldPreProcessMessage((WXMSG *)msg) )
     {
-        return FALSE;
+        return false;
     }
 
     // try translations first: the accelerators override everything
@@ -178,7 +159,7 @@ bool wxEventLoopImpl::PreProcessMessage(MSG *msg)
     for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
     {
         if ( wnd->MSWTranslateMessage((WXMSG *)msg))
-            return TRUE;
+            return true;
 
         // stop at first top level window, i.e. don't try to process the key
         // strokes originating in a dialog using the accelerators of the parent
@@ -193,40 +174,20 @@ bool wxEventLoopImpl::PreProcessMessage(MSG *msg)
     for ( wnd = wndThis->GetParent(); wnd; wnd = wnd->GetParent() )
     {
         if ( wnd->MSWProcessMessage((WXMSG *)msg) )
-            return TRUE;
+            return true;
     }
 
     // no special preprocessing for this message, dispatch it normally
-    return FALSE;
+    return false;
 }
 
-// ----------------------------------------------------------------------------
-// wxEventLoopImpl idle event processing
-// ----------------------------------------------------------------------------
-
-bool wxEventLoopImpl::SendIdleMessage()
-{
-    return wxTheApp->ProcessIdle();
-}
-
-// ============================================================================
-// wxEventLoop implementation
-// ============================================================================
-
-wxEventLoop *wxEventLoop::ms_activeLoop = NULL;
-
 // ----------------------------------------------------------------------------
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 
-wxEventLoop::~wxEventLoop()
-{
-    wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
-}
-
 bool wxEventLoop::IsRunning() const
 {
-    return m_impl != NULL;
+    return ms_activeLoop == this;
 }
 
 int wxEventLoop::Run()
@@ -234,53 +195,102 @@ int wxEventLoop::Run()
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 
-    // SendIdleMessage() and Dispatch() below may throw so the code here should
+    // ProcessIdle() and Dispatch() below may throw so the code here should
     // be exception-safe, hence we must use local objects for all actions we
     // should undo
     wxEventLoopActivator activate(&ms_activeLoop, this);
-    wxEventLoopImplTiedPtr impl(&m_impl, new wxEventLoopImpl);
 
     // 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
+#if wxUSE_EXCEPTIONS
+    for ( ;; )
     {
-        for ( ;; )
+        try
         {
-#if wxUSE_THREADS
-            wxMutexGuiLeaveOrEnter();
-#endif // wxUSE_THREADS
+#endif // wxUSE_EXCEPTIONS
 
-            // generate and process idle events for as long as we don't have
-            // anything else to do
-            while ( !Pending() && m_impl->SendIdleMessage() )
-                ;
+            // this is the event loop itself
+            for ( ;; )
+            {
+                #if wxUSE_THREADS
+                    wxMutexGuiLeaveOrEnter();
+                #endif // wxUSE_THREADS
+
+                // generate and process idle events for as long as we don't
+                // have anything else to do
+                while ( !Pending() && (wxTheApp && wxTheApp->ProcessIdle()) )
+                    ;
+
+                // 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_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;
+                }
+            }
 
-            // a message came or no more idle processing to do, sit in
-            // Dispatch() waiting for the next message
-            if ( !Dispatch() )
+#if wxUSE_EXCEPTIONS
+            // exit the outer loop as well
+            break;
+        }
+        catch ( ... )
+        {
+            try
+            {
+                if ( !wxTheApp || !wxTheApp->OnExceptionInMainLoop() )
+                {
+                    OnExit();
+                    break;
+                }
+                //else: continue running the event loop
+            }
+            catch ( ... )
             {
-                // we got WM_QUIT
-                break;
+                // OnException() throwed, possibly rethrowing the same
+                // exception again: very good, but we still need OnExit() to
+                // be called
+                OnExit();
+                throw;
             }
         }
     }
-    wxCATCH_ALL( OnExit(); )
+#endif // wxUSE_EXCEPTIONS
 
-    return m_impl->GetExitCode();
+    return m_exitcode;
 }
 
 void wxEventLoop::Exit(int rc)
 {
     wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") );
 
-    m_impl->SetExitCode(rc);
+    m_exitcode = rc;
+    m_shouldExit = true;
 
     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);
 }
 
 // ----------------------------------------------------------------------------
@@ -295,7 +305,7 @@ bool wxEventLoop::Pending() const
 
 bool wxEventLoop::Dispatch()
 {
-    wxCHECK_MSG( IsRunning(), FALSE, _T("can't call Dispatch() if not running") );
+    wxCHECK_MSG( IsRunning(), false, _T("can't call Dispatch() if not running") );
 
     MSG msg;
     BOOL rc = ::GetMessage(&msg, (HWND) NULL, 0, 0);
@@ -303,7 +313,7 @@ bool wxEventLoop::Dispatch()
     if ( rc == 0 )
     {
         // got WM_QUIT
-        return FALSE;
+        return false;
     }
 
     if ( rc == -1 )
@@ -312,14 +322,14 @@ bool wxEventLoop::Dispatch()
         wxLogLastError(wxT("GetMessage"));
 
         // still break from the loop
-        return FALSE;
+        return false;
     }
 
 #if wxUSE_THREADS
     wxASSERT_MSG( wxThread::IsMain(),
                   wxT("only the main thread can process Windows messages") );
 
-    static bool s_hadGuiLock = TRUE;
+    static bool s_hadGuiLock = true;
     static wxMsgArray s_aSavedMessages;
 
     // if a secondary thread owning the mutex is doing GUI calls, save all
@@ -327,7 +337,7 @@ bool wxEventLoop::Dispatch()
     // it will lead to recursive library calls (and we're not reentrant)
     if ( !wxGuiOwnedByMainThread() )
     {
-        s_hadGuiLock = FALSE;
+        s_hadGuiLock = false;
 
         // leave out WM_COMMAND messages: too dangerous, sometimes
         // the message will be processed twice
@@ -336,7 +346,7 @@ bool wxEventLoop::Dispatch()
             s_aSavedMessages.Add(msg);
         }
 
-        return TRUE;
+        return true;
     }
     else
     {
@@ -347,13 +357,13 @@ bool wxEventLoop::Dispatch()
         //       messages normally - expect some things to break...
         if ( !s_hadGuiLock )
         {
-            s_hadGuiLock = TRUE;
+            s_hadGuiLock = true;
 
             size_t count = s_aSavedMessages.Count();
             for ( size_t n = 0; n < count; n++ )
             {
                 MSG& msg = s_aSavedMessages[n];
-                m_impl->ProcessMessage(&msg);
+                ProcessMessage(&msg);
             }
 
             s_aSavedMessages.Empty();
@@ -361,8 +371,8 @@ bool wxEventLoop::Dispatch()
     }
 #endif // wxUSE_THREADS
 
-    m_impl->ProcessMessage(&msg);
+    ProcessMessage(&msg);
 
-    return TRUE;
+    return true;
 }