Minor header cleaning.

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

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index d56255b48188929c0ec73bb29f3d347c0d46cbc2..c5e8bd37add140f03a8b4ebbc29f69811547ede3 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
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -27,18 +22,19 @@
 
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 
 
 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.


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

+}

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