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.
(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;
}
{
if (m_tag != -1)
{
- gtk_timeout_remove( m_tag );
+ g_source_remove( m_tag );
m_tag = -1;
}
}