X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fab591c5cceff41c0bedaa89af34cd039e2c44e1..748333bd250709a114c61ffa620fc66c3ea9ff67:/src/gtk1/listbox.cpp

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 98e2f3b09d..c84fce5452 100644
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -642,8 +642,7 @@ void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData )
     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 );
 }
@@ -756,7 +755,11 @@ wxString wxListBox::GetString( int n ) const
         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;
     }
@@ -785,7 +788,11 @@ int wxListBox::FindString( const wxString &item ) const
         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;