X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbe0af5b15f8b8e95ed45abc2140fb3a1fac3c87..549c6f67f9181e3ad8abfffa8c0c6cdd7ec49e5a:/src/gtk/timer.cpp

diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp
index fb74fc13dc..a27905231d 100644
--- a/src/gtk/timer.cpp
+++ b/src/gtk/timer.cpp
@@ -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 TRUE;
 }