Some header cleanups

Move GtkGradient to their own files, also move GtkBorder out of
gtkstyle.h, so that header can be all deprecated.

1 files changed, 4 insertions, 9 deletions

diff --git a/gtk/gtkstyleproperties.h b/gtk/gtkstyleproperties.h
index c419459976..8a243b7f4f 100644
--- a/gtk/gtkstyleproperties.h
+++ b/gtk/gtkstyleproperties.h
@@ -22,8 +22,7 @@
 
 #include <glib-object.h>
 #include <gdk/gdk.h>
-#include "gtkenums.h"
-#include "gtksymboliccolor.h"
+#include <gtk/gtkenums.h>
 
 G_BEGIN_DECLS
 
@@ -37,6 +36,9 @@ G_BEGIN_DECLS
 typedef struct _GtkStyleProperties GtkStyleProperties;
 typedef struct _GtkStylePropertiesClass GtkStylePropertiesClass;
 
+typedef struct _GtkSymbolicColor GtkSymbolicColor;
+typedef struct _GtkGradient GtkGradient;
+
 struct _GtkStyleProperties
 {
   GObject parent_object;
@@ -101,13 +103,6 @@ void     gtk_style_properties_merge          (GtkStyleProperties       *props,
                                               const GtkStyleProperties *props_to_merge,
                                               gboolean                  replace);
 
-gboolean gtk_symbolic_color_resolve (GtkSymbolicColor    *color,
-				     GtkStyleProperties  *props,
-                                     GdkRGBA             *resolved_color);
-gboolean gtk_gradient_resolve (GtkGradient         *gradient,
-                               GtkStyleProperties  *props,
-                               cairo_pattern_t    **resolved_gradient);
-
 G_END_DECLS
 
 #endif /* __GTK_STYLE_PROPERTIES_H__ */