styleproperty: Make print_func take a GtkCssValue

Also, constify GtkCssValue getters, so we can pass a const GtkCssValue
to the print_func.

1 files changed, 35 insertions, 29 deletions

diff --git a/gtk/gtkcssvalueprivate.h b/gtk/gtkcssvalueprivate.h
index 7fcb06661b..b87dc576ad 100644
--- a/gtk/gtkcssvalueprivate.h
+++ b/gtk/gtkcssvalueprivate.h
@@ -38,7 +38,6 @@ G_BEGIN_DECLS
 /* A GtkCssValue is a refcounted immutable value type */
 
 typedef struct _GtkCssValue           GtkCssValue;
-typedef struct _GtkCssValueBase       GtkCssValueBase;
 typedef struct _GtkCssValueClass      GtkCssValueClass;
 
 /* using define instead of struct here so compilers get the packing right */
@@ -48,6 +47,9 @@ typedef struct _GtkCssValueClass      GtkCssValueClass;
 
 struct _GtkCssValueClass {
   void          (* free)                              (GtkCssValue                *value);
+
+  void          (* print)                             (const GtkCssValue          *value,
+                                                       GString                    *string);
 };
 
 GType        _gtk_css_value_get_type                  (void) G_GNUC_CONST;
@@ -59,8 +61,11 @@ GtkCssValue *_gtk_css_value_alloc                     (const GtkCssValueClass
 GtkCssValue *_gtk_css_value_ref                       (GtkCssValue                *value);
 void         _gtk_css_value_unref                     (GtkCssValue                *value);
 
-GType        _gtk_css_value_get_content_type          (GtkCssValue                *value);
-gboolean     _gtk_css_value_holds                     (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);
@@ -78,34 +83,35 @@ GtkCssValue *_gtk_css_value_new_take_image            (GtkCssImage
 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               (GtkCssValue                *value,
+void         _gtk_css_value_init_gvalue               (const GtkCssValue          *value,
 						       GValue                     *g_value);
 
-gboolean                        _gtk_css_value_is_special                 (GtkCssValue *value);
-GtkCssSpecialValue              _gtk_css_value_get_special_kind           (GtkCssValue *value);
-int                             _gtk_css_value_get_int                    (GtkCssValue *value);
-double                          _gtk_css_value_get_double                 (GtkCssValue *value);
-const char *                    _gtk_css_value_get_string                 (GtkCssValue *value);
-gpointer                        _gtk_css_value_dup_object                 (GtkCssValue *value);
-gpointer                        _gtk_css_value_get_object                 (GtkCssValue *value);
-gpointer                        _gtk_css_value_get_boxed                  (GtkCssValue *value);
-const char **                   _gtk_css_value_get_strv                   (GtkCssValue *value);
-const GtkCssNumber             *_gtk_css_value_get_number                 (GtkCssValue *value);
-GtkSymbolicColor               *_gtk_css_value_get_symbolic_color         (GtkCssValue *value);
-GtkCssImage                    *_gtk_css_value_get_image                  (GtkCssValue *value);
-GtkBorderStyle                  _gtk_css_value_get_border_style           (GtkCssValue *value);
-const GtkCssBackgroundSize     *_gtk_css_value_get_background_size        (GtkCssValue *value);
-const GtkCssBackgroundPosition *_gtk_css_value_get_background_position    (GtkCssValue *value);
-const GtkCssBorderCornerRadius *_gtk_css_value_get_border_corner_radius   (GtkCssValue *value);
-const GtkCssBorderImageRepeat  *_gtk_css_value_get_border_image_repeat    (GtkCssValue *value);
-PangoFontDescription *          _gtk_css_value_get_font_description       (GtkCssValue *value);
-PangoStyle                      _gtk_css_value_get_pango_style            (GtkCssValue *value);
-PangoVariant                    _gtk_css_value_get_pango_variant          (GtkCssValue *value);
-PangoWeight                     _gtk_css_value_get_pango_weight           (GtkCssValue *value);
-const GdkRGBA                  *_gtk_css_value_get_rgba                   (GtkCssValue *value);
-cairo_pattern_t                *_gtk_css_value_get_pattern                (GtkCssValue *value);
-GtkGradient                    *_gtk_css_value_get_gradient               (GtkCssValue *value);
-GtkShadow                      *_gtk_css_value_get_shadow                 (GtkCssValue *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);
+PangoFontDescription *          _gtk_css_value_get_font_description       (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