Use wxGtkString here too

[wxWidgets.git] / src / gtk / combobox.cpp

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index f1bf7b63f5e04168dda4d00427c6e6e0ff478528..1fa5e3336d2ae64a64adb3933a61632e3a2ebcff 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -467,7 +467,7 @@ int wxComboBox::DoInsert( const wxString &item, int pos )
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
     wxCHECK_MSG( IsValidInsert(pos), -1, wxT("invalid index") );
 
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
     wxCHECK_MSG( IsValidInsert(pos), -1, wxT("invalid index") );
 

-    const size_t count = GetCount();
+    size_t count = GetCount();

 
     if ((size_t)pos == count)
         return Append(item);
 
     if ((size_t)pos == count)
         return Append(item);


@@ -565,12 +565,12 @@ void wxComboBox::Clear()
     if (!gtk_check_version(2,4,0))
     {
         GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
     if (!gtk_check_version(2,4,0))
     {
         GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );

-        size_t i;
-        for (i = 0; i < GetCount(); i++)
+        const size_t count = GetCount();
+        for (size_t i = 0; i < count; i++)

             gtk_combo_box_remove_text( combobox, 0 );
     }
             gtk_combo_box_remove_text( combobox, 0 );
     }

-    else
-#endif
+    else // GTK+ < 2.4.0
+#endif // __WXGTK24__

     {
         GtkWidget *list = GTK_COMBO(m_widget)->list;
         gtk_list_clear_items( GTK_LIST(list), 0, GetCount() );
     {
         GtkWidget *list = GTK_COMBO(m_widget)->list;
         gtk_list_clear_items( GTK_LIST(list), 0, GetCount() );


@@ -580,7 +580,7 @@ void wxComboBox::Clear()
     while (node)
     {
         wxClientData *cd = (wxClientData*)node->GetData();
     while (node)
     {
         wxClientData *cd = (wxClientData*)node->GetData();

-        if (cd) delete cd;
+        delete cd;

         node = node->GetNext();
     }
     m_clientObjectList.Clear();
         node = node->GetNext();
     }
     m_clientObjectList.Clear();