made more clear that GetItemRect() returns physical coords

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

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index a8514f8cd169098e08cfc5694cc2b6b332396a63..e004d2d4bea293908db6fb21824c1f23a1ead528 100644 (file)
--- 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
 
 #pragma implementation "timer.h"
 #endif
 

-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #if wxUSE_TIMER
 
 
 #if wxUSE_TIMER
 


@@ -24,27 +25,37 @@
 // wxTimer
 // ----------------------------------------------------------------------------
 
 // wxTimer
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)

 
 

-extern "C" gint timeout_callback( gpointer data )
+extern "C" {
+static gint timeout_callback( gpointer data )

 {
     wxTimer *timer = (wxTimer*)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();
 
     gdk_threads_enter();
 
     timer->Notify();
 

-    /* release lock again */
+    // Release lock again.

     gdk_threads_leave();
 
     gdk_threads_leave();
 

-    if ( timer->IsOneShot() )
+    if (timer->IsOneShot())

         return FALSE;
 
     return TRUE;
 }
         return FALSE;
 
     return TRUE;
 }

+}

 
 void wxTimer::Init()
 {
 
 void wxTimer::Init()
 {