undef GTK_DISABLE_DEPRECATED for any gtk+ version, as it turns out we use GtkList...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index fdb640143f81fe267f5e9ad5dc5c2ee216e35394..07d6d0a77771986fb53f9459587562f436c531b8 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -22,8 +22,8 @@
 
 // We use GtkCombo which has been deprecated since GTK+ 2.3.0
 // in favour of GtkComboBox for <GTK2.4 runtime
 
 // We use GtkCombo which has been deprecated since GTK+ 2.3.0
 // in favour of GtkComboBox for <GTK2.4 runtime

-#include <gtk/gtkversion.h>
-#if defined(GTK_DISABLE_DEPRECATED) && GTK_CHECK_VERSION(2,3,0)
+// We also use GtkList
+#ifdef GTK_DISABLE_DEPRECATED

 #undef GTK_DISABLE_DEPRECATED
 #endif
 #include "wx/gtk/private.h"
 #undef GTK_DISABLE_DEPRECATED
 #endif
 #include "wx/gtk/private.h"