separator: Don't use padding and borders wrongly

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

diff --git a/gtk/gtkcssvalueprivate.h b/gtk/gtkcssvalueprivate.h
index 047f9ea8c0012c0bb380ffe38f31e142274cb48f..1d2424e5f7944333eca7e074a7167cf010ec113a 100644 (file)
--- a/gtk/gtkcssvalueprivate.h
+++ b/gtk/gtkcssvalueprivate.h
@@ -22,18 +22,10 @@
 
 #include <glib-object.h>
 #include "gtkcsstypesprivate.h"
-#include "gtksymboliccolor.h"
-#include "gtkcssimageprivate.h"
-#include "gtkshadowprivate.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 */
 
@@ -48,6 +40,18 @@ 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);
 };
@@ -61,54 +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_take_gvalue           (GValue                     *g_value);
-GtkCssValue *_gtk_css_value_new_from_int              (gint                        val);
-GtkCssValue *_gtk_css_value_new_take_string           (char                       *string);
-GtkCssValue *_gtk_css_value_new_from_rgba             (const GdkRGBA              *v);
-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_shadow           (GtkShadow                  *v);
-GtkCssValue *_gtk_css_value_new_take_image            (GtkCssImage                *v);
-GtkCssValue *_gtk_css_value_new_from_number           (const GtkCssNumber         *v);
-GtkCssValue *_gtk_css_value_new_from_background_size  (const GtkCssBackgroundSize *v);
-GtkCssValue *_gtk_css_value_new_from_background_position (const GtkCssBackgroundPosition *v);
-void         _gtk_css_value_init_gvalue               (const GtkCssValue          *value,
-                                                      GValue                     *g_value);
-
-gboolean                        _gtk_css_value_is_special                 (const GtkCssValue *value);
-GtkCssSpecialValue              _gtk_css_value_get_special_kind           (const GtkCssValue *value);
-int                             _gtk_css_value_get_int                    (const GtkCssValue *value);
-int                             _gtk_css_value_get_enum                   (const GtkCssValue *value);
-double                          _gtk_css_value_get_double                 (const GtkCssValue *value);
-const char *                    _gtk_css_value_get_string                 (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);
-const GtkCssNumber             *_gtk_css_value_get_number                 (const GtkCssValue *value);
-GtkSymbolicColor               *_gtk_css_value_get_symbolic_color         (const GtkCssValue *value);
-GtkCssImage                    *_gtk_css_value_get_image                  (const GtkCssValue *value);
-GtkBorderStyle                  _gtk_css_value_get_border_style           (const GtkCssValue *value);
-const GtkCssBackgroundSize     *_gtk_css_value_get_background_size        (const GtkCssValue *value);
-const GtkCssBackgroundPosition *_gtk_css_value_get_background_position    (const GtkCssValue *value);
-const GtkCssBorderCornerRadius *_gtk_css_value_get_border_corner_radius   (const GtkCssValue *value);
-const GtkCssBorderImageRepeat  *_gtk_css_value_get_border_image_repeat    (const GtkCssValue *value);
-PangoStyle                      _gtk_css_value_get_pango_style            (const GtkCssValue *value);
-PangoVariant                    _gtk_css_value_get_pango_variant          (const GtkCssValue *value);
-PangoWeight                     _gtk_css_value_get_pango_weight           (const GtkCssValue *value);
-const GdkRGBA                  *_gtk_css_value_get_rgba                   (const GtkCssValue *value);
-cairo_pattern_t                *_gtk_css_value_get_pattern                (const GtkCssValue *value);
-GtkGradient                    *_gtk_css_value_get_gradient               (const GtkCssValue *value);
-GtkShadow                      *_gtk_css_value_get_shadow                 (const GtkCssValue *value);
-
 G_END_DECLS
 
 #endif /* __GTK_CSS_VALUE_PRIVATE_H__ */