fixing osx_carbon

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

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index d56255b48188929c0ec73bb29f3d347c0d46cbc2..acd3e9747ac103ad5f43bb1a10664de67f898f1b 100644 (file)
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -1,23 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/timer.cpp
+// Name:        src/gtk1/timer.cpp
 // Purpose:     wxTimer implementation
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "timer.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #if wxUSE_TIMER
 
-#include "wx/timer.h"
+#include "wx/gtk1/private/timer.h"
 
 #include "gtk/gtk.h"
 
@@ -25,20 +19,15 @@
 // wxTimer
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
-
-extern "C" gint timeout_callback( gpointer data )
+extern "C" {
+static gint timeout_callback(void *data)
 {
-    wxTimer *timer = (wxTimer*)data;
+    wxTimerImpl * const timer = (wxTimerImpl *)data;
 
-    // Don't change the order of anything in this callback!
-    
-    if (timer->IsOneShot())
-    {
-        // This sets m_tag to -1
+    const bool keepGoing = !timer->IsOneShot();
+    if ( !keepGoing )
         timer->Stop();
-    }
-    
+
     // 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.
@@ -49,42 +38,28 @@ extern "C" gint timeout_callback( gpointer data )
     // Release lock again.
     gdk_threads_leave();
 
-    if (timer->IsOneShot())
-        return FALSE;
-
-    return TRUE;
+    return keepGoing;
 }
-
-void wxTimer::Init()
-{
-    m_tag = -1;
-    m_milli = 1000;
-}
-
-wxTimer::~wxTimer()
-{
-    wxTimer::Stop();
 }
 
-bool wxTimer::Start( int millisecs, bool oneShot )
+bool wxGTKTimerImpl::Start(int millisecs, bool oneShot)
 {
-    (void)wxTimerBase::Start(millisecs, oneShot);
+    if ( !wxTimerImpl::Start(millisecs, oneShot) )
+        return false;
 
-    if (m_tag != -1)
-        gtk_timeout_remove( m_tag );
+    wxASSERT_MSG( m_tag == -1, wxT("shouldn't be still running") );
 
     m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
 
-    return TRUE;
+    return true;
 }
 
-void wxTimer::Stop()
+void wxGTKTimerImpl::Stop()
 {
-    if (m_tag != -1)
-    {
-        gtk_timeout_remove( m_tag );
-        m_tag = -1;
-    }
+    wxASSERT_MSG( m_tag != -1, wxT("should be running") );
+
+    gtk_timeout_remove( m_tag );
+    m_tag = -1;
 }
 
 #endif // wxUSE_TIMER