X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbe0af5b15f8b8e95ed45abc2140fb3a1fac3c87..3096bd2fa7b88105bc54c08e3c878585de1a9b91:/src/gtk1/timer.cpp

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index fb74fc13dc..ac5b34cb14 100644
--- 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 (GTK_MINOR_VERSION > 0)
+    /* release lock again */
+    GDK_THREADS_LEAVE ();
+#endif
+
     if (timer->OneShot())
-    {
-        timer->Stop();
-    }
+        return FALSE;
 
     return TRUE;
 }