X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc9ab22a7692aa822bb3d8e6326dfb73d12a600b..9ba371fa05c50f65e887ca894518f293b4f88c25:/src/gtk/listbox.cpp?ds=sidebyside diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index b17d1a32c6..621f0199c9 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -210,7 +210,7 @@ static gint gtk_listbox_sort_callback(GtkTreeModel * WXUNUSED(model), wxCHECK_MSG(entry2, 0, wxT("Could not get second entry")); //We compare collate keys here instead of calling g_utf8_collate - //as it is rather slow (and even the docs reccommend this) + //as it is rather slow (and even the docs recommend this) return strcmp(gtk_tree_entry_get_collate_key(entry1), gtk_tree_entry_get_collate_key(entry2)) >= 0; } @@ -433,7 +433,7 @@ void wxListBox::Update() wxWindow::Update(); if (m_treeview) - gdk_window_process_updates(GTK_WIDGET(m_treeview)->window, TRUE); + gdk_window_process_updates(gtk_widget_get_window(GTK_WIDGET(m_treeview)), true); } // ---------------------------------------------------------------------------- @@ -497,6 +497,8 @@ void wxListBox::DoClear() gtk_list_store_clear( m_liststore ); /* well, THAT was easy :) */ GTKEnableEvents(); + + UpdateOldSelections(); } void wxListBox::DoDeleteOneItem(unsigned int n) @@ -727,7 +729,7 @@ bool wxListBox::IsSelected( int n ) const GtkTreeIter iter; wxCHECK_MSG( GTKGetIteratorFor(n, &iter), false, wxT("Invalid index") ); - return gtk_tree_selection_iter_is_selected(selection, &iter); + return gtk_tree_selection_iter_is_selected(selection, &iter) != 0; } void wxListBox::DoSetSelection( int n, bool select ) @@ -855,7 +857,7 @@ GdkWindow *wxListBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style) { - if (m_hasBgCol && m_backgroundColour.Ok()) + if (m_hasBgCol && m_backgroundColour.IsOk()) { GdkWindow *window = gtk_tree_view_get_bin_window(m_treeview); if (window)