X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0bb3fc29c316f19db56d2b9cc908d76cb06a3a29..a97d569cbbf90ba8bb293214055c3a8c19d447b5:/src/gtk/listbox.cpp diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index f38d62d070..ad3193f273 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -392,12 +392,11 @@ static gboolean gtk_listbox_searchequal_callback(GtkTreeModel* model, WXLISTBOX_DATACOLUMN_ARG(listbox), &entry, -1); wxCHECK_MSG(entry, 0, wxT("Could not get entry")); - gchar* keycollatekey = g_utf8_collate_key(key, -1); + wxGtkString keycollatekey(g_utf8_collate_key(key, -1)); int ret = strcasecmp(keycollatekey, gtk_tree_entry_get_collate_key(entry)); - g_free(keycollatekey); g_object_unref (entry); return ret != 0; @@ -943,6 +942,7 @@ void wxListBox::DoSetSelection( int n, bool select ) { // ... and not generate any events in the process GtkDeselectAll(); + return; } wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetSelection") );