X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/gtk1/timer.cpp diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp index d56255b481..c5e8bd37ad 100644 --- 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,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() {