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

[Murray Cumming <murrayc src gnome org>]

commit d6c9d476b45628155f07b1988855f141c5bd2420
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Jul 13 09:36:12 2010 +0200

    More work on the undef in box.hg.
    
    * gtk/src/combo.hg:
    * gtk/src/dialog.hg:
    * gtk/src/fileselection.hg:
    * gtk/src/fontselection.hg: Make sure that box.h is included first,
        so the undef can work.

 ChangeLog                |   10 ++++++++++
 gtk/src/combo.hg         |    2 +-
 gtk/src/dialog.hg        |   23 +++++++++++------------
 gtk/src/fileselection.hg |    2 +-
 gtk/src/fontselection.hg |    3 +--
 5 files changed, 24 insertions(+), 16 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8705626..8ea880c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2010-07-13  Murray Cumming  <murrayc murrayc com>
 
+	More work on the undef in box.hg.
+
+	* gtk/src/combo.hg:
+	* gtk/src/dialog.hg:
+	* gtk/src/fileselection.hg:
+	* gtk/src/fontselection.hg: Make sure that box.h is included first,
+    so the undef can work.
+
+2010-07-13  Murray Cumming  <murrayc murrayc com>
+
 	Fix the build with warnings-as-errors with the latest gtk+ 2.22.x.
 
 	* gdk/src/gdk_methods.defs:
diff --git a/gtk/src/combo.hg b/gtk/src/combo.hg
index b7e8daf..ef41952 100644
--- a/gtk/src/combo.hg
+++ b/gtk/src/combo.hg
@@ -23,9 +23,9 @@
 // the #ifndef GTKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
 _CONFIGINCLUDE(gtkmmconfig.h)
 
+#include <gtkmm/box.h>
 #include <glibmm/listhandle.h>
 #include <glibmm/helperlist.h>
-#include <gtkmm/box.h>
 #include <gtkmm/button.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/item.h>
diff --git a/gtk/src/dialog.hg b/gtk/src/dialog.hg
index 9ec7cae..20d9e5e 100644
--- a/gtk/src/dialog.hg
+++ b/gtk/src/dialog.hg
@@ -1,7 +1,7 @@
 /* $Id: dialog.hg,v 1.8 2006/03/22 16:53:22 murrayc Exp $ */
 
 /* dialog.h
- * 
+ *
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -19,8 +19,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtkmm/window.h>
 #include <gtkmm/box.h>
+#include <gtkmm/window.h>
 #include <gtkmm/button.h>
 #include <gtkmm/buttonbox.h>
 
@@ -40,13 +40,13 @@ _WRAP_ENUM(ResponseType, GtkResponseType)
  *
  * Dialog boxes are a convenient way to prompt the user for a small amount
  * of input, eg. to display a message, ask a question, or anything else that
- * does not require extensive effort on the user's part. 
+ * does not require extensive effort on the user's part.
  *
  * gtkmm treats a dialog as a window split vertically. The top section is a
  * Gtk::VBox, and is where widgets such as a Gtk::Label or a Gtk::Entry should be
  * packed. The bottom area is known as the action_area. This is generally
  * used for packing buttons into the dialog which may perform functions such
- * as cancel, ok, or apply. The two areas are separated by a Gtk::HSeparator. 
+ * as cancel, ok, or apply. The two areas are separated by a Gtk::HSeparator.
  *
  * The dialog can be 'modal' (that is, one which freezes the rest of the
  * application from user input) - this can be specified in the Gtk::Dialog
@@ -61,7 +61,7 @@ _WRAP_ENUM(ResponseType, GtkResponseType)
  * If you want to block waiting for a dialog to return before returning control
  * flow to your code, you can call run(). This function enters a
  * recursive main loop and waits for the user to respond to the dialog, returning
- * the response ID corresponding to the button the user clicked. 
+ * the response ID corresponding to the button the user clicked.
  *
  * @ingroup Dialogs
  */
@@ -88,13 +88,13 @@ public:
 
   _WRAP_METHOD(static bool alternative_button_order(const Glib::RefPtr<const Gdk::Screen>& screen), gtk_alternative_dialog_button_order)
 
-  /** Sets an alternative button order. If the gtk-alternative-button-order 
-   * setting is set to true, the dialog buttons are reordered according to 
+  /** Sets an alternative button order. If the gtk-alternative-button-order
+   * setting is set to true, the dialog buttons are reordered according to
    * the order of the response ids in @a new_order.
    *
-   * By default, GTK+ dialogs use the button order advocated by the Gnome 
-   * <ulink url="http://developer.gnome.org/projects/gup/hig/2.0/";>Human 
-   * Interface Guidelines</ulink> with the affirmative button at the far 
+   * By default, GTK+ dialogs use the button order advocated by the Gnome
+   * <ulink url="http://developer.gnome.org/projects/gup/hig/2.0/";>Human
+   * Interface Guidelines</ulink> with the affirmative button at the far
    * right, and the cancel button left of it. But the builtin GTK+ dialogs
    * and #GtkMessageDialog<!-- -->s do provide an alternative button order,
    * which is more suitable on some platforms, e.g. Windows.
@@ -102,7 +102,7 @@ public:
    * Use this function after adding all the buttons to your dialog
    *
    * @param new_order an array of response ids of the dialog's buttons.
-   * 
+   *
    * @newinp26
    */
   void set_alternative_button_order_from_array(const Glib::ArrayHandle<int>& new_order);
@@ -132,4 +132,3 @@ protected:
 };
 
 } /* namespace Gtk */
-
diff --git a/gtk/src/fileselection.hg b/gtk/src/fileselection.hg
index cef642f..684eeee 100644
--- a/gtk/src/fileselection.hg
+++ b/gtk/src/fileselection.hg
@@ -23,11 +23,11 @@
 // the #ifndef GTKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
 _CONFIGINCLUDE(gtkmmconfig.h)
 
+#include <gtkmm/box.h>
 #include <gtkmm/dialog.h>
 #include <gtkmm/button.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/label.h>
-#include <gtkmm/box.h>
 #include <gtkmm/treeview.h>
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/optionmenu.h>
diff --git a/gtk/src/fontselection.hg b/gtk/src/fontselection.hg
index 146207f..2477293 100644
--- a/gtk/src/fontselection.hg
+++ b/gtk/src/fontselection.hg
@@ -32,9 +32,8 @@ _PINCLUDE(gtkmm/private/dialog_p.h)
 #undef GSEAL_ENABLE
 #m4 _POP()
 
-#include <gtkmm/dialog.h>
 #include <gtkmm/box.h>
-
+#include <gtkmm/dialog.h>
 
 namespace Gtk
 {