X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/924ef85080e1b257900110f0c3298a8c19acaeab..9a3952fad895c37a0ae8c34a968b7ae7ff8b9a55:/src/gtk/timer.cpp diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp index 175c92aa12..eb7a15fbb5 100644 --- a/src/gtk/timer.cpp +++ b/src/gtk/timer.cpp @@ -1,52 +1,61 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: timer.cpp -// Purpose: +// Name: gtk/timer.cpp +// Purpose: wxTimer implementation // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#ifdef __GNUG__ -#pragma implementation "timer.h" -#endif +#if wxUSE_TIMER #include "wx/timer.h" #include "gtk/gtk.h" -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- // wxTimer -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject) +IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler) +extern "C" { static gint timeout_callback( gpointer data ) { wxTimer *timer = (wxTimer*)data; - /* 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 */ + // 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. gdk_threads_enter(); timer->Notify(); - /* release lock again */ + // Release lock again. gdk_threads_leave(); - if ( timer->IsOneShot() ) + if (timer->IsOneShot()) return FALSE; return TRUE; } +} -wxTimer::wxTimer() +void wxTimer::Init() { m_tag = -1; m_milli = 1000; - m_oneShot = FALSE; } wxTimer::~wxTimer() @@ -58,7 +67,10 @@ bool wxTimer::Start( int millisecs, bool oneShot ) { (void)wxTimerBase::Start(millisecs, oneShot); - m_tag = gtk_timeout_add( m_milli, timeout_callback, this ); + if (m_tag != -1) + g_source_remove( m_tag ); + + m_tag = g_timeout_add( m_milli, timeout_callback, this ); return TRUE; } @@ -67,8 +79,10 @@ void wxTimer::Stop() { if (m_tag != -1) { - gtk_timeout_remove( m_tag ); + g_source_remove( m_tag ); m_tag = -1; } } +#endif // wxUSE_TIMER +