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;
{
(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;