Fix crash in wxDC::GetMultiLineTextExtent() after last commit.

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

diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp
index c5e8bd37add140f03a8b4ebbc29f69811547ede3..8f9fd46dc0b62e9d76852f608847c6c3e47689e1 100644 (file)
--- a/src/gtk/timer.cpp
+++ b/src/gtk/timer.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/timer.cpp
+// Name:        src/gtk/timer.cpp
 // Purpose:     wxTimer implementation
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -12,28 +12,24 @@
 
 #if wxUSE_TIMER
 
-#include "wx/timer.h"
+#include "wx/gtk/private/timer.h"
+#include "wx/app.h"
 
-#include "gtk/gtk.h"
+#include <gtk/gtk.h>
 
 // ----------------------------------------------------------------------------
-// wxTimer
+// wxTimerImpl
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
-
 extern "C" {
-static gint timeout_callback( gpointer data )
-{
-    wxTimer *timer = (wxTimer*)data;
 
-    // Don't change the order of anything in this callback!
+static gboolean timeout_callback(gpointer data)
+{
+    wxGTKTimerImpl *timer = (wxGTKTimerImpl*)data;
 
-    if (timer->IsOneShot())
-    {
-        // This sets m_tag to -1
+    const bool keepGoing = !timer->IsOneShot();
+    if ( !keepGoing )
         timer->Stop();
-    }
 
     // When getting called from GDK's timer handler we
     // are no longer within GDK's grab on the GUI
@@ -45,43 +41,33 @@ static gint timeout_callback( gpointer data )
     // Release lock again.
     gdk_threads_leave();
 
-    if (timer->IsOneShot())
-        return FALSE;
-
-    return TRUE;
-}
-}
+    wxApp* app = wxTheApp;
+    if (app)
+        app->WakeUpIdle();
 
-void wxTimer::Init()
-{
-    m_tag = -1;
-    m_milli = 1000;
+    return keepGoing;
 }
 
-wxTimer::~wxTimer()
-{
-    wxTimer::Stop();
-}
+} // extern "C"
 
-bool wxTimer::Start( int millisecs, bool oneShot )
+bool wxGTKTimerImpl::Start(int millisecs, bool oneShot)
 {
-    (void)wxTimerBase::Start(millisecs, oneShot);
+    if ( !wxTimerImpl::Start(millisecs, oneShot) )
+        return false;
 
-    if (m_tag != -1)
-        gtk_timeout_remove( m_tag );
+    wxASSERT_MSG( !m_sourceId, wxT("shouldn't be still running") );
 
-    m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
+    m_sourceId = g_timeout_add(m_milli, timeout_callback, this);
 
-    return TRUE;
+    return true;
 }
 
-void wxTimer::Stop()
+void wxGTKTimerImpl::Stop()
 {
-    if (m_tag != -1)
-    {
-        gtk_timeout_remove( m_tag );
-        m_tag = -1;
-    }
+    wxASSERT_MSG( m_sourceId, wxT("should be running") );
+
+    g_source_remove(m_sourceId);
+    m_sourceId = 0;
 }
 
 #endif // wxUSE_TIMER