X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff7b1510ea7f7855091df83d75a44415dc1cba18..0b7e6e7da208b6a95fb23cb50286a09dc90d96d2:/src/gtk1/timer.cpp

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index cf9d2c64a3..ab9e368931 100644
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -1,11 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        timer.cpp
+// Name:        gtk/timer.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:   	wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -15,57 +14,60 @@
 
 #include "wx/timer.h"
 
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxTimer
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxTimer,wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
 
-gint timeout_callback( gpointer data )
+static gint timeout_callback( gpointer data )
 {
-  wxTimer *timer = (wxTimer*)data;
-  timer->Notify();
-  if (timer->OneShot()) timer->Stop();
-  return TRUE;
-}
+    wxTimer *timer = (wxTimer*)data;
 
-wxTimer::wxTimer(void)
-{
-  m_tag = -1;
-  m_time = 1000;
-  m_oneShot = FALSE;
-}
+    /* 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();
 
-wxTimer::~wxTimer(void)
-{
-  Stop();
-}
+    timer->Notify();
 
-int wxTimer::Interval(void)
-{
-  return m_time;
+    /* release lock again */
+    gdk_threads_leave();
+
+    if ( timer->IsOneShot() )
+        return FALSE;
+
+    return TRUE;
 }
 
-bool wxTimer::OneShot(void)
+void wxTimer::Init()
 {
-  return m_oneShot;
+    m_tag = -1;
+    m_milli = 1000;
 }
 
-void wxTimer::Notify(void)
+wxTimer::~wxTimer()
 {
+    wxTimer::Stop();
 }
 
-void wxTimer::Start( int millisecs, bool oneShot )
+bool wxTimer::Start( int millisecs, bool oneShot )
 {
-  if (millisecs != -1) m_time = millisecs;
-  m_oneShot = oneShot;
-  m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
+    (void)wxTimerBase::Start(millisecs, oneShot);
+
+    m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
+
+    return TRUE;
 }
 
-void wxTimer::Stop(void)
+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;
+    }
 }