Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use existing helper to remove inconvenient additional reference added by gtk_tree_model_get()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2013-07-02 16:56:42 +00:00
parent e59127de8b
commit 6ee000088d
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gtk/listbox.cpp
View File

@@ -69,8 +69,6 @@ namespace
{ {
// Return the entry for the given listbox item. // Return the entry for the given listbox item.
//
// Return value must be released by caller if non-NULL.
GtkTreeEntry * GtkTreeEntry *
GetEntry(GtkListStore *store, GtkTreeIter *iter, const wxListBox *listbox) GetEntry(GtkListStore *store, GtkTreeIter *iter, const wxListBox *listbox)
{ {
@@ -80,7 +78,7 @@ GetEntry(GtkListStore *store, GtkTreeIter *iter, const wxListBox *listbox)
WXLISTBOX_DATACOLUMN_ARG(listbox), WXLISTBOX_DATACOLUMN_ARG(listbox),
&entry, &entry,
-1); -1);
g_object_unref(entry);
return entry; return entry;
} }
@@ -203,10 +201,10 @@ static gint gtk_listbox_sort_callback(GtkTreeModel * WXUNUSED(model),
GtkTreeIter *b, GtkTreeIter *b,
wxListBox *listbox) wxListBox *listbox)
{ {
wxGtkObject<GtkTreeEntry> entry1(GetEntry(listbox->m_liststore, a, listbox)); GtkTreeEntry* entry1 = GetEntry(listbox->m_liststore, a, listbox);
wxCHECK_MSG(entry1, 0, wxT("Could not get first entry")); wxCHECK_MSG(entry1, 0, wxT("Could not get first entry"));
wxGtkObject<GtkTreeEntry> entry2(GetEntry(listbox->m_liststore, b, listbox)); GtkTreeEntry* entry2 = GetEntry(listbox->m_liststore, b, listbox);
wxCHECK_MSG(entry2, 0, wxT("Could not get second entry")); wxCHECK_MSG(entry2, 0, wxT("Could not get second entry"));
//We compare collate keys here instead of calling g_utf8_collate //We compare collate keys here instead of calling g_utf8_collate
@@ -227,8 +225,7 @@ static gboolean gtk_listbox_searchequal_callback(GtkTreeModel * WXUNUSED(model),
GtkTreeIter* iter, GtkTreeIter* iter,
wxListBox* listbox) wxListBox* listbox)
{ {
wxGtkObject<GtkTreeEntry> GtkTreeEntry* entry = GetEntry(listbox->m_liststore, iter, listbox);
entry(GetEntry(listbox->m_liststore, iter, listbox));
wxCHECK_MSG(entry, 0, wxT("Could not get entry")); wxCHECK_MSG(entry, 0, wxT("Could not get entry"));
wxGtkString keycollatekey(g_utf8_collate_key(key, -1)); wxGtkString keycollatekey(g_utf8_collate_key(key, -1));
@@ -561,7 +558,7 @@ GtkTreeEntry *wxListBox::GTKGetEntry(unsigned n) const
void* wxListBox::DoGetItemClientData(unsigned int n) const void* wxListBox::DoGetItemClientData(unsigned int n) const
{ {
wxGtkObject<GtkTreeEntry> entry(GTKGetEntry(n)); GtkTreeEntry* entry = GTKGetEntry(n);
wxCHECK_MSG(entry, NULL, wxT("could not get entry")); wxCHECK_MSG(entry, NULL, wxT("could not get entry"));
return gtk_tree_entry_get_userdata( entry ); return gtk_tree_entry_get_userdata( entry );
@@ -569,7 +566,7 @@ void* wxListBox::DoGetItemClientData(unsigned int n) const
void wxListBox::DoSetItemClientData(unsigned int n, void* clientData) void wxListBox::DoSetItemClientData(unsigned int n, void* clientData)
{ {
wxGtkObject<GtkTreeEntry> entry(GTKGetEntry(n)); GtkTreeEntry* entry = GTKGetEntry(n);
wxCHECK_RET(entry, wxT("could not get entry")); wxCHECK_RET(entry, wxT("could not get entry"));
gtk_tree_entry_set_userdata( entry, clientData ); gtk_tree_entry_set_userdata( entry, clientData );
@@ -585,7 +582,7 @@ void wxListBox::SetString(unsigned int n, const wxString& label)
GtkTreeIter iter; GtkTreeIter iter;
wxCHECK_RET(GTKGetIteratorFor(n, &iter), "invalid index"); wxCHECK_RET(GTKGetIteratorFor(n, &iter), "invalid index");
wxGtkObject<GtkTreeEntry> entry(GetEntry(m_liststore, &iter, this)); GtkTreeEntry* entry = GetEntry(m_liststore, &iter, this);
// update the item itself // update the item itself
gtk_tree_entry_set_label(entry, wxGTK_CONV(label)); gtk_tree_entry_set_label(entry, wxGTK_CONV(label));
@@ -601,7 +598,7 @@ wxString wxListBox::GetString(unsigned int n) const
{ {
wxCHECK_MSG( m_treeview != NULL, wxEmptyString, wxT("invalid listbox") ); wxCHECK_MSG( m_treeview != NULL, wxEmptyString, wxT("invalid listbox") );
wxGtkObject<GtkTreeEntry> entry(GTKGetEntry(n)); GtkTreeEntry* entry = GTKGetEntry(n);
wxCHECK_MSG( entry, wxEmptyString, wxT("wrong listbox index") ); wxCHECK_MSG( entry, wxEmptyString, wxT("wrong listbox index") );
return wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) ); return wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) );