From 5d038ec59c7978070bd7641df0d8b5af04f7dd53 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Fri, 3 Feb 2006 21:44:31 +0000 Subject: [PATCH] GTK2: gtk_idle_add_priority -> g_idle_add_full; gtk_idle_remove -> g_source_remove git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/app.cpp | 12 +++++++----- src/gtk/listbox.cpp | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index c3e76d4158..753e8f07ac 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -374,14 +374,14 @@ void wxapp_install_idle_handler() g_isIdle = FALSE; if (g_pendingTag == 0) - g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL ); + g_pendingTag = g_idle_add_full( 900, wxapp_pending_callback, NULL, NULL ); // This routine gets called by all event handlers // indicating that the idle is over. It may also // get called from other thread for sending events // to the main thread (and processing these in // idle time). Very low priority. - wxTheApp->m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL ); + wxTheApp->m_idleTag = g_idle_add_full( 1000, wxapp_idle_callback, NULL, NULL ); } //----------------------------------------------------------------------------- @@ -431,9 +431,11 @@ wxApp::wxApp() wxApp::~wxApp() { - if (m_idleTag) gtk_idle_remove( m_idleTag ); + if (m_idleTag) + g_source_remove( m_idleTag ); - if (m_colorCube) free(m_colorCube); + if (m_colorCube) + free(m_colorCube); } bool wxApp::OnInitGui() @@ -695,7 +697,7 @@ void wxApp::RemoveIdleTag() #endif if (!g_isIdle) { - gtk_idle_remove( wxTheApp->m_idleTag ); + g_source_remove( wxTheApp->m_idleTag ); wxTheApp->m_idleTag = 0; g_isIdle = TRUE; } diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index cd1a401637..7f0809b592 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -68,7 +68,7 @@ static gint wxlistbox_idle_callback( gpointer gdata ) wxlistbox_idle_struct* data = (wxlistbox_idle_struct*) gdata; gdk_threads_enter(); - gtk_idle_remove( data->m_tag ); + g_source_remove( data->m_tag ); // check that the items haven't been deleted from the listbox since we had // installed this callback @@ -1069,7 +1069,7 @@ void wxListBox::DoSetFirstItem( int n ) wxlistbox_idle_struct* data = new wxlistbox_idle_struct; data->m_listbox = this; data->m_item = n; - data->m_tag = gtk_idle_add_priority( 800, wxlistbox_idle_callback, (gpointer) data ); + data->m_tag = g_idle_add_full( 800, wxlistbox_idle_callback, data, NULL ); return; } -- 2.45.2