X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbe0af5b15f8b8e95ed45abc2140fb3a1fac3c87..050c9e3c90c58b05d5b3f7384d1556ca9669f13e:/src/gtk1/timer.cpp?ds=sidebyside

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index fb74fc13dc..f8531ba81c 100644
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        timer.cpp
-// Purpose:
+// Name:        gtk/timer.cpp
+// Purpose:     wxTimer implementation
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -12,96 +12,56 @@
 #pragma implementation "timer.h"
 #endif
 
-#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;
-}
+#include "wx/defs.h"
 
-bool wxGetLocalTime( long *timeZone, int *dstObserved )
-{
-}
+#if wxUSE_TIMER
 
-long wxGetCurrentTime()
-{
-}
-*/
+#include "wx/timer.h"
 
+#include "gtk/gtk.h"
 
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // wxTimer
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
-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;
+
+    /* 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();
+
     timer->Notify();
 
-    if (timer->OneShot())
-    {
-        timer->Stop();
-    }
+    /* release lock again */
+    gdk_threads_leave();
+
+    if ( timer->IsOneShot() )
+        return FALSE;
 
     return TRUE;
 }
 
-wxTimer::wxTimer()
+void wxTimer::Init()
 {
     m_tag = -1;
-    m_time = 1000;
-    m_oneShot = FALSE;
+    m_milli = 1000;
 }
 
 wxTimer::~wxTimer()
 {
-    Stop();
+    wxTimer::Stop();
 }
 
 bool wxTimer::Start( int millisecs, bool oneShot )
 {
-    if (millisecs != -1)
-    {
-        m_time = millisecs;
-    }
+    (void)wxTimerBase::Start(millisecs, oneShot);
 
-    m_oneShot = oneShot;
-
-    m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
+    m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
 
     return TRUE;
 }
@@ -115,3 +75,5 @@ void wxTimer::Stop()
     }
 }
 
+#endif // wxUSE_TIMER
+