notify the timers outside of loop over m_timers to avoid crashes if a timer event...

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

diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp
index 429de81069e6bd914732d7ca953110be39acd528..a609bed7296cb87a56045b80334f9b53bdf35ac8 100644 (file)
--- a/src/gtk/evtloop.cpp
+++ b/src/gtk/evtloop.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/evtloop.cpp
+// Name:        src/gtk/evtloop.cpp
 // Purpose:     implements wxEventLoop for GTK+
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "evtloop.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -29,28 +25,12 @@
 #endif
 
 #include "wx/evtloop.h"
-#include "wx/app.h"
-
-#include <gtk/gtk.h>
-
-// ----------------------------------------------------------------------------
-// wxEventLoopImpl
-// ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxEventLoopImpl
-{
-public:
-    // ctor
-    wxEventLoopImpl() { SetExitCode(0); }
-
-    // set/get the exit code
-    void SetExitCode(int exitcode) { m_exitcode = exitcode; }
-    int GetExitCode() const { return m_exitcode; }
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
 
-private:
-    // the exit code of the event loop
-    int m_exitcode;
-};
+#include <gtk/gtk.h>
 
 // ============================================================================
 // wxEventLoop implementation
@@ -60,68 +40,90 @@ private:
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 
-wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
-
-wxEventLoop::~wxEventLoop()
+wxGUIEventLoop::wxGUIEventLoop()
 {
-    wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
+    m_exitcode = 0;
 }
 
-int wxEventLoop::Run()
+int wxGUIEventLoop::Run()
 {
     // event loops are not recursive, you need to create another loop!
-    wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
+    wxCHECK_MSG( !IsRunning(), -1, "can't reenter a message loop" );
 
-    wxEventLoop *oldLoop = ms_activeLoop;
-    ms_activeLoop = this;
-
-    m_impl = new wxEventLoopImpl;
+    wxEventLoopActivator activate(this);
 
     gtk_main();
 
-    int exitcode = m_impl->GetExitCode();
-    delete m_impl;
-    m_impl = NULL;
-
-    ms_activeLoop = oldLoop;
+    OnExit();
 
-    return exitcode;
+    return m_exitcode;
 }
 
-void wxEventLoop::Exit(int rc)
+void wxGUIEventLoop::Exit(int rc)
 {
-    wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") );
+    wxCHECK_RET( IsRunning(), "can't call Exit() if not running" );
 
-    m_impl->SetExitCode(rc);
+    m_exitcode = rc;
 
     gtk_main_quit();
 }
 
+void wxGUIEventLoop::WakeUp()
+{
+    // TODO: idle events handling should really be done by wxEventLoop itself
+    //       but for now it's completely in gtk/app.cpp so just call there when
+    //       we have wxTheApp and hope that it doesn't matter that we do
+    //       nothing when we don't...
+    if ( wxTheApp )
+        wxTheApp->WakeUpIdle();
+}
+
 // ----------------------------------------------------------------------------
 // wxEventLoop message processing dispatching
 // ----------------------------------------------------------------------------
 
-extern bool g_isIdle;
-
-bool wxEventLoop::Pending() const
+bool wxGUIEventLoop::Pending() const
 {
-    if (wxTheApp && !g_isIdle)
+    if ( wxTheApp )
     {
-        // We need to remove idle callbacks or gtk_events_pending will
-        // never return false.
-        wxTheApp->RemoveIdleTag();
-        g_isIdle = TRUE;
+        // this avoids false positives from our idle source
+        return wxTheApp->EventsPending();
     }
 
-    return gtk_events_pending();
+    return gtk_events_pending() != 0;
+}
+
+bool wxGUIEventLoop::Dispatch()
+{
+    wxCHECK_MSG( IsRunning(), false, _T("can't call Dispatch() if not running") );
+
+    // gtk_main_iteration() returns TRUE only if gtk_main_quit() was called
+    return !gtk_main_iteration();
 }
 
-bool wxEventLoop::Dispatch()
+extern "C" {
+static gboolean wx_event_loop_timeout(void* data)
 {
-    wxCHECK_MSG( IsRunning(), FALSE, _T("can't call Dispatch() if not running") );
+    bool* expired = static_cast<bool*>(data);
+    *expired = true;
 
-    gtk_main_iteration();
+    // return FALSE to remove this timeout
+    return FALSE;
+}
+}
+
+int wxGUIEventLoop::DispatchTimeout(unsigned long timeout)
+{
+    bool expired = false;
+    const unsigned id = g_timeout_add(timeout, wx_event_loop_timeout, &expired);
+    bool quit = gtk_main_iteration() != 0;
 
-    return TRUE;
+    if ( expired )
+        return -1;
+
+    g_source_remove(id);
+
+    return !quit;
 }
 
+