X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/903506828b7d042350eae97b5014a63ffca17ef5..d35dce3a2e3ca417093eaa192f1e9e54e55a22ba:/src/gtk1/timer.cpp?ds=sidebyside

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index a8514f8cd1..3b28f1d1c2 100644
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -8,11 +8,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #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,23 +25,31 @@
 // wxTimer
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 
 extern "C" 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;