bitmap and image updates

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

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index fb74fc13dc8bc7352e50c127c7339fe1c8773d13..ca8a477d356b1f20e3c3d7fb1859a5ea1c0167a0 100644 (file)
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -45,9 +45,9 @@ long wxGetElapsedTime( bool resetTimer )
     if (g_timer)
     {
         g_timer_elapsed( g_timer, &res );
-       if (resetTimer) g_timer_reset( g_timer );
+        if (resetTimer) g_timer_reset( g_timer );
     }
-    
+
     return res;
 }
 
@@ -67,15 +67,26 @@ long wxGetCurrentTime()
 
 IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
 
-gint timeout_callback( gpointer data )
+static gint timeout_callback( gpointer data )
 {
     wxTimer *timer = (wxTimer*)data;
+
+#if (GTK_MINOR_VERSION > 0)
+    /* 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 ();
+#endif
+
     timer->Notify();
 
-    if (timer->OneShot())
-    {
-        timer->Stop();
-    }
+#if (GTK_MINOR_VERSION > 0)
+    /* release lock again */
+    GDK_THREADS_LEAVE ();
+#endif
+
+    if ( timer->IsOneShot() )
+        return FALSE;
 
     return TRUE;
 }
@@ -83,25 +94,20 @@ gint timeout_callback( gpointer data )
 wxTimer::wxTimer()
 {
     m_tag = -1;
-    m_time = 1000;
+    m_milli = 1000;
     m_oneShot = FALSE;
 }
 
 wxTimer::~wxTimer()
 {
-    Stop();
+    wxTimer::Stop();
 }
 
 bool wxTimer::Start( int millisecs, bool oneShot )
 {
-    if (millisecs != -1)
-    {
-        m_time = millisecs;
-    }
-
-    m_oneShot = oneShot;
+    (void)wxTimerBase::Start(millisecs, oneShot);
 
-    m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
+    m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
 
     return TRUE;
 }