Added parent window parameter to wxHelpController constructor

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

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index d56255b48188929c0ec73bb29f3d347c0d46cbc2..109a47d09a3f5f64abe02d4b8affa81597116c99 100644 (file)
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -4,14 +4,9 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWidgets licence
+// 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,7 +22,8 @@
 
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 
-extern "C" gint timeout_callback( gpointer data )
+extern "C" {
+static gint timeout_callback( gpointer data )
 {
     wxTimer *timer = (wxTimer*)data;
 
@@ -54,6 +50,7 @@ extern "C" gint timeout_callback( gpointer data )
 
     return TRUE;
 }
+}
 
 void wxTimer::Init()
 {