[gtkmm/gtkmm-2-24] ComboBoxText, ComboBoxEntryText: Move the undefs to really fix the build.

[Murray Cumming <murrayc src gnome org>]

commit 1a117f30b44f234486b3045cdfb42d358420788c
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Nov 25 17:22:59 2010 +0100

    ComboBoxText, ComboBoxEntryText: Move the undefs to really fix the build.
    
    * gtk/gtkmm/comboboxentrytext.cc:
    * gtk/gtkmm/comboboxtext.cc: Add undef GTK_DISABLE_DEPRECATED before any
    other includes.

 ChangeLog                      |    8 ++++++++
 gtk/gtkmm/comboboxentrytext.cc |    8 +++++---
 gtk/gtkmm/comboboxtext.cc      |    5 +++++
 3 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b6c35fb..a04a2b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-11-25  Murray Cumming  <murrayc murrayc com>
 
+	ComboBoxText, ComboBoxEntryText: Move the undefs to really fix the build.
+
+	* gtk/gtkmm/comboboxentrytext.cc:
+	* gtk/gtkmm/comboboxtext.cc: Add undef GTK_DISABLE_DEPRECATED before any 
+	other includes.
+
+2010-11-25  Murray Cumming  <murrayc murrayc com>
+
 	ComboBoxEntryText: Deprecate in favour of ComboBoxText.
 
 	* gtk/gtkmm/comboboxtext.[h|cc]: Added a constructor with a bool has_entry 
diff --git a/gtk/gtkmm/comboboxentrytext.cc b/gtk/gtkmm/comboboxentrytext.cc
index 5331d87..eb03c66 100644
--- a/gtk/gtkmm/comboboxentrytext.cc
+++ b/gtk/gtkmm/comboboxentrytext.cc
@@ -22,15 +22,17 @@
 
 #ifndef GTKMM_DISABLE_DEPRECATED
 
+
+//Allow us to use deprecated GTK+ API.
+//This whole C++ class is deprecated anyway.
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtkmm/comboboxentrytext.h>
 
 #include <gtkmm/liststore.h>
 #include <gtkmm/cellrenderertext.h>
 #include <gtk/gtk.h>
 
-//Allow us to use deprecated GTK+ API.
-//This whole C++ class is deprecated anyway.
-#undef GTK_DISABLE_DEPRECATED
 
 namespace Gtk
 {
diff --git a/gtk/gtkmm/comboboxtext.cc b/gtk/gtkmm/comboboxtext.cc
index ed4368b..c23cc7d 100644
--- a/gtk/gtkmm/comboboxtext.cc
+++ b/gtk/gtkmm/comboboxtext.cc
@@ -20,6 +20,11 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+
+//Allow us to use deprecated GTK+ API.
+//This whole C++ class is deprecated anyway.
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtkmm/comboboxtext.h>
 
 #include <gtkmm/liststore.h>