fixed Clear() for GTK+ 2.4+

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-03-20 12:17:03 +00:00
parent be27bc46ab
commit c1a3ff259e

View File

@@ -565,12 +565,12 @@ void wxComboBox::Clear()
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 );
}
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() );
@@ -580,7 +580,7 @@ void wxComboBox::Clear()
while (node)
{
wxClientData *cd = (wxClientData*)node->GetData();
if (cd) delete cd;
delete cd;
node = node->GetNext();
}
m_clientObjectList.Clear();