[gtkmm/gtkmm-2-22] Rearrange includes in tests and demos for the undefs.

[Murray Cumming <murrayc src gnome org>]

commit 3ccc60ea271f13b20882831fd8e96910bdd79578
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Jul 14 10:35:24 2010 +0200

    Rearrange includes in tests and demos for the undefs.
    
    	* demos/gtk-demo/demowindow.cc:
    	* demos/gtk-demo/demowindow.h:
    	* demos/gtk-demo/main.cc:
    	* tests/child_widget/main.cc: These now build again with
        enable-warnings=fatal .

 ChangeLog                    |   10 ++++++++++
 demos/gtk-demo/demowindow.cc |   17 ++++++++---------
 demos/gtk-demo/demowindow.h  |    3 +--
 demos/gtk-demo/main.cc       |    2 +-
 gtk/src/main.hg              |    2 +-
 tests/child_widget/main.cc   |    2 +-
 6 files changed, 22 insertions(+), 14 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3663d43..eb20499 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2010-07-14  Murray Cumming  <murrayc murrayc com>
 
+    Rearrange include sin tests and demos for the undefs.
+
+	* demos/gtk-demo/demowindow.cc:
+	* demos/gtk-demo/demowindow.h:
+	* demos/gtk-demo/main.cc:
+	* tests/child_widget/main.cc: These now build again with
+    enable-warnings=fatal .
+
+2010-07-14  Murray Cumming  <murrayc murrayc com>
+
 	More rearranging of includes for the undef in gdkmm/region.hg.
 
 	* gtk/gtkmm/menu_elems.[h|cc]:
diff --git a/demos/gtk-demo/demowindow.cc b/demos/gtk-demo/demowindow.cc
index 4079d6b..667f699 100644
--- a/demos/gtk-demo/demowindow.cc
+++ b/demos/gtk-demo/demowindow.cc
@@ -21,10 +21,10 @@
 #include "config.h"
 #endif
 
-#include "gtkmm/main.h"
+#include "demowindow.h"
 #include "gtkmm/cellrenderertext.h"
 #include "gtkmm/treeviewcolumn.h"
-#include "demowindow.h"
+#include "gtkmm/main.h"
 #include "textwidget.h"
 #include "demos.h"
 #include <vector>
@@ -229,7 +229,7 @@ bool DemoWindow::read_line (FILE *stream, GString *str)
 		  (c == '\r' && next_c == '\n') ||
 		  (c == '\n' && next_c == '\r')))
 	      ungetc (next_c, stream);
-	
+
 	    goto done;
 	  }
 	default:
@@ -316,11 +316,11 @@ void DemoWindow::load_file(const std::string& filename)
     	      refBufferInfo->apply_tag_by_name("title", start, end);
 
     	      start = end;
-      	
+
     	      state++;
     	    }
     	    break;
-  	
+
       	case 1:
       	  /* Reading body of info section */
       	  while (isspace (*p))
@@ -334,14 +334,14 @@ void DemoWindow::load_file(const std::string& filename)
       	  else
     	    {
     	      int len;
-        	
+
     	      while (*p == '*' || isspace (*p))
     		      p++;
 
     	      len = strlen (p);
     	      while (isspace (*(p + len - 1)))
     		     len--;
-        	
+
     	      if (len > 0)
                 {
                   if (in_para)
@@ -373,7 +373,7 @@ void DemoWindow::load_file(const std::string& filename)
     	    }
       	  else
       	    break;
-        	
+
       	case 3:
       	  /* Reading program body */
       	  start = refBufferSource->insert(start, p);
@@ -400,4 +400,3 @@ void DemoWindow::on_example_window_hide()
     }
   }
 }
-
diff --git a/demos/gtk-demo/demowindow.h b/demos/gtk-demo/demowindow.h
index b7aaf92..bdbd9a5 100644
--- a/demos/gtk-demo/demowindow.h
+++ b/demos/gtk-demo/demowindow.h
@@ -20,9 +20,9 @@
 #ifndef _DEMOWINDOW_H
 #define _DEMOWINDOW_H
 
+#include "gtkmm/box.h"
 #include "gtkmm/window.h"
 #include "gtkmm/notebook.h"
-#include "gtkmm/box.h"
 
 #include "gtkmm/treestore.h"
 #include "gtkmm/treeview.h"
@@ -64,4 +64,3 @@ protected:
 };
 
 #endif //_DEMOWINDOW_H
-
diff --git a/demos/gtk-demo/main.cc b/demos/gtk-demo/main.cc
index 2b30e3a..dec1d68 100644
--- a/demos/gtk-demo/main.cc
+++ b/demos/gtk-demo/main.cc
@@ -19,8 +19,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "gtkmm/main.h"
 #include "demowindow.h"
+#include "gtkmm/main.h"
 
 int main (int argc, char *argv[])
 {
diff --git a/gtk/src/main.hg b/gtk/src/main.hg
index a677356..02f5d1c 100644
--- a/gtk/src/main.hg
+++ b/gtk/src/main.hg
@@ -21,7 +21,7 @@
 
 
 #include <sigc++/sigc++.h>
-#include <gdkmm/types.h>
+#include <gdkmm/types.h> //For GdkEventKey
 
 _DEFS(gtkmm,gtk)
 
diff --git a/tests/child_widget/main.cc b/tests/child_widget/main.cc
index c299326..a1b3f66 100644
--- a/tests/child_widget/main.cc
+++ b/tests/child_widget/main.cc
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include <gtkmm/main.h>
 #include "testwindow.h"
+#include <gtkmm/main.h>
 
 int main(int argc, char *argv[])
 {