Don't assume that msw.remap was 1, instead change it back to what it

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

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index 3b28f1d1c22251fc1d84e71ea59ba9556a9a4cf1..c5e8bd37add140f03a8b4ebbc29f69811547ede3 100644 (file)
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/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"
 
@@ -27,18 +22,19 @@
 
 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!
-    
+
     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.
@@ -54,6 +50,7 @@ extern "C" gint timeout_callback( gpointer data )
 
     return TRUE;
 }
+}
 
 void wxTimer::Init()
 {