avoid infinite recursion by not using GetMaxWidth/Height() from GetMaxSize() implemen...

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

diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp
index f8531ba81c3ffe82d0142ec5c83ef1a20080cd9b..eb7a15fbb5db874745ae9bfcea3ac22b2823926b 100644 (file)
--- a/src/gtk/timer.cpp
+++ b/src/gtk/timer.cpp
@@ -7,12 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
-#ifdef __GNUG__
-#pragma implementation "timer.h"
-#endif
-
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #if wxUSE_TIMER
 
@@ -24,27 +20,37 @@
 // wxTimer
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 
+extern "C" {
 static gint timeout_callback( gpointer data )
 {
     wxTimer *timer = (wxTimer*)data;
 
-    /* when getting called from GDK's timer handler we
-       are no longer within GDK's grab on the GUI
-       thread so we must lock it here ourselves */
+    // Don't change the order of anything in this callback!
+
+    if (timer->IsOneShot())
+    {
+        // This sets m_tag to -1
+        timer->Stop();
+    }
+
+    // When getting called from GDK's timer handler we
+    // are no longer within GDK's grab on the GUI
+    // thread so we must lock it here ourselves.
     gdk_threads_enter();
 
     timer->Notify();
 
-    /* release lock again */
+    // Release lock again.
     gdk_threads_leave();
 
-    if ( timer->IsOneShot() )
+    if (timer->IsOneShot())
         return FALSE;
 
     return TRUE;
 }
+}
 
 void wxTimer::Init()
 {
@@ -61,7 +67,10 @@ bool wxTimer::Start( int millisecs, bool oneShot )
 {
     (void)wxTimerBase::Start(millisecs, oneShot);
 
-    m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
+    if (m_tag != -1)
+        g_source_remove( m_tag );
+
+    m_tag = g_timeout_add( m_milli, timeout_callback, this );
 
     return TRUE;
 }
@@ -70,7 +79,7 @@ void wxTimer::Stop()
 {
     if (m_tag != -1)
     {
-        gtk_timeout_remove( m_tag );
+        g_source_remove( m_tag );
         m_tag = -1;
     }
 }