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

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index 89ecf05f6d..ac5b34cb14 100644
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -2,9 +2,9 @@
 // Name:        timer.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $id$
+// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -14,54 +14,115 @@
 
 #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
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
 
-gint timeout_callback( gpointer data )
+static gint timeout_callback( gpointer data )
 {
-  wxTimer *timer = (wxTimer*)data;
-  timer->Notify();
+    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
 
-  if ( timer->OneShot() )
-    timer->Stop();
+    timer->Notify();
 
-  return TRUE;
+#if (GTK_MINOR_VERSION > 0)
+    /* release lock again */
+    GDK_THREADS_LEAVE ();
+#endif
+
+    if (timer->OneShot())
+        return FALSE;
+
+    return TRUE;
 }
 
 wxTimer::wxTimer()
 {
-  m_tag = -1;
-  m_time = 1000;
-  m_oneShot = FALSE;
+    m_tag = -1;
+    m_time = 1000;
+    m_oneShot = FALSE;
 }
 
 wxTimer::~wxTimer()
 {
-  Stop();
+    Stop();
 }
 
 bool wxTimer::Start( int millisecs, bool oneShot )
 {
-  if ( millisecs != -1 )
-    m_time = millisecs;
+    if (millisecs != -1)
+    {
+        m_time = millisecs;
+    }
 
-  m_oneShot = oneShot;
+    m_oneShot = oneShot;
 
-  m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
+    m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
 
-  return TRUE;
+    return TRUE;
 }
 
 void wxTimer::Stop()
 {
-  if ( m_tag != -1 )
-  {
-    gtk_timeout_remove( m_tag );
-
-    m_tag = -1;
-  }
+    if (m_tag != -1)
+    {
+        gtk_timeout_remove( m_tag );
+        m_tag = -1;
+    }
 }