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

fixed Clear() for GTK+ 2.4+

Browse Source 
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
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk/combobox.cpp
View File

@@ -565,12 +565,12 @@ void wxComboBox::Clear()
if (!gtk_check_version(2,4,0)) if (!gtk_check_version(2,4,0))
{ {
GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
size_t i; const size_t count = GetCount();
for (i = 0; i < GetCount(); i++) for (size_t i = 0; i < count; i++)
gtk_combo_box_remove_text( combobox, 0 ); gtk_combo_box_remove_text( combobox, 0 );
} }
else else // GTK+ < 2.4.0
#endif #endif // __WXGTK24__
{ {
GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list = GTK_COMBO(m_widget)->list;
gtk_list_clear_items( GTK_LIST(list), 0, GetCount() ); gtk_list_clear_items( GTK_LIST(list), 0, GetCount() );
@@ -580,7 +580,7 @@ void wxComboBox::Clear()
while (node) while (node)
{ {
wxClientData *cd = (wxClientData*)node->GetData(); wxClientData *cd = (wxClientData*)node->GetData();
if (cd) delete cd; delete cd;
node = node->GetNext(); node = node->GetNext();
} }
m_clientObjectList.Clear(); m_clientObjectList.Clear();