X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcssvalueprivate.h;h=1d2424e5f7944333eca7e074a7167cf010ec113a;hb=3b2182e711ace4a2d6843848208224cd7525d530;hp=b7d065637f1d12d1a5460d20a2e9fdef6fece48b;hpb=5377169ef33d7b17d953ccd464e64dbd32335c47;p=~andy%2Fgtk

diff --git a/gtk/gtkcssvalueprivate.h b/gtk/gtkcssvalueprivate.h
index b7d065637..1d2424e5f 100644
--- a/gtk/gtkcssvalueprivate.h
+++ b/gtk/gtkcssvalueprivate.h
@@ -22,16 +22,10 @@
 
 #include <glib-object.h>
 #include "gtkcsstypesprivate.h"
-#include "gtksymboliccolor.h"
 
 G_BEGIN_DECLS
 
 #define GTK_TYPE_CSS_VALUE           (_gtk_css_value_get_type ())
-#define GTK_CSS_VALUE(obj)           (G_TYPE_CHECK_INSTANCE_CAST (obj, GTK_TYPE_CSS_VALUE, GtkCssValue))
-#define GTK_CSS_VALUE_CLASS(cls)     (G_TYPE_CHECK_CLASS_CAST (cls, GTK_TYPE_CSS_VALUE, GtkCssValueClass))
-#define GTK_IS_CSS_VALUE(obj)        (G_TYPE_CHECK_INSTANCE_TYPE (obj, GTK_TYPE_CSS_VALUE))
-#define GTK_IS_CSS_VALUE_CLASS(obj)  (G_TYPE_CHECK_CLASS_TYPE (obj, GTK_TYPE_CSS_VALUE))
-#define GTK_CSS_VALUE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CSS_VALUE, GtkCssValueClass))
 
 /* A GtkCssValue is a refcounted immutable value type */
 
@@ -46,10 +40,17 @@ typedef struct _GtkCssValueClass      GtkCssValueClass;
 struct _GtkCssValueClass {
   void          (* free)                              (GtkCssValue                *value);
 
+  GtkCssValue * (* compute)                           (GtkCssValue                *value,
+                                                       guint                       property_id,
+                                                       GtkStyleProviderPrivate    *provider,
+                                                       GtkCssComputedValues       *values,
+                                                       GtkCssComputedValues       *parent_values,
+                                                       GtkCssDependencies         *dependencies);
   gboolean      (* equal)                             (const GtkCssValue          *value1,
                                                        const GtkCssValue          *value2);
   GtkCssValue * (* transition)                        (GtkCssValue                *start,
                                                        GtkCssValue                *end,
+                                                       guint                       property_id,
                                                        double                      progress);
   void          (* print)                             (const GtkCssValue          *value,
                                                        GString                    *string);
@@ -64,46 +65,25 @@ GtkCssValue *_gtk_css_value_alloc                     (const GtkCssValueClass
 GtkCssValue *_gtk_css_value_ref                       (GtkCssValue                *value);
 void         _gtk_css_value_unref                     (GtkCssValue                *value);
 
+GtkCssValue *_gtk_css_value_compute                   (GtkCssValue                *value,
+                                                       guint                       property_id,
+                                                       GtkStyleProviderPrivate    *provider,
+                                                       GtkCssComputedValues       *values,
+                                                       GtkCssComputedValues       *parent_values,
+                                                       GtkCssDependencies         *dependencies);
 gboolean     _gtk_css_value_equal                     (const GtkCssValue          *value1,
                                                        const GtkCssValue          *value2);
+gboolean     _gtk_css_value_equal0                    (const GtkCssValue          *value1,
+                                                       const GtkCssValue          *value2);
 GtkCssValue *_gtk_css_value_transition                (GtkCssValue                *start,
                                                        GtkCssValue                *end,
+                                                       guint                       property_id,
                                                        double                      progress);
 
 char *       _gtk_css_value_to_string                 (const GtkCssValue          *value);
 void         _gtk_css_value_print                     (const GtkCssValue          *value,
                                                        GString                    *string);
 
-GType        _gtk_css_value_get_content_type          (const GtkCssValue          *value);
-gboolean     _gtk_css_value_holds                     (const GtkCssValue          *value,
-						       GType                       type);
-GtkCssValue *_gtk_css_value_new_from_gvalue           (const GValue               *g_value);
-GtkCssValue *_gtk_css_value_new_from_int              (gint                        val);
-GtkCssValue *_gtk_css_value_new_from_enum             (GType                       type,
-                                                       gint                        val);
-GtkCssValue *_gtk_css_value_new_take_strv             (char                      **strv);
-GtkCssValue *_gtk_css_value_new_from_boxed            (GType                       type,
-                                                       gpointer                    boxed);
-GtkCssValue *_gtk_css_value_new_from_color            (const GdkColor             *v);
-GtkCssValue *_gtk_css_value_new_take_symbolic_color   (GtkSymbolicColor           *v);
-GtkCssValue *_gtk_css_value_new_take_pattern          (cairo_pattern_t            *v);
-GtkCssValue *_gtk_css_value_new_take_binding_sets     (GPtrArray                  *array);
-GtkCssValue *_gtk_css_value_new_from_background_size  (const GtkCssBackgroundSize *v);
-GtkCssValue *_gtk_css_value_new_from_border_image_repeat (const GtkCssBorderImageRepeat *v);
-void         _gtk_css_value_init_gvalue               (const GtkCssValue          *value,
-						       GValue                     *g_value);
-
-int                             _gtk_css_value_get_int                    (const GtkCssValue *value);
-int                             _gtk_css_value_get_enum                   (const GtkCssValue *value);
-gpointer                        _gtk_css_value_dup_object                 (const GtkCssValue *value);
-gpointer                        _gtk_css_value_get_object                 (const GtkCssValue *value);
-gpointer                        _gtk_css_value_get_boxed                  (const GtkCssValue *value);
-const char **                   _gtk_css_value_get_strv                   (const GtkCssValue *value);
-GtkSymbolicColor               *_gtk_css_value_get_symbolic_color         (const GtkCssValue *value);
-const GtkCssBackgroundSize     *_gtk_css_value_get_background_size        (const GtkCssValue *value);
-const GtkCssBorderImageRepeat  *_gtk_css_value_get_border_image_repeat    (const GtkCssValue *value);
-GtkGradient                    *_gtk_css_value_get_gradient               (const GtkCssValue *value);
-
 G_END_DECLS
 
 #endif /* __GTK_CSS_VALUE_PRIVATE_H__ */