X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..a16c6fdcbdcf470b00cddbf8635bb6904fa6e1bb:/src/gtk1/timer.cpp?ds=sidebyside diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp index 3b28f1d1c2..c5e8bd37ad 100644 --- 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() {