GTK2: gtk_timeout_add -> g_timeout_add; gtk_timeout_remove -> g_source_remove.
Fix gtk_frame_urgency_timer_callback return type (gint -> gboolean). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -68,9 +68,9 @@ bool wxTimer::Start( int millisecs, bool oneShot )
|
||||
(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;
|
||||
}
|
||||
@@ -79,7 +79,7 @@ void wxTimer::Stop()
|
||||
{
|
||||
if (m_tag != -1)
|
||||
{
|
||||
gtk_timeout_remove( m_tag );
|
||||
g_source_remove( m_tag );
|
||||
m_tag = -1;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user