gdk/gdkwindow.c, gtk/gtkwidget.c: Include fallback-c89.c

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

diff --git a/gtk/gtkstylepropertyprivate.h b/gtk/gtkstylepropertyprivate.h
index 936b48a3174a087d6b00819ff3c793ecd687cdd1..a92afdc36a0783ce57968cdc0f5f7e17c2f3bb93 100644 (file)
--- a/gtk/gtkstylepropertyprivate.h
+++ b/gtk/gtkstylepropertyprivate.h
@@ -20,6 +20,7 @@
 
 #include "gtkcssparserprivate.h"
 #include "gtkstylecontextprivate.h"
+#include "gtkcssvalueprivate.h"
 
 G_BEGIN_DECLS
 
@@ -33,12 +34,8 @@ G_BEGIN_DECLS
 typedef struct _GtkStyleProperty           GtkStyleProperty;
 typedef struct _GtkStylePropertyClass      GtkStylePropertyClass;
 
-typedef enum {
-  GTK_STYLE_PROPERTY_INHERIT = (1 << 0)
-} GtkStylePropertyFlags;
-
-typedef const GValue *   (* GtkStyleQueryFunc)             (guint                   id,
-                                                            gpointer                data);
+typedef GtkCssValue *   (* GtkStyleQueryFunc)        (guint                   id,
+                                                     gpointer                data);
 
 struct _GtkStyleProperty
 {
@@ -60,10 +57,8 @@ struct _GtkStylePropertyClass
                                                             GValue                 *value,
                                                             GtkStyleQueryFunc       query_func,
                                                             gpointer                query_data);
-  gboolean          (* parse_value)                        (GtkStyleProperty *      property,
-                                                            GValue                 *value,
-                                                            GtkCssParser           *parser,
-                                                            GFile                  *base);
+  GtkCssValue *     (* parse_value)                        (GtkStyleProperty *      property,
+                                                            GtkCssParser           *parser);
 
   GHashTable   *properties;
 };
@@ -76,10 +71,8 @@ GtkStyleProperty *       _gtk_style_property_lookup        (const char
 
 const char *             _gtk_style_property_get_name      (GtkStyleProperty       *property);
 
-gboolean                 _gtk_style_property_parse_value   (GtkStyleProperty *      property,
-                                                            GValue                 *value,
-                                                            GtkCssParser           *parser,
-                                                            GFile                  *base);
+GtkCssValue *            _gtk_style_property_parse_value   (GtkStyleProperty *      property,
+                                                            GtkCssParser           *parser);
 
 GType                    _gtk_style_property_get_value_type(GtkStyleProperty *      property);
 void                     _gtk_style_property_query         (GtkStyleProperty *      property,