wxNode *node = m_clientList.Nth( n );
wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientObject") );
- wxClientData *cd = (wxClientData*) node->Data();
- delete cd;
+ // wxItemContainer already deletes data for us
node->SetData( (wxObject*) clientData );
}
GtkBin *bin = GTK_BIN( child->data );
GtkLabel *label = GTK_LABEL( bin->child );
- wxString str = wxGTK_CONV_BACK( GET_REAL_LABEL(label->label) );
+#ifdef __WXGTK20__
+ wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
+#else
+ wxString str = wxString( label->label );
+#endif
return str;
}
GtkBin *bin = GTK_BIN( child->data );
GtkLabel *label = GTK_LABEL( bin->child );
- wxString str = wxGTK_CONV_BACK( GET_REAL_LABEL(label->label) );
+#ifdef __WXGTK20__
+ wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
+#else
+ wxString str = wxString( label->label );
+#endif
if (str == item)
return count;