X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/313feadc84cdf5501da71c41178c35bb7bed32eb..9a3952fad895c37a0ae8c34a968b7ae7ff8b9a55:/src/gtk/timer.cpp diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp index 3b28f1d1c2..eb7a15fbb5 100644 --- a/src/gtk/timer.cpp +++ b/src/gtk/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() { @@ -71,9 +68,9 @@ bool wxTimer::Start( int millisecs, bool oneShot ) (void)wxTimerBase::Start(millisecs, oneShot); if (m_tag != -1) - gtk_timeout_remove( m_tag ); + g_source_remove( m_tag ); - m_tag = gtk_timeout_add( m_milli, timeout_callback, this ); + m_tag = g_timeout_add( m_milli, timeout_callback, this ); return TRUE; } @@ -82,7 +79,7 @@ void wxTimer::Stop() { if (m_tag != -1) { - gtk_timeout_remove( m_tag ); + g_source_remove( m_tag ); m_tag = -1; } }