From c1a3ff259eefe3d9ff85ee158dfb3af99e57ea62 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 20 Mar 2006 12:17:03 +0000
Subject: [PATCH] fixed Clear() for GTK+ 2.4+

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/gtk/combobox.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 8cbcaf27bd..1fa5e3336d 100644
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -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();
-- 
2.45.2