X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed7919869508ccd5c868683c28706f82e82a1b9b..695c21b11876abafeb68195e34f9f55816f92949:/src/gtk1/timer.cpp?ds=sidebyside diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp index ab9e368931..a8514f8cd1 100644 --- a/src/gtk1/timer.cpp +++ b/src/gtk1/timer.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: gtk/timer.cpp -// Purpose: +// Purpose: wxTimer implementation // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling @@ -12,17 +12,21 @@ #pragma implementation "timer.h" #endif +#include "wx/defs.h" + +#if wxUSE_TIMER + #include "wx/timer.h" #include "gtk/gtk.h" -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- // wxTimer -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject) +IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) -static gint timeout_callback( gpointer data ) +extern "C" gint timeout_callback( gpointer data ) { wxTimer *timer = (wxTimer*)data; @@ -57,6 +61,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; @@ -71,3 +78,5 @@ void wxTimer::Stop() } } +#endif // wxUSE_TIMER +