Add another bug ref

[~andy/gtk] / gtk / gtkstyleproperties.h

diff --git a/gtk/gtkstyleproperties.h b/gtk/gtkstyleproperties.h
index ec772338a95fc26f6f69e7a8c2e18b5287906caf..739a5650279e66f650036229f8fef8fd2415b46a 100644 (file)
--- a/gtk/gtkstyleproperties.h
+++ b/gtk/gtkstyleproperties.h
@@ -17,13 +17,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_STYLE_PROPERTIES_H__
 #define __GTK_STYLE_PROPERTIES_H__
 
 #include <glib-object.h>
 #include <gdk/gdk.h>
-#include "gtkenums.h"
-#include "gtksymboliccolor.h"
+#include <gtk/gtkenums.h>
 
 G_BEGIN_DECLS
 
@@ -37,6 +40,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;
@@ -46,6 +52,12 @@ struct _GtkStyleProperties
 struct _GtkStylePropertiesClass
 {
   GObjectClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 typedef gboolean (* GtkStylePropertyParser) (const gchar  *string,
@@ -54,6 +66,11 @@ typedef gboolean (* GtkStylePropertyParser) (const gchar  *string,
 
 GType gtk_style_properties_get_type (void) G_GNUC_CONST;
 
+/* Semi-private API */
+const GValue * _gtk_style_properties_peek_property (GtkStyleProperties *props,
+                                                    const gchar        *prop_name,
+                                                    GtkStateFlags       state);
+
 /* Functions to register style properties */
 void     gtk_style_properties_register_property (GtkStylePropertyParser  parse_func,
                                                  GParamSpec             *pspec);
@@ -66,7 +83,7 @@ GtkStyleProperties * gtk_style_properties_new (void);
 void               gtk_style_properties_map_color    (GtkStyleProperties *props,
                                                       const gchar        *name,
                                                       GtkSymbolicColor   *color);
-GtkSymbolicColor * gtk_style_properties_lookup_color (GtkStyleProperties *set,
+GtkSymbolicColor * gtk_style_properties_lookup_color (GtkStyleProperties *props,
                                                       const gchar        *name);
 
 void     gtk_style_properties_set_property (GtkStyleProperties *props,
@@ -101,13 +118,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__ */