X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/865bb3251ecf83ddac350b734f4fed1d258e250b..3d3f3e3749fa5812c1937736b8745d696263a8b5:/src/gtk/timer.cpp?ds=sidebyside

diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp
index e004d2d4be..eb7a15fbb5 100644
--- a/src/gtk/timer.cpp
+++ b/src/gtk/timer.cpp
@@ -7,11 +7,6 @@
 // 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"
 
@@ -33,13 +28,13 @@ static gint timeout_callback( gpointer data )
     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();
     }
-    
+
     // 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.
@@ -73,9 +68,9 @@ bool wxTimer::Start( int millisecs, bool oneShot )
     (void)wxTimerBase::Start(millisecs, oneShot);
 
     if (m_tag != -1)
-        gtk_timeout_remove( m_tag );
+        g_source_remove( m_tag );
 
-    m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
+    m_tag = g_timeout_add( m_milli, timeout_callback, this );
 
     return TRUE;
 }
@@ -84,7 +79,7 @@ void wxTimer::Stop()
 {
     if (m_tag != -1)
     {
-        gtk_timeout_remove( m_tag );
+        g_source_remove( m_tag );
         m_tag = -1;
     }
 }