X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6577bba759fe395e7d45464af985fec37eff2a4..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/gtk/timer.cpp?ds=sidebyside

diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp
index a27905231d..ca8a477d35 100644
--- a/src/gtk/timer.cpp
+++ b/src/gtk/timer.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -45,9 +45,9 @@ long wxGetElapsedTime( bool resetTimer )
     if (g_timer)
     {
         g_timer_elapsed( g_timer, &res );
-	if (resetTimer) g_timer_reset( g_timer );
+        if (resetTimer) g_timer_reset( g_timer );
     }
-    
+
     return res;
 }
 
@@ -70,14 +70,14 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
 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)
@@ -85,8 +85,8 @@ static gint timeout_callback( gpointer data )
     GDK_THREADS_LEAVE ();
 #endif
 
-    if (timer->OneShot())
-        timer->Stop();
+    if ( timer->IsOneShot() )
+        return FALSE;
 
     return TRUE;
 }
@@ -94,25 +94,20 @@ static gint timeout_callback( gpointer data )
 wxTimer::wxTimer()
 {
     m_tag = -1;
-    m_time = 1000;
+    m_milli = 1000;
     m_oneShot = FALSE;
 }
 
 wxTimer::~wxTimer()
 {
-    Stop();
+    wxTimer::Stop();
 }
 
 bool wxTimer::Start( int millisecs, bool oneShot )
 {
-    if (millisecs != -1)
-    {
-        m_time = millisecs;
-    }
-
-    m_oneShot = oneShot;
+    (void)wxTimerBase::Start(millisecs, oneShot);
 
-    m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
+    m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
 
     return TRUE;
 }