Implement wxIsPlatform64Bit().

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

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index f5330bc0123166c9d03163f7878c20a760991c87..c5e8bd37add140f03a8b4ebbc29f69811547ede3 100644 (file)
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -7,12 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifdef __GNUG__
-#pragma implementation "timer.h"
-#endif
-
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #if wxUSE_TIMER
 
 
 #if wxUSE_TIMER
 


@@ -24,20 +20,21 @@
 // wxTimer
 // ----------------------------------------------------------------------------
 
 // wxTimer
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)

 
 

-extern "C" gint timeout_callback( gpointer data )
+extern "C" {
+static gint 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.


@@ -53,6 +50,7 @@ extern "C" gint timeout_callback( gpointer data )
 
     return TRUE;
 }
 
     return TRUE;
 }

+}

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