box: Fix includes so hbox/vbox compile warning-free

And make sure most of the code is included before undeffing deprecated
code.

diff --git a/gtk/gtkboxprivate.h b/gtk/gtkboxprivate.h
index 9a4d463a4ca0fbe8437aa61023be34f4dd6c449e..9628d3c306f53586dee71aaf1fc19858716ba619 100644 (file)
--- a/gtk/gtkboxprivate.h
+++ b/gtk/gtkboxprivate.h
@@ -19,6 +19,8 @@
 #ifndef __GTK_BOX_PRIVATE_H__
 #define __GTK_BOX_PRIVATE_H__
 
+#include "gtkbox.h"
+
 G_BEGIN_DECLS
 
 

diff --git a/gtk/gtkhbox.c b/gtk/gtkhbox.c
index 021fb22d6836b77b6a483431dbd29df305bd2b2b..cdfada50b49d6490bf4db87a1e1ccd6b3dd7f7cd 100644 (file)
--- a/gtk/gtkhbox.c
+++ b/gtk/gtkhbox.c
@@ -26,10 +26,10 @@
 
 #include "config.h"
 
+#include "gtkboxprivate.h"
+#include "gtkorientable.h"
 #undef GTK_DISABLE_DEPRECATED
 #include "gtkhbox.h"
-#include "gtkorientable.h"
-#include "gtkboxprivate.h"
 
 
 /**

diff --git a/gtk/gtkvbox.c b/gtk/gtkvbox.c
index 9251291f11019ebfb97d14d24337550f5392c739..e3515eb643ff75ee9b9849a9d86b0b9efe54d191 100644 (file)
--- a/gtk/gtkvbox.c
+++ b/gtk/gtkvbox.c
@@ -26,6 +26,7 @@
 
 #include "config.h"
 
+#include "gtkboxprivate.h"
 #include "gtkorientable.h"
 #undef GTK_DISABLE_DEPRECATED
 #include "gtkvbox.h"