Add wxSVGFileDC

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

diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp
index 109a47d09a3f5f64abe02d4b8affa81597116c99..7bb0317952ef23068addc4b1700cae8a5b20b0e0 100644 (file)
--- a/src/gtk/timer.cpp
+++ b/src/gtk/timer.cpp
@@ -14,7 +14,7 @@
 
 #include "wx/timer.h"
 
 
 #include "wx/timer.h"
 

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

 
 // ----------------------------------------------------------------------------
 // wxTimer
 
 // ----------------------------------------------------------------------------
 // wxTimer


@@ -23,18 +23,18 @@
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 
 extern "C" {
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 
 extern "C" {

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

 {
     wxTimer *timer = (wxTimer*)data;
 
     // Don't change the order of anything in this callback!
 {
     wxTimer *timer = (wxTimer*)data;
 
     // Don't change the order of anything in this callback!

-    
+

     if (timer->IsOneShot())
     {
         // This sets m_tag to -1
         timer->Stop();
     }
     if (timer->IsOneShot())
     {
         // This sets m_tag to -1
         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,42 +45,39 @@ 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 !timer->IsOneShot();

 }
 }
 
 void wxTimer::Init()
 {
 }
 }
 
 void wxTimer::Init()
 {

-    m_tag = -1;
+    m_sourceId = 0;

     m_milli = 1000;
 }
 
 wxTimer::~wxTimer()
 {
     m_milli = 1000;
 }
 
 wxTimer::~wxTimer()
 {

-    wxTimer::Stop();
+    Stop();

 }
 
 bool wxTimer::Start( int millisecs, bool oneShot )
 {
     (void)wxTimerBase::Start(millisecs, oneShot);
 
 }
 
 bool wxTimer::Start( int millisecs, bool oneShot )
 {
     (void)wxTimerBase::Start(millisecs, oneShot);
 

-    if (m_tag != -1)
-        gtk_timeout_remove( m_tag );
+    if (m_sourceId != 0)
+        g_source_remove(m_sourceId);

 
 

-    m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
+    m_sourceId = g_timeout_add(m_milli, timeout_callback, this);

 
 

-    return TRUE;
+    return true;

 }
 
 void wxTimer::Stop()
 {
 }
 
 void wxTimer::Stop()
 {

-    if (m_tag != -1)
+    if (m_sourceId != 0)

     {
     {

-        gtk_timeout_remove( m_tag );
-        m_tag = -1;
+        g_source_remove(m_sourceId);
+        m_sourceId = 0;

     }
 }
 
     }
 }