cleanup - reformatting; simplified OnPaint

[wxWidgets.git] / src / gtk / listbox.cpp

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index cd1a4016372eaeafe151c1720b949f7934503a0f..cbff2c4f8f7023aa5d5fc843d94b06ae85c9af1d 100644 (file)
--- 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
@@ -913,7 +913,7 @@ void wxListBox::SetString( int n, const wxString &string )
 #endif // wxUSE_CHECKLISTBOX
         str += string;
 
-        gtk_label_set( label, wxGTK_CONV( str ) );
+        gtk_label_set_text( label, wxGTK_CONV( str ) );
     }
     else
     {
@@ -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;
     }