gtk: Get gtkwidgetpath.h includes out of the public headers

and include them in the C files instead.

diff --git a/gtk/deprecated/gtkrc.c b/gtk/deprecated/gtkrc.c
index 1907fe4025e7d09578f25aacb5f827d7f1cdd4d3..2cb8005b507453037a9b47647edfb3bafad4254b 100644 (file)
--- a/gtk/deprecated/gtkrc.c
+++ b/gtk/deprecated/gtkrc.c
@@ -54,6 +54,7 @@
 #include "gtkmodulesprivate.h"
 #include "gtkprivate.h"
 #include "gtksettingsprivate.h"
+#include "gtkwidgetpath.h"
 #include "gtkwindow.h"
 
 #ifdef G_OS_WIN32

diff --git a/gtk/deprecated/gtkstyle.c b/gtk/deprecated/gtkstyle.c
index 0bc61484f1547c517922684e0a9518071869e77c..526636890cdba1057ab13f5fb6f0cb05680b5792 100644 (file)
--- a/gtk/deprecated/gtkstyle.c
+++ b/gtk/deprecated/gtkstyle.c
@@ -43,6 +43,7 @@
 #include "gtkdebug.h"
 #include "gtkspinner.h"
 #include "gtkborder.h"
+#include "gtkwidgetpath.h"
 
 /**
  * SECTION:gtkstyle

diff --git a/gtk/deprecated/gtkstyle.h b/gtk/deprecated/gtkstyle.h
index a711308818c1ddad148197ff2017102272ff67f8..1dd710096900087663130448913c211cd07f4711 100644 (file)
--- a/gtk/deprecated/gtkstyle.h
+++ b/gtk/deprecated/gtkstyle.h
@@ -32,7 +32,7 @@
 
 #include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
-#include <gtk/gtkwidgetpath.h>
+#include <gtk/gtktypes.h>
 
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index 1705645a53b7351c1e47e1ed70007d2f6179de4b..96bc318694594abaf0523cc15eeacacca6bbc7e5 100644 (file)
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -79,11 +79,12 @@
 
 #include "gtkbox.h"
 #include "gtkboxprivate.h"
+#include "gtkintl.h"
 #include "gtkorientable.h"
-#include "gtksizerequest.h"
-#include "gtktypebuiltins.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
+#include "gtktypebuiltins.h"
+#include "gtksizerequest.h"
+#include "gtkwidgetpath.h"
 #include "a11y/gtkboxaccessible.h"
 
 

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 95c2deca5e1ff9f106a6f8614f05871af61815a4..6cbcb39192513c8e289cfa65ac03a3b6c009b959 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -40,6 +40,7 @@
 #include "gtktogglebutton.h"
 #include "gtktreeselection.h"
 #include "gtkseparator.h"
+#include "gtkwidgetpath.h"
 #include "gtkwindow.h"
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 4d5559575fbab2b5535af0a5a8d3d1419d2d4dc6..275ee28c1f7c64d9a2485c38518bb198d0207299 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -46,6 +46,7 @@
 #include "gtkwindow.h"
 #include "gtkassistant.h"
 #include "gtkintl.h"
+#include "gtkwidgetpath.h"
 #include "a11y/gtkcontaineraccessible.h"
 
 /**

diff --git a/gtk/gtkcssselector.c b/gtk/gtkcssselector.c
index af68083762801b7aaf9f7cac27dd93d10fcd4a8e..2f7735d8ebb55200f1a101f9b93f42d5acd06a81 100644 (file)
--- a/gtk/gtkcssselector.c
+++ b/gtk/gtkcssselector.c
@@ -23,6 +23,7 @@
 
 #include "gtkcssprovider.h"
 #include "gtkstylecontextprivate.h"
+#include "gtkwidgetpath.h"
 
 typedef struct _GtkCssSelectorClass GtkCssSelectorClass;
 

diff --git a/gtk/gtkcssselectorprivate.h b/gtk/gtkcssselectorprivate.h
index 149a90cc4597226f4c6841e028eaf2e3c859e65e..c0ff428e0ad12391b384fc2bee9a955858df28bb 100644 (file)
--- a/gtk/gtkcssselectorprivate.h
+++ b/gtk/gtkcssselectorprivate.h
@@ -19,7 +19,7 @@
 #define __GTK_CSS_SELECTOR_PRIVATE_H__
 
 #include <gtk/gtkenums.h>
-#include <gtk/gtkwidgetpath.h>
+#include <gtk/gtktypes.h>
 #include "gtk/gtkcssparserprivate.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index 23a89d79d492632c420e527bcf3af14c2b63020f..03e0b2a6f71f32addcd53581e90b236d1b17b11f 100644 (file)
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -30,6 +30,7 @@
 #include "gtktypebuiltins.h"
 #include "gtkintl.h"
 #include "gtkbuildable.h"
+#include "gtkwidgetpath.h"
 
 #include "a11y/gtkframeaccessible.h"
 

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 4fe6973bd67e30f6d503617881193991ac2f6092..953b0e4a620e5266f6329126927bd8039688c118 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -108,6 +108,7 @@
 #include "gtkscrollbar.h"
 #include "gtksettings.h"
 #include "gtkprivate.h"
+#include "gtkwidgetpath.h"
 #include "gtkwidgetprivate.h"
 #include "gtkdnd.h"
 #include "gtkintl.h"

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index ac8038cb7913261421471f8b1954b564d6e6ce37..5ebdf707a7592fb4c02a9334d2b176237b3628d8 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -41,6 +41,7 @@
 #include "gtkdnd.h"
 #include "gtkbuildable.h"
 #include "gtktypebuiltins.h"
+#include "gtkwidgetpath.h"
 #include "a11y/gtknotebookaccessible.h"
 
 

diff --git a/gtk/gtknumerableicon.c b/gtk/gtknumerableicon.c
index d8573910d46b6b75892c6123ab67a084e25bdd43..3a1a6fad1cff2df3e577f99073173296c5d7f12f 100644 (file)
--- a/gtk/gtknumerableicon.c
+++ b/gtk/gtknumerableicon.c
@@ -45,6 +45,7 @@
 #include "gtkicontheme.h"
 #include "gtkintl.h"
 #include "gtkwidget.h"
+#include "gtkwidgetpath.h"
 #include "gtkwindow.h"
 
 #include <gdk/gdk.h>

diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index 101f884f78ef88bd8f166723d834bc7c20d66ab5..3c290bc5e13aab57264d1fe42fd306db90c3388f 100644 (file)
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -34,6 +34,7 @@
 #include "gtkmarshalers.h"
 #include "gtksettings.h"
 #include "gtktogglebutton.h"
+#include "gtkwidgetpath.h"
 
 
 enum {

diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 69a77e3c9460a58b893b7d0bed977ca7bd438b9e..5c7dbc19de7fa2618774f56687c7a80507265e10 100644 (file)
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -39,12 +39,13 @@
 #include "gtkbindings.h"
 #include "gtkentryprivate.h"
 #include "gtkicontheme.h"
+#include "gtkintl.h"
 #include "gtkmarshalers.h"
+#include "gtkprivate.h"
 #include "gtksettings.h"
 #include "gtkstock.h"
-#include "gtkprivate.h"
-#include "gtkintl.h"
 #include "gtktypebuiltins.h"
+#include "gtkwidgetpath.h"
 
 #include "a11y/gtkspinbuttonaccessible.h"
 

diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index ccf2315a05e8539b19042cc70733a237b80ada32..e0c8ebfe82d71b0bb79d5de32b19ffe6560b7514 100644 (file)
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -34,6 +34,7 @@
 #include "gtkanimationdescription.h"
 #include "gtktimeline.h"
 #include "gtkiconfactory.h"
+#include "gtkwidgetpath.h"
 #include "gtkwidgetprivate.h"
 #include "gtkstyleproviderprivate.h"
 #include "gtksettings.h"

diff --git a/gtk/gtkstyleprovider.c b/gtk/gtkstyleprovider.c
index 80f411c3a2e5f962cce159d0e8c1b58649a2285f..23575561b24b0fc8aa5d50b2bd41eaeac18216d3 100644 (file)
--- a/gtk/gtkstyleprovider.c
+++ b/gtk/gtkstyleprovider.c
@@ -17,9 +17,11 @@
 
 #include "config.h"
 
-#include "gtkprivate.h"
 #include "gtkstyleprovider.h"
+
 #include "gtkintl.h"
+#include "gtkprivate.h"
+#include "gtkwidgetpath.h"
 
 /**
  * SECTION:gtkstyleprovider

diff --git a/gtk/gtkstyleprovider.h b/gtk/gtkstyleprovider.h
index e8ac3b2bdb2806ed75d37465e1275a01cca5fa8f..9573dc291b91dd4cf1e2b3ea22602b6142969ed7 100644 (file)
--- a/gtk/gtkstyleprovider.h
+++ b/gtk/gtkstyleprovider.h
@@ -23,10 +23,10 @@
 #define __GTK_STYLE_PROVIDER_H__
 
 #include <glib-object.h>
-#include <gtk/gtkwidgetpath.h>
+#include <gtk/gtkenums.h>
 #include <gtk/gtkiconfactory.h>
 #include <gtk/gtkstyleproperties.h>
-#include <gtk/gtkenums.h>
+#include <gtk/gtktypes.h>
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtkstyleproviderprivate.h b/gtk/gtkstyleproviderprivate.h
index d53a463d7f7231caa3f6eee9b1e4272d8491a0f6..ac7ac3d80683a7713ee44ed7f2b731c24f8ca8c4 100644 (file)
--- a/gtk/gtkstyleproviderprivate.h
+++ b/gtk/gtkstyleproviderprivate.h
@@ -22,7 +22,7 @@
 #include "gtk/gtkcsslookupprivate.h"
 #include <gtk/gtkenums.h>
 #include <gtk/gtksymboliccolor.h>
-#include <gtk/gtkwidgetpath.h>
+#include <gtk/gtktypes.h>
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtkthemingengine.h b/gtk/gtkthemingengine.h
index d0e76e98e1f0bda12dd86c2af7e43e26d5cec5d5..aa7e05388c1d660b154aa791cff0bf57fe5ad8d9 100644 (file)
--- a/gtk/gtkthemingengine.h
+++ b/gtk/gtkthemingengine.h
@@ -25,9 +25,10 @@
 #include <glib-object.h>
 #include <cairo.h>
 
-#include <gtk/gtkstylecontext.h>
-#include <gtk/gtkwidgetpath.h>
+#include <gtk/gtkborder.h>
 #include <gtk/gtkenums.h>
+#include <gtk/gtkstyleproperties.h>
+#include <gtk/gtktypes.h>
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index de5603c622a69b31ebad13f2978b0d9fa083bd29..3974810f299649cca4af952dc726b69e908f6b40 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -54,6 +54,7 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtktypebuiltins.h"
+#include "gtkwidgetpath.h"
 
 
 /**

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 97d5cb6a8e8f19db1d7b7b5cd26476b28a5a964d..7bca6a365e8a696b3442846294733e2b56cf9e9f 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -51,6 +51,7 @@
 #include "gtktypebuiltins.h"
 #include "gtkmain.h"
 #include "gtksettings.h"
+#include "gtkwidgetpath.h"
 #include "a11y/gtktreeviewaccessible.h"