X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/gtk/timer.cpp diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp index f8531ba81c..0353bede8b 100644 --- a/src/gtk/timer.cpp +++ b/src/gtk/timer.cpp @@ -8,11 +8,12 @@ ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "timer.h" #endif -#include "wx/defs.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #if wxUSE_TIMER @@ -26,21 +27,29 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) -static gint timeout_callback( gpointer data ) +extern "C" 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; @@ -61,6 +70,9 @@ bool wxTimer::Start( int millisecs, bool oneShot ) { (void)wxTimerBase::Start(millisecs, oneShot); + if (m_tag != -1) + gtk_timeout_remove( m_tag ); + m_tag = gtk_timeout_add( m_milli, timeout_callback, this ); return TRUE;