X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7b14c561d9f8cdfbbfbf05b0b1eef1dd63ece3e6..96461cc29d03b4a7ab72abaae2e7edace93dd2a5:/src/gtk1/timer.cpp

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index f5330bc012..e004d2d4be 100644
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -8,11 +8,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "timer.h"
 #endif
 
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #if wxUSE_TIMER
 
@@ -24,9 +25,10 @@
 // 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;
 
@@ -53,6 +55,7 @@ extern "C" gint timeout_callback( gpointer data )
 
     return TRUE;
 }
+}
 
 void wxTimer::Init()
 {