generate wxEVT_COMMAND_TEXT_ENTER for multiline controls too

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

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 9bb6c7857b2b578d37e4d2de48a70b866173eb2d..b5f70f7a9e0f02ad5d0762599e921f7e8035c767 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -20,6 +20,12 @@
 
 #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
 
+// We use GtkCombo which has been deprecated since GTK+ 2.3.0
+// in favour of GtkComboBox for <GTK2.4 runtime
+// We also use GtkList
+#ifdef GTK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+#endif
 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
@@ -567,7 +573,7 @@ void wxComboBox::Clear()
     {
         GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
         int i;
-        for (i = 0; i++; i < GetCount())
+        for (i = 0; i < GetCount(); i++)
             gtk_combo_box_remove_text( combobox, 0 );
     }
     else