fixed crash in tables deallocation

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

diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp
index 36aada6e6fc9c92920245527a2b1ca33c5c45163..a27905231d5fa8944847b85bf240aaeb6b2f5c07 100644 (file)
--- a/src/gtk/timer.cpp
+++ b/src/gtk/timer.cpp
@@ -15,6 +15,51 @@
 #include "wx/timer.h"
 
 #include "gtk/gtk.h"
 #include "wx/timer.h"
 
 #include "gtk/gtk.h"

+/*
+#include "glib.h"
+*/
+
+//-----------------------------------------------------------------------------
+// global functions
+//-----------------------------------------------------------------------------
+
+/*
+static GTimer *g_timer = (GTimer*) NULL;
+
+void wxStartTimer()
+{
+    if (g_timer)
+    {
+        g_timer_rest( g_timer );
+    }
+    else
+    {
+        g_timer = g_timer_new();
+        g_timer_start( g_timer );
+    }
+}
+
+long wxGetElapsedTime( bool resetTimer )
+{
+    gulong res = 0;
+    if (g_timer)
+    {
+        g_timer_elapsed( g_timer, &res );
+       if (resetTimer) g_timer_reset( g_timer );
+    }
+    
+    return res;
+}
+
+bool wxGetLocalTime( long *timeZone, int *dstObserved )
+{
+}
+
+long wxGetCurrentTime()
+{
+}
+*/
+

 
 //-----------------------------------------------------------------------------
 // wxTimer
 
 //-----------------------------------------------------------------------------
 // wxTimer


@@ -22,15 +67,26 @@
 
 IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
 

-gint timeout_callback( gpointer data )
+static gint timeout_callback( gpointer data )

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

+#if (GTK_MINOR_VERSION > 0)
+    /* release lock again */
+    GDK_THREADS_LEAVE ();
+#endif
+

     if (timer->OneShot())
     if (timer->OneShot())

-    {

         timer->Stop();
         timer->Stop();

-    }

 
     return TRUE;
 }
 
     return TRUE;
 }