Tests for wxTE_PROCESS_TAB again in line with other ports

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

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index ab9e36893186bdcc635daa4600362efe117ef3be..3b28f1d1c22251fc1d84e71ea59ba9556a9a4cf1 100644 (file)
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gtk/timer.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gtk/timer.cpp

-// Purpose:
+// Purpose:     wxTimer implementation

 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling


@@ -8,35 +8,48 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "timer.h"
 #endif
 
 #pragma implementation "timer.h"
 #endif
 

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

 #include "wx/timer.h"
 
 #include "gtk/gtk.h"
 
 #include "wx/timer.h"
 
 #include "gtk/gtk.h"
 

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxTimer
 // wxTimer

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

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

 
 

-static gint timeout_callback( gpointer data )
+extern "C" 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;


@@ -57,6 +70,9 @@ bool wxTimer::Start( int millisecs, bool oneShot )
 {
     (void)wxTimerBase::Start(millisecs, oneShot);
 
 {
     (void)wxTimerBase::Start(millisecs, oneShot);
 

+    if (m_tag != -1)
+        gtk_timeout_remove( m_tag );
+

     m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
 
     return TRUE;
     m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
 
     return TRUE;


@@ -71,3 +87,5 @@ void wxTimer::Stop()
     }
 }
 
     }
 }
 

+#endif // wxUSE_TIMER
+