[gtkmm/gtkmm-2-22] Even more work on the undef in box.hg.

[Murray Cumming <murrayc src gnome org>]

commit 14652b4a6d0b653c76a680ead82420543b71d084
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Jul 13 11:07:22 2010 +0200

    Even more work on the undef in box.hg.
    
    * gdk/gdkmm.h:
    * gtk/gtkmm.h:
    * gtk/src/box.hg:
    * gtk/src/main.hg:
    * gtk/src/table.hg:
    * gtk/src/textiter.hg:
    * gtk/src/treemodel.hg:
    * gtk/src/treeviewcolumn.hg: Rearrange includes to make it more likely
        that applications will be able to build with deprecated API disabled and
        warnings as errors.
        However, this is just impossible to do completely, because any other header
        (such as goocanvasitem.h via goocanvasmm) might include gtk/gtk.h first.

 ChangeLog                 |   17 +++++++++++++++++
 gdk/gdkmm.h               |    5 ++---
 gtk/gtkmm.h               |    4 ++--
 gtk/src/box.hg            |   21 +++++++++++++++++----
 gtk/src/main.hg           |    2 --
 gtk/src/table.hg          |    4 ++++
 gtk/src/textiter.hg       |    2 --
 gtk/src/treemodel.hg      |    2 +-
 gtk/src/treeviewcolumn.hg |    2 +-
 9 files changed, 44 insertions(+), 15 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8ea880c..637710c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2010-07-13  Murray Cumming  <murrayc murrayc com>
 
+	Even more work on the undef in box.hg.
+
+	* gdk/gdkmm.h:
+	* gtk/gtkmm.h:
+	* gtk/src/box.hg:
+	* gtk/src/main.hg:
+	* gtk/src/table.hg:
+	* gtk/src/textiter.hg:
+	* gtk/src/treemodel.hg:
+	* gtk/src/treeviewcolumn.hg: Rearrange includes to make it more likely
+    that applications will be able to build with deprecated API disabled and
+    warnings as errors.
+    However, this is just impossible to do completely, because any other header
+    (such as goocanvasitem.h via goocanvasmm) might include gtk/gtk.h first.
+
+2010-07-13  Murray Cumming  <murrayc murrayc com>
+
 	More work on the undef in box.hg.
 
 	* gtk/src/combo.hg:
diff --git a/gdk/gdkmm.h b/gdk/gdkmm.h
index f9b44bb..05a7d1d 100644
--- a/gdk/gdkmm.h
+++ b/gdk/gdkmm.h
@@ -1,6 +1,6 @@
 // This is -*- C++ -*-
 
-/* 
+/*
  * gdkmm.h
  *
  * Copyright 2002 The gtkmm Development Team
@@ -24,6 +24,7 @@
 #ifndef _GDKMM_GDKMM_H_
 #define _GDKMM_GDKMM_H_
 
+#include <gdkmm/screen.h>
 #include <gdkmm/types.h>
 #include <gdkmm/visual.h>
 #include <gdkmm/gc.h>
@@ -40,9 +41,7 @@
 #include <gdkmm/rectangle.h>
 #include <gdkmm/display.h>
 #include <gdkmm/displaymanager.h>
-#include <gdkmm/screen.h>
 #include <gdkmm/general.h>
 #include <gdkmm/rgb.h>
 
 #endif /* _GDKMM_GDKMM_H_ */
-
diff --git a/gtk/gtkmm.h b/gtk/gtkmm.h
index f035f92..8101f6a 100644
--- a/gtk/gtkmm.h
+++ b/gtk/gtkmm.h
@@ -88,6 +88,8 @@ extern const int gtkmm_micro_version;
 #include <giomm.h>
 #include <gdkmm.h>
 
+#include <gtkmm/box.h>
+#include <gtkmm/dialog.h>
 #include <gtkmm/object.h>
 #include <gtkmm/aboutdialog.h>
 #include <gtkmm/accelkey.h>
@@ -100,7 +102,6 @@ extern const int gtkmm_micro_version;
 #include <gtkmm/base.h>
 #include <gtkmm/bin.h>
 #include <gtkmm/border.h>
-#include <gtkmm/box.h>
 #include <gtkmm/builder.h>
 #include <gtkmm/button.h>
 #include <gtkmm/buttonbox.h>
@@ -125,7 +126,6 @@ extern const int gtkmm_micro_version;
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/container.h>
 #include <gtkmm/curve.h>
-#include <gtkmm/dialog.h>
 #include <gtkmm/drawingarea.h>
 #include <gtkmm/editable.h>
 #include <gtkmm/entry.h>
diff --git a/gtk/src/box.hg b/gtk/src/box.hg
index d29f3c7..2db2d51 100644
--- a/gtk/src/box.hg
+++ b/gtk/src/box.hg
@@ -26,10 +26,6 @@ _PINCLUDE(gtkmm/private/container_p.h)
 #undef GSEAL_ENABLE
 #m4 _POP()
 
