don't test for things which bakefile already tests for (STRIP, RANLIB, INSTALL, WINDR...

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

diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp
index 109a47d09a3f5f64abe02d4b8affa81597116c99..628ede1a184036807f7cbd8b4351ab92b56e0cdd 100644 (file)
--- a/src/gtk/timer.cpp
+++ b/src/gtk/timer.cpp
@@ -12,29 +12,24 @@
 
 #if wxUSE_TIMER
 
 
 #if wxUSE_TIMER
 

-#include "wx/timer.h"
+#include "wx/gtk/private/timer.h"

 
 

-#include "gtk/gtk.h"
+#include <gtk/gtk.h>

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// wxTimer
+// wxTimerImpl

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
-

 extern "C" {
 extern "C" {

-static gint timeout_callback( gpointer data )
+
+static gboolean timeout_callback(gpointer data)

 {
 {

-    wxTimer *timer = (wxTimer*)data;
+    wxGTKTimerImpl *timer = (wxGTKTimerImpl*)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();
         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.
     // 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.


@@ -45,43 +40,29 @@ static gint timeout_callback( gpointer data )
     // Release lock again.
     gdk_threads_leave();
 
     // Release lock again.
     gdk_threads_leave();
 

-    if (timer->IsOneShot())
-        return FALSE;
-
-    return TRUE;
-}
+    return keepGoing;

 }
 
 }
 

-void wxTimer::Init()
-{
-    m_tag = -1;
-    m_milli = 1000;
-}
+} // extern "C"

 
 

-wxTimer::~wxTimer()
+bool wxGTKTimerImpl::Start(int millisecs, bool oneShot)

 {
 {

-    wxTimer::Stop();
-}
+    if ( !wxTimerImpl::Start(millisecs, oneShot) )
+        return false;

 
 

-bool wxTimer::Start( int millisecs, bool oneShot )
-{
-    (void)wxTimerBase::Start(millisecs, oneShot);
+    wxASSERT_MSG( !m_sourceId, _T("shouldn't be still running") );

 
 

-    if (m_tag != -1)
-        gtk_timeout_remove( m_tag );
+    m_sourceId = g_timeout_add(m_milli, timeout_callback, this);

 
 

-    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_sourceId, _T("should be running") );
+
+    g_source_remove(m_sourceId);
+    m_sourceId = 0;

 }
 
 #endif // wxUSE_TIMER
 }
 
 #endif // wxUSE_TIMER