-#include <gtkmm/container.h>
-#include <glibmm/helperlist.h>
-
-
 // Temporarily undef GTK_DISABLE_DEPRECATED, redefining it later if appropriate.
 // We need this to use _GtkBoxChild, which we use in our (deprecated) API.
 #if defined(GTK_DISABLE_DEPRECATED) && !defined(GTKMM_GTK_DISABLE_DEPRECATED_UNDEFED)
@@ -37,6 +33,13 @@ _PINCLUDE(gtkmm/private/container_p.h)
 #define GTKMM_GTK_DISABLE_DEPRECATED_UNDEFED 1
 #endif
 
+// This is needed for gdkregion.h, for GdkSpanFunc, which we indirectly include.
+// Otherwise application code must be very careful of the include order.
+#if defined(GDK_DISABLE_DEPRECATED) && !defined(GTKMM_GDK_DISABLE_DEPRECATED_UNDEFED)
+#undef GDK_DISABLE_DEPRECATED
+#define GTKMM_GDK_DISABLE_DEPRECATED_UNDEFED 1
+#endif
+
 #include <gtk/gtk.h>  /* For _GtkBoxChild */
 
 // Redefine GTK_DISABLE_DEPRECATED if it was defined before we temporarily undefed it:
@@ -45,6 +48,16 @@ _PINCLUDE(gtkmm/private/container_p.h)
 #undef GTKMM_GTK_DISABLE_DEPRECATED_UNDEFED
 #endif
 
+// Redefine GDK_DISABLE_DEPRECATED if it was defined before we temporarily undefed it:
+#if defined(GTKMM_GDK_DISABLE_DEPRECATED_UNDEFED)
+#define GDK_DISABLE_DEPRECATED 1
+#undef GTKMM_GDK_DISABLE_DEPRECATED_UNDEFED
+#endif
+
+
+
+#include <gtkmm/container.h>
+#include <glibmm/helperlist.h>
 
 namespace Gtk
 {
diff --git a/gtk/src/main.hg b/gtk/src/main.hg
index 21ab2ea..c9f4269 100644
--- a/gtk/src/main.hg
+++ b/gtk/src/main.hg
@@ -20,8 +20,6 @@
  */
 
 
-//#include <gtk/gtk.h>
-
 #include <sigc++/sigc++.h>
 #include <gdkmm/types.h>
 
diff --git a/gtk/src/table.hg b/gtk/src/table.hg
index bdf030f..62d889d 100644
--- a/gtk/src/table.hg
+++ b/gtk/src/table.hg
@@ -20,6 +20,10 @@
 #include <glibmm/helperlist.h>
 #include <gtkmm/container.h>
 #include <gtkmm/enums.h>
+
+//TODO: Careful of including this before box.h,
+//because we need to undef some things first.
+//TODO: Maybe do all includes of gtk.h in a single file.
 #include <gtk/gtk.h> /* for GtkTableChild */
 
 _DEFS(gtkmm,gtk)
diff --git a/gtk/src/textiter.hg b/gtk/src/textiter.hg
index 84b8086..d35e83b 100644
--- a/gtk/src/textiter.hg
+++ b/gtk/src/textiter.hg
@@ -23,8 +23,6 @@
 #include <gtkmm/texttag.h>
 #include <gtkmm/textchildanchor.h>
 #include <gtkmm/textattributes.h>
-//#include <gtk/gtk.h> /* we need the definition of GtkTextIter */
-
 
 _DEFS(gtkmm,gtk)
 
diff --git a/gtk/src/treemodel.hg b/gtk/src/treemodel.hg
index 90aaf97..947f82f 100644
--- a/gtk/src/treemodel.hg
+++ b/gtk/src/treemodel.hg
@@ -17,7 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+//#include <gtk/gtk.h>
 #include <glibmm/interface.h>
 #include <gtkmm/treeiter.h>
 #include <gtkmm/treemodelcolumn.h>
diff --git a/gtk/src/treeviewcolumn.hg b/gtk/src/treeviewcolumn.hg
index d4e7386..24794d0 100644
--- a/gtk/src/treeviewcolumn.hg
+++ b/gtk/src/treeviewcolumn.hg
@@ -23,9 +23,9 @@
 _CONFIGINCLUDE(gtkmmconfig.h)
 
 #include <gtkmm/object.h>
-#include <gtkmm/treeiter.h>
 #include <gtkmm/widget.h>
 #include <gdkmm/window.h>
+#include <gtkmm/treeiter.h>
 #include <gtkmm/treemodel.h>
 #include <glibmm/listhandle.h>
 #include <gtkmm/cellrenderer_generation.h>