diff options
| author | Benjamin Otte <otte@redhat.com> | 2017-10-31 04:31:46 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2017-10-31 04:33:54 +0100 |
| commit | 83fb7a649f07fc989ff149036b17698f7dee18c4 (patch) | |
| tree | 772d5c0ac1a4ee7054cef63e6f675fdbeebc081f /gtk | |
| parent | c8986e66ce482714f4ce2adf3c24dd53cca27bbe (diff) | |
| download | gtk+-83fb7a649f07fc989ff149036b17698f7dee18c4.tar.gz | |
css: Merge GtkStyleProviderPrivate into GtkStyleProvider
This is just lots of renaming.
The interface remains private, so the public API does not change, apart
from removing the definition of the Interface object to avoid
subclassing.
Diffstat (limited to 'gtk')
62 files changed, 486 insertions, 573 deletions
diff --git a/gtk/gtkcssanimatedstyle.c b/gtk/gtkcssanimatedstyle.c index aadaf97173..6325007bb6 100644 --- a/gtk/gtkcssanimatedstyle.c +++ b/gtk/gtkcssanimatedstyle.c @@ -324,12 +324,12 @@ gtk_css_animated_style_find_animation (GSList *animations, } static GSList * -gtk_css_animated_style_create_css_animations (GSList *animations, - GtkCssStyle *base_style, - GtkCssStyle *parent_style, - gint64 timestamp, - GtkStyleProviderPrivate *provider, - GtkCssStyle *source) +gtk_css_animated_style_create_css_animations (GSList *animations, + GtkCssStyle *base_style, + GtkCssStyle *parent_style, + gint64 timestamp, + GtkStyleProvider *provider, + GtkCssStyle *source) { GtkCssValue *durations, *delays, *timing_functions, *animation_names; GtkCssValue *iteration_counts, *directions, *play_states, *fill_modes; @@ -369,7 +369,7 @@ gtk_css_animated_style_create_css_animations (GSList *animation } else { - keyframes = _gtk_style_provider_private_get_keyframes (provider, name); + keyframes = gtk_style_provider_get_keyframes (provider, name); if (keyframes == NULL) continue; @@ -410,11 +410,11 @@ gtk_css_animated_style_apply_animations (GtkCssAnimatedStyle *style) } GtkCssStyle * -gtk_css_animated_style_new (GtkCssStyle *base_style, - GtkCssStyle *parent_style, - gint64 timestamp, - GtkStyleProviderPrivate *provider, - GtkCssStyle *previous_style) +gtk_css_animated_style_new (GtkCssStyle *base_style, + GtkCssStyle *parent_style, + gint64 timestamp, + GtkStyleProvider *provider, + GtkCssStyle *previous_style) { GtkCssAnimatedStyle *result; GSList *animations; diff --git a/gtk/gtkcssanimatedstyleprivate.h b/gtk/gtkcssanimatedstyleprivate.h index 7ae8887eeb..ee0b1a60e2 100644 --- a/gtk/gtkcssanimatedstyleprivate.h +++ b/gtk/gtkcssanimatedstyleprivate.h @@ -55,7 +55,7 @@ GType gtk_css_animated_style_get_type (void) G_GNUC_CO GtkCssStyle * gtk_css_animated_style_new (GtkCssStyle *base_style, GtkCssStyle *parent_style, gint64 timestamp, - GtkStyleProviderPrivate *provider, + GtkStyleProvider *provider, GtkCssStyle *previous_style); GtkCssStyle * gtk_css_animated_style_new_advance (GtkCssAnimatedStyle *source, GtkCssStyle *base, diff --git a/gtk/gtkcssarrayvalue.c b/gtk/gtkcssarrayvalue.c index c1a94c7236..27aab6f8c6 100644 --- a/gtk/gtkcssarrayvalue.c +++ b/gtk/gtkcssarrayvalue.c @@ -43,11 +43,11 @@ gtk_css_value_array_free (GtkCssValue *value) } static GtkCssValue * -gtk_css_value_array_compute (GtkCssValue *value, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_array_compute (GtkCssValue *value, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssValue *result; GtkCssValue *i_value; diff --git a/gtk/gtkcssbgsizevalue.c b/gtk/gtkcssbgsizevalue.c index 3e25ded758..ee7d94a0c9 100644 --- a/gtk/gtkcssbgsizevalue.c +++ b/gtk/gtkcssbgsizevalue.c @@ -41,11 +41,11 @@ gtk_css_value_bg_size_free (GtkCssValue *value) } static GtkCssValue * -gtk_css_value_bg_size_compute (GtkCssValue *value, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_bg_size_compute (GtkCssValue *value, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssValue *x, *y; diff --git a/gtk/gtkcssbordervalue.c b/gtk/gtkcssbordervalue.c index d95196ca02..0345ff1e9c 100644 --- a/gtk/gtkcssbordervalue.c +++ b/gtk/gtkcssbordervalue.c @@ -42,11 +42,11 @@ gtk_css_value_border_free (GtkCssValue *value) } static GtkCssValue * -gtk_css_value_border_compute (GtkCssValue *value, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_border_compute (GtkCssValue *value, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssValue *values[4]; GtkCssValue *computed; diff --git a/gtk/gtkcsscalcvalue.c b/gtk/gtkcsscalcvalue.c index 7ea27cdc78..0185aff6c7 100644 --- a/gtk/gtkcsscalcvalue.c +++ b/gtk/gtkcsscalcvalue.c @@ -98,11 +98,11 @@ gtk_css_calc_array_add (GPtrArray *array, GtkCssValue *value) } static GtkCssValue * -gtk_css_value_calc_compute (GtkCssValue *value, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_calc_compute (GtkCssValue *value, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssValue *result; GPtrArray *array; diff --git a/gtk/gtkcsscolorvalue.c b/gtk/gtkcsscolorvalue.c index 4bd0f59a02..0531db40ac 100644 --- a/gtk/gtkcsscolorvalue.c +++ b/gtk/gtkcsscolorvalue.c @@ -103,10 +103,10 @@ gtk_css_value_color_free (GtkCssValue *color) } static GtkCssValue * -gtk_css_value_color_get_fallback (guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_color_get_fallback (guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { static const GdkRGBA transparent = { 0, 0, 0, 0 }; @@ -143,10 +143,10 @@ gtk_css_value_color_get_fallback (guint property_id, } GtkCssValue * -_gtk_css_color_value_resolve (GtkCssValue *color, - GtkStyleProviderPrivate *provider, - GtkCssValue *current, - GSList *cycle_list) +_gtk_css_color_value_resolve (GtkCssValue *color, + GtkStyleProvider *provider, + GtkCssValue *current, + GSList *cycle_list) { GtkCssValue *value; @@ -167,7 +167,7 @@ _gtk_css_color_value_resolve (GtkCssValue *color, if (g_slist_find (cycle_list, color)) return NULL; - named = _gtk_style_provider_private_get_color (provider, color->sym_col.name); + named = gtk_style_provider_get_color (provider, color->sym_col.name); if (named == NULL) return NULL; @@ -289,11 +289,11 @@ _gtk_css_color_value_resolve (GtkCssValue *color, } static GtkCssValue * -gtk_css_value_color_compute (GtkCssValue *value, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_color_compute (GtkCssValue *value, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssValue *resolved, *current; diff --git a/gtk/gtkcsscolorvalueprivate.h b/gtk/gtkcsscolorvalueprivate.h index b80d52100d..490d5fbde9 100644 --- a/gtk/gtkcsscolorvalueprivate.h +++ b/gtk/gtkcsscolorvalueprivate.h @@ -43,10 +43,10 @@ GtkCssValue * _gtk_css_color_value_new_current_color (void); GtkCssValue * _gtk_css_color_value_parse (GtkCssParser *parser); -GtkCssValue * _gtk_css_color_value_resolve (GtkCssValue *color, - GtkStyleProviderPrivate *provider, - GtkCssValue *current, - GSList *cycle_list); +GtkCssValue * _gtk_css_color_value_resolve (GtkCssValue *color, + GtkStyleProvider *provider, + GtkCssValue *current, + GSList *cycle_list); G_END_DECLS diff --git a/gtk/gtkcsscornervalue.c b/gtk/gtkcsscornervalue.c index c5ee68ee3f..30864c8067 100644 --- a/gtk/gtkcsscornervalue.c +++ b/gtk/gtkcsscornervalue.c @@ -37,11 +37,11 @@ gtk_css_value_corner_free (GtkCssValue *value) } static GtkCssValue * -gtk_css_value_corner_compute (GtkCssValue *corner, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_corner_compute (GtkCssValue *corner, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssValue *x, *y; diff --git a/gtk/gtkcssdimensionvalue.c b/gtk/gtkcssdimensionvalue.c index 0577df6c76..648e61a4c6 100644 --- a/gtk/gtkcssdimensionvalue.c +++ b/gtk/gtkcssdimensionvalue.c @@ -37,10 +37,10 @@ gtk_css_value_dimension_free (GtkCssValue *value) } static double -get_base_font_size_px (guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +get_base_font_size_px (guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { if (property_id == GTK_CSS_PROPERTY_FONT_SIZE) { @@ -60,11 +60,11 @@ get_dpi (GtkCssStyle *style) } static GtkCssValue * -gtk_css_value_dimension_compute (GtkCssValue *number, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_dimension_compute (GtkCssValue *number, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkBorderStyle border_style; diff --git a/gtk/gtkcsseasevalue.c b/gtk/gtkcsseasevalue.c index e2faef088d..1c15d2423a 100644 --- a/gtk/gtkcsseasevalue.c +++ b/gtk/gtkcsseasevalue.c @@ -50,11 +50,11 @@ gtk_css_value_ease_free (GtkCssValue *value) } static GtkCssValue * -gtk_css_value_ease_compute (GtkCssValue *value, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_ease_compute (GtkCssValue *value, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { return _gtk_css_value_ref (value); } diff --git a/gtk/gtkcssenumvalue.c b/gtk/gtkcssenumvalue.c index cac36006b5..d9f38dc257 100644 --- a/gtk/gtkcssenumvalue.c +++ b/gtk/gtkcssenumvalue.c @@ -43,11 +43,11 @@ gtk_css_value_enum_free (GtkCssValue *value) } static GtkCssValue * -gtk_css_value_enum_compute (GtkCssValue *value, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_enum_compute (GtkCssValue *value, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { return _gtk_css_value_ref (value); } @@ -205,13 +205,13 @@ get_dpi (GtkCssStyle *style) #define DEFAULT_FONT_SIZE_PT 10 double -gtk_css_font_size_get_default_px (GtkStyleProviderPrivate *provider, - GtkCssStyle *style) +gtk_css_font_size_get_default_px (GtkStyleProvider *provider, + GtkCssStyle *style) { GtkSettings *settings; int font_size; - settings = _gtk_style_provider_private_get_settings (provider); + settings = gtk_style_provider_get_settings (provider); if (settings == NULL) return DEFAULT_FONT_SIZE_PT * get_dpi (style) / 72.0; @@ -225,11 +225,11 @@ gtk_css_font_size_get_default_px (GtkStyleProviderPrivate *provider, } static GtkCssValue * -gtk_css_value_font_size_compute (GtkCssValue *value, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_font_size_compute (GtkCssValue *value, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { double font_size; @@ -386,11 +386,11 @@ _gtk_css_font_style_value_get (const GtkCssValue *value) #define LIGHTER -2 static GtkCssValue * -gtk_css_value_font_weight_compute (GtkCssValue *value, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_font_weight_compute (GtkCssValue *value, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { PangoWeight new_weight; int parent_value; diff --git a/gtk/gtkcssenumvalueprivate.h b/gtk/gtkcssenumvalueprivate.h index 753ec895f1..972ffd96d0 100644 --- a/gtk/gtkcssenumvalueprivate.h +++ b/gtk/gtkcssenumvalueprivate.h @@ -38,8 +38,8 @@ GtkBorderStyle _gtk_css_border_style_value_get (const GtkCssValue *value) GtkCssValue * _gtk_css_font_size_value_new (GtkCssFontSize size); GtkCssValue * _gtk_css_font_size_value_try_parse (GtkCssParser *parser); GtkCssFontSize _gtk_css_font_size_value_get (const GtkCssValue *value); -double gtk_css_font_size_get_default_px (GtkStyleProviderPrivate *provider, - GtkCssStyle *style); +double gtk_css_font_size_get_default_px (GtkStyleProvider *provider, + GtkCssStyle *style); GtkCssValue * _gtk_css_font_style_value_new (PangoStyle style); GtkCssValue * _gtk_css_font_style_value_try_parse (GtkCssParser *parser); diff --git a/gtk/gtkcssfiltervalue.c b/gtk/gtkcssfiltervalue.c index e69c82f84d..92472e3fa3 100644 --- a/gtk/gtkcssfiltervalue.c +++ b/gtk/gtkcssfiltervalue.c @@ -300,12 +300,12 @@ gtk_css_value_filter_free (GtkCssValue *value) /* returns TRUE if dest == src */ static gboolean -gtk_css_filter_compute (GtkCssFilter *dest, - GtkCssFilter *src, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_filter_compute (GtkCssFilter *dest, + GtkCssFilter *src, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { dest->type = src->type; @@ -356,11 +356,11 @@ gtk_css_filter_compute (GtkCssFilter *dest, } static GtkCssValue * -gtk_css_value_filter_compute (GtkCssValue *value, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_filter_compute (GtkCssValue *value, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssValue *result; gboolean changes; diff --git a/gtk/gtkcssiconthemevalue.c b/gtk/gtkcssiconthemevalue.c index c9c7f904cd..a417b43da7 100644 --- a/gtk/gtkcssiconthemevalue.c +++ b/gtk/gtkcssiconthemevalue.c @@ -70,18 +70,18 @@ gtk_css_value_icon_theme_free (GtkCssValue *value) } static GtkCssValue * -gtk_css_value_icon_theme_compute (GtkCssValue *icon_theme, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_icon_theme_compute (GtkCssValue *icon_theme, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkIconTheme *icontheme; if (icon_theme->icontheme) icontheme = icon_theme->icontheme; else - icontheme = gtk_icon_theme_get_for_display (_gtk_settings_get_display (_gtk_style_provider_private_get_settings (provider))); + icontheme = gtk_icon_theme_get_for_display (_gtk_settings_get_display (gtk_style_provider_get_settings (provider))); return gtk_css_icon_theme_value_new (icontheme); } diff --git a/gtk/gtkcssimage.c b/gtk/gtkcssimage.c index 60a3f49cfa..7ce0f0a7e2 100644 --- a/gtk/gtkcssimage.c +++ b/gtk/gtkcssimage.c @@ -64,11 +64,11 @@ gtk_css_image_real_get_aspect_ratio (GtkCssImage *image) } static GtkCssImage * -gtk_css_image_real_compute (GtkCssImage *image, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_image_real_compute (GtkCssImage *image, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { return g_object_ref (image); } @@ -184,11 +184,11 @@ _gtk_css_image_get_aspect_ratio (GtkCssImage *image) } GtkCssImage * -_gtk_css_image_compute (GtkCssImage *image, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +_gtk_css_image_compute (GtkCssImage *image, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssImageClass *klass; diff --git a/gtk/gtkcssimagebuiltin.c b/gtk/gtkcssimagebuiltin.c index a8fd047eca..fe15fb183f 100644 --- a/gtk/gtkcssimagebuiltin.c +++ b/gtk/gtkcssimagebuiltin.c @@ -474,11 +474,11 @@ gtk_css_image_builtin_print (GtkCssImage *image, } static GtkCssImage * -gtk_css_image_builtin_compute (GtkCssImage *image, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_image_builtin_compute (GtkCssImage *image, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssImageBuiltin *result; diff --git a/gtk/gtkcssimagecrossfade.c b/gtk/gtkcssimagecrossfade.c index 08cd137fee..0834726724 100644 --- a/gtk/gtkcssimagecrossfade.c +++ b/gtk/gtkcssimagecrossfade.c @@ -193,11 +193,11 @@ gtk_css_image_cross_fade_print (GtkCssImage *image, } static GtkCssImage * -gtk_css_image_cross_fade_compute (GtkCssImage *image, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_image_cross_fade_compute (GtkCssImage *image, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssImageCrossFade *cross_fade = GTK_CSS_IMAGE_CROSS_FADE (image); GtkCssImage *start, *end, *computed; diff --git a/gtk/gtkcssimagefallback.c b/gtk/gtkcssimagefallback.c index 37799a862e..afc5aef779 100644 --- a/gtk/gtkcssimagefallback.c +++ b/gtk/gtkcssimagefallback.c @@ -131,11 +131,11 @@ gtk_css_image_fallback_dispose (GObject *object) static GtkCssImage * -gtk_css_image_fallback_compute (GtkCssImage *image, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_image_fallback_compute (GtkCssImage *image, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssImageFallback *fallback = GTK_CSS_IMAGE_FALLBACK (image); GtkCssImageFallback *copy; diff --git a/gtk/gtkcssimageicontheme.c b/gtk/gtkcssimageicontheme.c index 7d9667b3b2..9b0fe31943 100644 --- a/gtk/gtkcssimageicontheme.c +++ b/gtk/gtkcssimageicontheme.c @@ -152,11 +152,11 @@ gtk_css_image_icon_theme_print (GtkCssImage *image, } static GtkCssImage * -gtk_css_image_icon_theme_compute (GtkCssImage *image, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_image_icon_theme_compute (GtkCssImage *image, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssImageIconTheme *icon_theme = GTK_CSS_IMAGE_ICON_THEME (image); GtkCssImageIconTheme *copy; @@ -164,7 +164,7 @@ gtk_css_image_icon_theme_compute (GtkCssImage *image, copy = g_object_new (GTK_TYPE_CSS_IMAGE_ICON_THEME, NULL); copy->name = g_strdup (icon_theme->name); copy->icon_theme = gtk_css_icon_theme_value_get_icon_theme (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_THEME)); - copy->scale = _gtk_style_provider_private_get_scale (provider); + copy->scale = gtk_style_provider_get_scale (provider); gtk_icon_theme_lookup_symbolic_colors (style, ©->color, ©->success, ©->warning, ©->error); return GTK_CSS_IMAGE (copy); diff --git a/gtk/gtkcssimagelinear.c b/gtk/gtkcssimagelinear.c index 0ba5f0bde9..97ce80a45d 100644 --- a/gtk/gtkcssimagelinear.c +++ b/gtk/gtkcssimagelinear.c @@ -457,11 +457,11 @@ gtk_css_image_linear_print (GtkCssImage *image, } static GtkCssImage * -gtk_css_image_linear_compute (GtkCssImage *image, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_image_linear_compute (GtkCssImage *image, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssImageLinear *linear = GTK_CSS_IMAGE_LINEAR (image); GtkCssImageLinear *copy; diff --git a/gtk/gtkcssimageprivate.h b/gtk/gtkcssimageprivate.h index 492734cba2..9fc962df28 100644 --- a/gtk/gtkcssimageprivate.h +++ b/gtk/gtkcssimageprivate.h @@ -58,7 +58,7 @@ struct _GtkCssImageClass /* create "computed value" in CSS terms, returns a new reference */ GtkCssImage *(* compute) (GtkCssImage *image, guint property_id, - GtkStyleProviderPrivate *provider, + GtkStyleProvider *provider, GtkCssStyle *style, GtkCssStyle *parent_style); /* compare two images for equality */ @@ -98,7 +98,7 @@ double _gtk_css_image_get_aspect_ratio (GtkCssImage * GtkCssImage * _gtk_css_image_compute (GtkCssImage *image, guint property_id, - GtkStyleProviderPrivate *provider, + GtkStyleProvider *provider, GtkCssStyle *style, GtkCssStyle *parent_style); gboolean _gtk_css_image_equal (GtkCssImage *image1, diff --git a/gtk/gtkcssimageradial.c b/gtk/gtkcssimageradial.c index 305e6900ef..0afd43040f 100644 --- a/gtk/gtkcssimageradial.c +++ b/gtk/gtkcssimageradial.c @@ -457,11 +457,11 @@ gtk_css_image_radial_print (GtkCssImage *image, } static GtkCssImage * -gtk_css_image_radial_compute (GtkCssImage *image, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_image_radial_compute (GtkCssImage *image, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssImageRadial *radial = GTK_CSS_IMAGE_RADIAL (image); GtkCssImageRadial *copy; diff --git a/gtk/gtkcssimagerecolor.c b/gtk/gtkcssimagerecolor.c index bb617b8d47..312414cdb8 100644 --- a/gtk/gtkcssimagerecolor.c +++ b/gtk/gtkcssimagerecolor.c @@ -144,11 +144,11 @@ gtk_css_image_recolor_load (GtkCssImageRecolor *recolor, } static GtkCssImage * -gtk_css_image_recolor_compute (GtkCssImage *image, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_image_recolor_compute (GtkCssImage *image, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssImageRecolor *recolor = GTK_CSS_IMAGE_RECOLOR (image); GtkCssValue *palette; @@ -156,7 +156,7 @@ gtk_css_image_recolor_compute (GtkCssImage *image, int scale; GError *error = NULL; - scale = _gtk_style_provider_private_get_scale (provider); + scale = gtk_style_provider_get_scale (provider); if (recolor->palette) palette = _gtk_css_value_compute (recolor->palette, property_id, provider, style, parent_style); @@ -168,7 +168,7 @@ gtk_css_image_recolor_compute (GtkCssImage *image, if (error) { GtkCssSection *section = gtk_css_style_get_section (style, property_id); - _gtk_style_provider_private_emit_error (provider, section, error); + gtk_style_provider_emit_error (provider, section, error); g_error_free (error); } diff --git a/gtk/gtkcssimagescaled.c b/gtk/gtkcssimagescaled.c index 4468893e71..bc82042453 100644 --- a/gtk/gtkcssimagescaled.c +++ b/gtk/gtkcssimagescaled.c @@ -93,16 +93,16 @@ gtk_css_image_scaled_dispose (GObject *object) static GtkCssImage * -gtk_css_image_scaled_compute (GtkCssImage *image, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_image_scaled_compute (GtkCssImage *image, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssImageScaled *scaled = GTK_CSS_IMAGE_SCALED (image); int scale; - scale = _gtk_style_provider_private_get_scale (provider); + scale = gtk_style_provider_get_scale (provider); scale = MAX(MIN (scale, scaled->n_images), 1); return _gtk_css_image_compute (scaled->images[scale - 1], diff --git a/gtk/gtkcssimageurl.c b/gtk/gtkcssimageurl.c index ffde548c2d..091078fbf2 100644 --- a/gtk/gtkcssimageurl.c +++ b/gtk/gtkcssimageurl.c @@ -125,11 +125,11 @@ gtk_css_image_url_snapshot (GtkCssImage *image, } static GtkCssImage * -gtk_css_image_url_compute (GtkCssImage *image, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_image_url_compute (GtkCssImage *image, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssImageUrl *url = GTK_CSS_IMAGE_URL (image); GtkCssImage *copy; @@ -139,7 +139,7 @@ gtk_css_image_url_compute (GtkCssImage *image, if (error) { GtkCssSection *section = gtk_css_style_get_section (style, property_id); - _gtk_style_provider_private_emit_error (provider, section, error); + gtk_style_provider_emit_error (provider, section, error); g_error_free (error); } diff --git a/gtk/gtkcssimagevalue.c b/gtk/gtkcssimagevalue.c index 34c38b9bf7..413117f5a8 100644 --- a/gtk/gtkcssimagevalue.c +++ b/gtk/gtkcssimagevalue.c @@ -34,11 +34,11 @@ gtk_css_value_image_free (GtkCssValue *value) } static GtkCssValue * -gtk_css_value_image_compute (GtkCssValue *value, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_image_compute (GtkCssValue *value, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssImage *image, *computed; diff --git a/gtk/gtkcssinheritvalue.c b/gtk/gtkcssinheritvalue.c index ef1d67ec29..0be2bb60bc 100644 --- a/gtk/gtkcssinheritvalue.c +++ b/gtk/gtkcssinheritvalue.c @@ -34,11 +34,11 @@ gtk_css_value_inherit_free (GtkCssValue *value) } static GtkCssValue * -gtk_css_value_inherit_compute (GtkCssValue *value, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_inherit_compute (GtkCssValue *value, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { if (parent_style) { diff --git a/gtk/gtkcssinitialvalue.c b/gtk/gtkcssinitialvalue.c index 3b326db83e..c40f26d3bd 100644 --- a/gtk/gtkcssinitialvalue.c +++ b/gtk/gtkcssinitialvalue.c @@ -38,18 +38,18 @@ gtk_css_value_initial_free (GtkCssValue *value) } static GtkCssValue * -gtk_css_value_initial_compute (GtkCssValue *value, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_initial_compute (GtkCssValue *value, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkSettings *settings; switch (property_id) { case GTK_CSS_PROPERTY_DPI: - settings = _gtk_style_provider_private_get_settings (provider); + settings = gtk_style_provider_get_settings (provider); if (settings) { GdkScreen *screen = gdk_display_get_default_screen (_gtk_settings_get_display (settings)); @@ -61,7 +61,7 @@ gtk_css_value_initial_compute (GtkCssValue *value, break; case GTK_CSS_PROPERTY_FONT_FAMILY: - settings = _gtk_style_provider_private_get_settings (provider); + settings = gtk_style_provider_get_settings (provider); if (settings && gtk_settings_get_font_family (settings) != NULL) return _gtk_css_array_value_new (_gtk_css_string_value_new (gtk_settings_get_font_family (settings))); break; diff --git a/gtk/gtkcsskeyframes.c b/gtk/gtkcsskeyframes.c index ed14ac3451..b4b0c6c48c 100644 --- a/gtk/gtkcsskeyframes.c +++ b/gtk/gtkcsskeyframes.c @@ -435,16 +435,16 @@ _gtk_css_keyframes_print (GtkCssKeyframes *keyframes, } GtkCssKeyframes * -_gtk_css_keyframes_compute (GtkCssKeyframes *keyframes, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +_gtk_css_keyframes_compute (GtkCssKeyframes *keyframes, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssKeyframes *resolved; guint k, p; g_return_val_if_fail (keyframes != NULL, NULL); - g_return_val_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider), NULL); + g_return_val_if_fail (GTK_IS_STYLE_PROVIDER (provider), NULL); g_return_val_if_fail (GTK_IS_CSS_STYLE (style), NULL); g_return_val_if_fail (parent_style == NULL || GTK_IS_CSS_STYLE (parent_style), NULL); diff --git a/gtk/gtkcsskeyframesprivate.h b/gtk/gtkcsskeyframesprivate.h index b9dc13e627..3808e9661a 100644 --- a/gtk/gtkcsskeyframesprivate.h +++ b/gtk/gtkcsskeyframesprivate.h @@ -37,7 +37,7 @@ void _gtk_css_keyframes_print (GtkCssKeyframes GString *string); GtkCssKeyframes * _gtk_css_keyframes_compute (GtkCssKeyframes *keyframes, - GtkStyleProviderPrivate *provider, + GtkStyleProvider *provider, GtkCssStyle *style, GtkCssStyle *parent_style); diff --git a/gtk/gtkcsslookup.c b/gtk/gtkcsslookup.c index 17e3f85549..67560a190f 100644 --- a/gtk/gtkcsslookup.c +++ b/gtk/gtkcsslookup.c @@ -103,10 +103,10 @@ _gtk_css_lookup_set (GtkCssLookup *lookup, * an issue, go fix it. **/ void -_gtk_css_lookup_resolve (GtkCssLookup *lookup, - GtkStyleProviderPrivate *provider, - GtkCssStaticStyle *style, - GtkCssStyle *parent_style) +_gtk_css_lookup_resolve (GtkCssLookup *lookup, + GtkStyleProvider *provider, + GtkCssStaticStyle *style, + GtkCssStyle *parent_style) { guint i; diff --git a/gtk/gtkcsslookupprivate.h b/gtk/gtkcsslookupprivate.h index 558a53a943..8aaa913c32 100644 --- a/gtk/gtkcsslookupprivate.h +++ b/gtk/gtkcsslookupprivate.h @@ -49,7 +49,7 @@ void _gtk_css_lookup_set (GtkCssLookup GtkCssSection *section, GtkCssValue *value); void _gtk_css_lookup_resolve (GtkCssLookup *lookup, - GtkStyleProviderPrivate *provider, + GtkStyleProvider *provider, GtkCssStaticStyle *style, GtkCssStyle *parent_style); diff --git a/gtk/gtkcssnode.c b/gtk/gtkcssnode.c index 95a687ffac..7f1ff4ec96 100644 --- a/gtk/gtkcssnode.c +++ b/gtk/gtkcssnode.c @@ -115,7 +115,7 @@ struct _GtkCssNodeStyleChange { static guint cssnode_signals[LAST_SIGNAL] = { 0 }; static GParamSpec *cssnode_properties[NUM_PROPERTIES]; -static GtkStyleProviderPrivate * +static GtkStyleProvider * gtk_css_node_get_style_provider_or_null (GtkCssNode *cssnode) { return GTK_CSS_NODE_GET_CLASS (cssnode)->get_style_provider (cssnode); @@ -287,7 +287,7 @@ gtk_css_node_is_last_child (GtkCssNode *node) static gboolean may_use_global_parent_cache (GtkCssNode *node) { - GtkStyleProviderPrivate *provider; + GtkStyleProvider *provider; GtkCssNode *parent; parent = gtk_css_node_get_parent (node); @@ -500,7 +500,7 @@ gtk_css_node_real_get_widget_path (GtkCssNode *cssnode) return NULL; } -static GtkStyleProviderPrivate * +static GtkStyleProvider * gtk_css_node_real_get_style_provider (GtkCssNode *cssnode) { return NULL; @@ -1386,10 +1386,10 @@ gtk_css_node_get_widget_path (GtkCssNode *cssnode) return GTK_CSS_NODE_GET_CLASS (cssnode)->get_widget_path (cssnode); } -GtkStyleProviderPrivate * +GtkStyleProvider * gtk_css_node_get_style_provider (GtkCssNode *cssnode) { - GtkStyleProviderPrivate *result; + GtkStyleProvider *result; result = gtk_css_node_get_style_provider_or_null (cssnode); if (result) @@ -1398,7 +1398,7 @@ gtk_css_node_get_style_provider (GtkCssNode *cssnode) if (cssnode->parent) return gtk_css_node_get_style_provider (cssnode->parent); - return GTK_STYLE_PROVIDER_PRIVATE (_gtk_settings_get_style_cascade (gtk_settings_get_default (), 1)); + return GTK_STYLE_PROVIDER (_gtk_settings_get_style_cascade (gtk_settings_get_default (), 1)); } void diff --git a/gtk/gtkcssnodeprivate.h b/gtk/gtkcssnodeprivate.h index 797c51de8b..b326f06d9d 100644 --- a/gtk/gtkcssnodeprivate.h +++ b/gtk/gtkcssnodeprivate.h @@ -80,7 +80,7 @@ struct _GtkCssNodeClass GtkWidgetPath * (* create_widget_path) (GtkCssNode *cssnode); const GtkWidgetPath * (* get_widget_path) (GtkCssNode *cssnode); /* get style provider to use or NULL to use parent's */ - GtkStyleProviderPrivate *(* get_style_provider) (GtkCssNode *cssnode); + GtkStyleProvider * (* get_style_provider) (GtkCssNode *cssnode); /* get frame clock or NULL (only relevant for root node) */ GdkFrameClock * (* get_frame_clock) (GtkCssNode *cssnode); GtkCssStyle * (* update_style) (GtkCssNode *cssnode, @@ -159,7 +159,7 @@ gboolean gtk_css_node_init_matcher (GtkCssNode * GtkCssMatcher *matcher); GtkWidgetPath * gtk_css_node_create_widget_path (GtkCssNode *cssnode); const GtkWidgetPath * gtk_css_node_get_widget_path (GtkCssNode *cssnode); -GtkStyleProviderPrivate *gtk_css_node_get_style_provider(GtkCssNode *cssnode); +GtkStyleProvider * gtk_css_node_get_style_provider (GtkCssNode *cssnode); void gtk_css_node_print (GtkCssNode *cssnode, GtkStyleContextPrintFlags flags, diff --git a/gtk/gtkcsspalettevalue.c b/gtk/gtkcsspalettevalue.c index 7dbbfd2a34..457b0566e3 100644 --- a/gtk/gtkcsspalettevalue.c +++ b/gtk/gtkcsspalettevalue.c @@ -49,11 +49,11 @@ gtk_css_value_palette_free (GtkCssValue *value) } static GtkCssValue * -gtk_css_value_palette_compute (GtkCssValue *specified, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_palette_compute (GtkCssValue *specified, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GHashTableIter iter; gpointer name, value; diff --git a/gtk/gtkcsspathnode.c b/gtk/gtkcsspathnode.c index f5caea8e44..64cd49260b 100644 --- a/gtk/gtkcsspathnode.c +++ b/gtk/gtkcsspathnode.c @@ -100,7 +100,7 @@ gtk_css_path_node_update_style (GtkCssNode *cssnode, return GTK_CSS_NODE_CLASS (gtk_css_path_node_parent_class)->update_style (cssnode, change, 0, style); } -static GtkStyleProviderPrivate * +static GtkStyleProvider * gtk_css_path_node_get_style_provider (GtkCssNode *node) { GtkCssPathNode *path_node = GTK_CSS_PATH_NODE (node); diff --git a/gtk/gtkcsspositionvalue.c b/gtk/gtkcsspositionvalue.c index 62ecc68b57..f1655b1798 100644 --- a/gtk/gtkcsspositionvalue.c +++ b/gtk/gtkcsspositionvalue.c @@ -37,11 +37,11 @@ gtk_css_value_position_free (GtkCssValue *value) } static GtkCssValue * -gtk_css_value_position_compute (GtkCssValue *position, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_position_compute (GtkCssValue *position, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssValue *x, *y; diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index 06457b5423..bb8625bdd0 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -132,11 +132,10 @@ static gboolean gtk_keep_css_sections = FALSE; static guint css_provider_signals[LAST_SIGNAL] = { 0 }; static void gtk_css_provider_finalize (GObject *object); -static void gtk_css_style_provider_iface_init (GtkStyleProviderIface *iface); -static void gtk_css_style_provider_private_iface_init (GtkStyleProviderPrivateInterface *iface); -static void gtk_css_style_provider_emit_error (GtkStyleProviderPrivate *provider, - GtkCssSection *section, - const GError *error); +static void gtk_css_style_provider_iface_init (GtkStyleProviderInterface *iface); +static void gtk_css_style_provider_emit_error (GtkStyleProvider *provider, + GtkCssSection *section, + const GError *error); static void gtk_css_provider_load_internal (GtkCssProvider *css_provider, @@ -153,9 +152,7 @@ gtk_css_provider_error_quark (void) G_DEFINE_TYPE_EXTENDED (GtkCssProvider, gtk_css_provider, G_TYPE_OBJECT, 0, G_ADD_PRIVATE (GtkCssProvider) G_IMPLEMENT_INTERFACE (GTK_TYPE_STYLE_PROVIDER, - gtk_css_style_provider_iface_init) - G_IMPLEMENT_INTERFACE (GTK_TYPE_STYLE_PROVIDER_PRIVATE, - gtk_css_style_provider_private_iface_init)); + gtk_css_style_provider_iface_init)); static void gtk_css_provider_parsing_error (GtkCssProvider *provider, @@ -328,9 +325,9 @@ gtk_css_scanner_destroy (GtkCssScanner *scanner) } static void -gtk_css_style_provider_emit_error (GtkStyleProviderPrivate *provider, - GtkCssSection *section, - const GError *error) +gtk_css_style_provider_emit_error (GtkStyleProvider *provider, + GtkCssSection *section, + const GError *error) { g_signal_emit (provider, css_provider_signals[PARSING_ERROR], 0, section, error); } @@ -340,7 +337,7 @@ gtk_css_provider_emit_error (GtkCssProvider *provider, GtkCssScanner *scanner, const GError *error) { - gtk_css_style_provider_emit_error (GTK_STYLE_PROVIDER_PRIVATE (provider), + gtk_css_style_provider_emit_error (GTK_STYLE_PROVIDER (provider), scanner ? scanner->section : NULL, error); } @@ -538,14 +535,9 @@ verify_tree_get_change_results (GtkCssProvider *provider, } -static void -gtk_css_style_provider_iface_init (GtkStyleProviderIface *iface) -{ -} - static GtkCssValue * -gtk_css_style_provider_get_color (GtkStyleProviderPrivate *provider, - const char *name) +gtk_css_style_provider_get_color (GtkStyleProvider *provider, + const char *name) { GtkCssProvider *css_provider = GTK_CSS_PROVIDER (provider); @@ -553,8 +545,8 @@ gtk_css_style_provider_get_color (GtkStyleProviderPrivate *provider, } static GtkCssKeyframes * -gtk_css_style_provider_get_keyframes (GtkStyleProviderPrivate *provider, - const char *name) +gtk_css_style_provider_get_keyframes (GtkStyleProvider *provider, + const char *name) { GtkCssProvider *css_provider = GTK_CSS_PROVIDER (provider); @@ -562,10 +554,10 @@ gtk_css_style_provider_get_keyframes (GtkStyleProviderPrivate *provider, } static void -gtk_css_style_provider_lookup (GtkStyleProviderPrivate *provider, - const GtkCssMatcher *matcher, - GtkCssLookup *lookup, - GtkCssChange *change) +gtk_css_style_provider_lookup (GtkStyleProvider *provider, + const GtkCssMatcher *matcher, + GtkCssLookup *lookup, + GtkCssChange *change) { GtkCssProvider *css_provider; GtkCssProviderPrivate *priv; @@ -626,7 +618,7 @@ gtk_css_style_provider_lookup (GtkStyleProviderPrivate *provider, } static void -gtk_css_style_provider_private_iface_init (GtkStyleProviderPrivateInterface *iface) +gtk_css_style_provider_iface_init (GtkStyleProviderInterface *iface) { iface->get_color = gtk_css_style_provider_get_color; iface->get_keyframes = gtk_css_style_provider_get_keyframes; @@ -1495,7 +1487,7 @@ gtk_css_provider_load_from_data (GtkCssProvider *css_provider, g_free (free_data); - _gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (css_provider)); + gtk_style_provider_changed (GTK_STYLE_PROVIDER (css_provider)); } /** @@ -1517,7 +1509,7 @@ gtk_css_provider_load_from_file (GtkCssProvider *css_provider, gtk_css_provider_load_internal (css_provider, NULL, file, NULL); - _gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (css_provider)); + gtk_style_provider_changed (GTK_STYLE_PROVIDER (css_provider)); } /** diff --git a/gtk/gtkcssrepeatvalue.c b/gtk/gtkcssrepeatvalue.c index e3cfcd0920..bbd64cb055 100644 --- a/gtk/gtkcssrepeatvalue.c +++ b/gtk/gtkcssrepeatvalue.c @@ -34,11 +34,11 @@ gtk_css_value_repeat_free (GtkCssValue *value) } static GtkCssValue * -gtk_css_value_repeat_compute (GtkCssValue *value, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_repeat_compute (GtkCssValue *value, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { return _gtk_css_value_ref (value); } diff --git a/gtk/gtkcssrgbavalue.c b/gtk/gtkcssrgbavalue.c index 7005347e0e..92f3f416c7 100644 --- a/gtk/gtkcssrgbavalue.c +++ b/gtk/gtkcssrgbavalue.c @@ -34,11 +34,11 @@ gtk_css_value_rgba_free (GtkCssValue *value) } static GtkCssValue * -gtk_css_value_rgba_compute (GtkCssValue *value, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_rgba_compute (GtkCssValue *value, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { return _gtk_css_value_ref (value); } diff --git a/gtk/gtkcssshadowsvalue.c b/gtk/gtkcssshadowsvalue.c index fcb6097cea..3fbbc527b9 100644 --- a/gtk/gtkcssshadowsvalue.c +++ b/gtk/gtkcssshadowsvalue.c @@ -51,11 +51,11 @@ gtk_css_value_shadows_free (GtkCssValue *value) } static GtkCssValue * -gtk_css_value_shadows_compute (GtkCssValue *value, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_shadows_compute (GtkCssValue *value, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssValue *result, *tmp; guint i, j; diff --git a/gtk/gtkcssshadowvalue.c b/gtk/gtkcssshadowvalue.c index c5f1db47b8..f29d403d3a 100644 --- a/gtk/gtkcssshadowvalue.c +++ b/gtk/gtkcssshadowvalue.c @@ -65,11 +65,11 @@ gtk_css_value_shadow_free (GtkCssValue *shadow) } static GtkCssValue * -gtk_css_value_shadow_compute (GtkCssValue *shadow, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_shadow_compute (GtkCssValue *shadow, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssValue *hoffset, *voffset, *radius, *spread, *color; diff --git a/gtk/gtkcssstaticstyle.c b/gtk/gtkcssstaticstyle.c index f8ce97003d..57b6723d23 100644 --- a/gtk/gtkcssstaticstyle.c +++ b/gtk/gtkcssstaticstyle.c @@ -155,7 +155,7 @@ gtk_css_static_style_get_default (void) GtkSettings *settings; settings = gtk_settings_get_default (); - default_style = gtk_css_static_style_new_compute (GTK_STYLE_PROVIDER_PRIVATE (settings), + default_style = gtk_css_static_style_new_compute (GTK_STYLE_PROVIDER (settings), NULL, NULL); g_object_set_data_full (G_OBJECT (settings), "gtk-default-style", @@ -166,9 +166,9 @@ gtk_css_static_style_get_default (void) } GtkCssStyle * -gtk_css_static_style_new_compute (GtkStyleProviderPrivate *provider, - const GtkCssMatcher *matcher, - GtkCssStyle *parent) +gtk_css_static_style_new_compute (GtkStyleProvider *provider, + const GtkCssMatcher *matcher, + GtkCssStyle *parent) { GtkCssStaticStyle *result; GtkCssLookup *lookup; @@ -177,10 +177,10 @@ gtk_css_static_style_new_compute (GtkStyleProviderPrivate *provider, lookup = _gtk_css_lookup_new (NULL); if (matcher) - _gtk_style_provider_private_lookup (provider, - matcher, - lookup, - &change); + gtk_style_provider_lookup (provider, + matcher, + lookup, + &change); result = g_object_new (GTK_TYPE_CSS_STATIC_STYLE, NULL); @@ -197,12 +197,12 @@ gtk_css_static_style_new_compute (GtkStyleProviderPrivate *provider, } void -gtk_css_static_style_compute_value (GtkCssStaticStyle *style, - GtkStyleProviderPrivate *provider, - GtkCssStyle *parent_style, - guint id, - GtkCssValue *specified, - GtkCssSection *section) +gtk_css_static_style_compute_value (GtkCssStaticStyle *style, + GtkStyleProvider *provider, + GtkCssStyle *parent_style, + guint id, + GtkCssValue *specified, + GtkCssSection *section) { GtkCssValue *value; diff --git a/gtk/gtkcssstaticstyleprivate.h b/gtk/gtkcssstaticstyleprivate.h index c7757c3547..2a00dd0372 100644 --- a/gtk/gtkcssstaticstyleprivate.h +++ b/gtk/gtkcssstaticstyleprivate.h @@ -53,12 +53,12 @@ struct _GtkCssStaticStyleClass GType gtk_css_static_style_get_type (void) G_GNUC_CONST; GtkCssStyle * gtk_css_static_style_get_default (void); -GtkCssStyle * gtk_css_static_style_new_compute (GtkStyleProviderPrivate *provider, +GtkCssStyle * gtk_css_static_style_new_compute (GtkStyleProvider *provider, const GtkCssMatcher *matcher, GtkCssStyle *parent); void gtk_css_static_style_compute_value (GtkCssStaticStyle *style, - GtkStyleProviderPrivate*provider, + GtkStyleProvider *provider, GtkCssStyle *parent_style, guint id, GtkCssValue *specified, diff --git a/gtk/gtkcssstringvalue.c b/gtk/gtkcssstringvalue.c index c12eb7661b..b7feae0073 100644 --- a/gtk/gtkcssstringvalue.c +++ b/gtk/gtkcssstringvalue.c @@ -34,11 +34,11 @@ gtk_css_value_string_free (GtkCssValue *value) } static GtkCssValue * -gtk_css_value_string_compute (GtkCssValue *value, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_string_compute (GtkCssValue *value, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { return _gtk_css_value_ref (value); } diff --git a/gtk/gtkcsstransformvalue.c b/gtk/gtkcsstransformvalue.c index 9c70dbb25e..773c2eebd4 100644 --- a/gtk/gtkcsstransformvalue.c +++ b/gtk/gtkcsstransformvalue.c @@ -256,12 +256,12 @@ gtk_css_value_transform_free (GtkCssValue *value) /* returns TRUE if dest == src */ static gboolean -gtk_css_transform_compute (GtkCssTransform *dest, - GtkCssTransform *src, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_transform_compute (GtkCssTransform *dest, + GtkCssTransform *src, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { dest->type = src->type; @@ -311,11 +311,11 @@ gtk_css_transform_compute (GtkCssTransform *dest, } static GtkCssValue * -gtk_css_value_transform_compute (GtkCssValue *value, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_transform_compute (GtkCssValue *value, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssValue *result; gboolean changes; diff --git a/gtk/gtkcsstypesprivate.h b/gtk/gtkcsstypesprivate.h index a173f55d13..c569ec6b95 100644 --- a/gtk/gtkcsstypesprivate.h +++ b/gtk/gtkcsstypesprivate.h @@ -28,7 +28,6 @@ typedef union _GtkCssMatcher GtkCssMatcher; typedef struct _GtkCssNode GtkCssNode; typedef struct _GtkCssNodeDeclaration GtkCssNodeDeclaration; typedef struct _GtkCssStyle GtkCssStyle; -typedef struct _GtkStyleProviderPrivate GtkStyleProviderPrivate; /* dummy typedef */ #define GTK_CSS_CHANGE_CLASS (1ULL << 0) #define GTK_CSS_CHANGE_NAME (1ULL << 1) diff --git a/gtk/gtkcssunsetvalue.c b/gtk/gtkcssunsetvalue.c index 9fb6bf59a4..32550cd47b 100644 --- a/gtk/gtkcssunsetvalue.c +++ b/gtk/gtkcssunsetvalue.c @@ -35,11 +35,11 @@ gtk_css_value_unset_free (GtkCssValue *value) } static GtkCssValue * -gtk_css_value_unset_compute (GtkCssValue *value, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_unset_compute (GtkCssValue *value, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { GtkCssStyleProperty *property; GtkCssValue *unset_value; diff --git a/gtk/gtkcssvalue.c b/gtk/gtkcssvalue.c index b9755cf6c4..a6f1559b44 100644 --- a/gtk/gtkcssvalue.c +++ b/gtk/gtkcssvalue.c @@ -82,11 +82,11 @@ _gtk_css_value_unref (GtkCssValue *value) * Returns: the computed value **/ GtkCssValue * -_gtk_css_value_compute (GtkCssValue *value, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +_gtk_css_value_compute (GtkCssValue *value, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { gtk_internal_return_val_if_fail (value != NULL, NULL); diff --git a/gtk/gtkcssvalueprivate.h b/gtk/gtkcssvalueprivate.h index 77dc5c9e04..00dfadd9b7 100644 --- a/gtk/gtkcssvalueprivate.h +++ b/gtk/gtkcssvalueprivate.h @@ -42,7 +42,7 @@ struct _GtkCssValueClass { GtkCssValue * (* compute) (GtkCssValue *value, guint property_id, - GtkStyleProviderPrivate *provider, + GtkStyleProvider *provider, GtkCssStyle *style, GtkCssStyle *parent_style); gboolean (* equal) (const GtkCssValue *value1, @@ -66,7 +66,7 @@ void _gtk_css_value_unref (GtkCssValue GtkCssValue *_gtk_css_value_compute (GtkCssValue *value, guint property_id, - GtkStyleProviderPrivate *provider, + GtkStyleProvider *provider, GtkCssStyle *style, GtkCssStyle *parent_style); gboolean _gtk_css_value_equal (const GtkCssValue *value1, diff --git a/gtk/gtkcsswidgetnode.c b/gtk/gtkcsswidgetnode.c index b7d3297a17..050c391a99 100644 --- a/gtk/gtkcsswidgetnode.c +++ b/gtk/gtkcsswidgetnode.c @@ -162,7 +162,7 @@ gtk_css_widget_node_get_widget_path (GtkCssNode *node) return gtk_widget_get_path (widget_node->widget); } -static GtkStyleProviderPrivate * +static GtkStyleProvider * gtk_css_widget_node_get_style_provider (GtkCssNode *node) { GtkCssWidgetNode *widget_node = GTK_CSS_WIDGET_NODE (node); @@ -178,7 +178,7 @@ gtk_css_widget_node_get_style_provider (GtkCssNode *node) cascade = _gtk_settings_get_style_cascade (gtk_widget_get_settings (widget_node->widget), gtk_widget_get_scale_factor (widget_node->widget)); - return GTK_STYLE_PROVIDER_PRIVATE (cascade); + return GTK_STYLE_PROVIDER (cascade); } static GdkFrameClock * diff --git a/gtk/gtkcsswin32sizevalue.c b/gtk/gtkcsswin32sizevalue.c index fd7970a9ca..8307a8a88e 100644 --- a/gtk/gtkcsswin32sizevalue.c +++ b/gtk/gtkcsswin32sizevalue.c @@ -118,11 +118,11 @@ gtk_css_value_win32_compute_size (const GtkCssValue *value) } static GtkCssValue * -gtk_css_value_win32_size_compute (GtkCssValue *value, - guint property_id, - GtkStyleProviderPrivate *provider, - GtkCssStyle *style, - GtkCssStyle *parent_style) +gtk_css_value_win32_size_compute (GtkCssValue *value, + guint property_id, + GtkStyleProvider *provider, + GtkCssStyle *style, + GtkCssStyle *parent_style) { return _gtk_css_number_value_new (value->scale * gtk_css_value_win32_compute_size (value), GTK_CSS_PX); } diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 61bf3a2cf1..319c783767 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -194,8 +194,7 @@ enum { }; /* --- prototypes --- */ -static void gtk_settings_provider_iface_init (GtkStyleProviderIface *iface); -static void gtk_settings_provider_private_init (GtkStyleProviderPrivateInterface *iface); +static void gtk_settings_provider_iface_init (GtkStyleProviderInterface *iface); static void gtk_settings_finalize (GObject *object); static void gtk_settings_get_property (GObject *object, @@ -245,9 +244,7 @@ static GPtrArray *display_settings; G_DEFINE_TYPE_EXTENDED (GtkSettings, gtk_settings, G_TYPE_OBJECT, 0, G_ADD_PRIVATE (GtkSettings) G_IMPLEMENT_INTERFACE (GTK_TYPE_STYLE_PROVIDER, - gtk_settings_provider_iface_init) - G_IMPLEMENT_INTERFACE (GTK_TYPE_STYLE_PROVIDER_PRIVATE, - gtk_settings_provider_private_init)); + gtk_settings_provider_iface_init)); /* --- functions --- */ static void @@ -1072,19 +1069,14 @@ gtk_settings_class_init (GtkSettingsClass *class) g_assert (result == PROP_KEYNAV_USE_CARET); } -static void -gtk_settings_provider_iface_init (GtkStyleProviderIface *iface) -{ -} - static GtkSettings * -gtk_settings_style_provider_get_settings (GtkStyleProviderPrivate *provider) +gtk_settings_style_provider_get_settings (GtkStyleProvider *provider) { return GTK_SETTINGS (provider); } static void -gtk_settings_provider_private_init (GtkStyleProviderPrivateInterface *iface) +gtk_settings_provider_iface_init (GtkStyleProviderInterface *iface) { iface->get_settings = gtk_settings_style_provider_get_settings; } @@ -1331,7 +1323,7 @@ gtk_settings_set_property (GObject *object, static void settings_invalidate_style (GtkSettings *settings) { - _gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (settings)); + gtk_style_provider_changed (GTK_STYLE_PROVIDER (settings)); } static void diff --git a/gtk/gtkstylecascade.c b/gtk/gtkstylecascade.c index 985099c6ea..4c94696742 100644 --- a/gtk/gtkstylecascade.c +++ b/gtk/gtkstylecascade.c @@ -96,13 +96,8 @@ gtk_style_cascade_iter_clear (GtkStyleCascadeIter *iter) g_free (iter->cascade_index); } -static void -gtk_style_cascade_provider_iface_init (GtkStyleProviderIface *iface) -{ -} - static GtkSettings * -gtk_style_cascade_get_settings (GtkStyleProviderPrivate *provider) +gtk_style_cascade_get_settings (GtkStyleProvider *provider) { GtkStyleCascade *cascade = GTK_STYLE_CASCADE (provider); GtkStyleCascadeIter iter; @@ -113,10 +108,10 @@ gtk_style_cascade_get_settings (GtkStyleProviderPrivate *provider) item; item = gtk_style_cascade_iter_next (cascade, &iter)) { - if (!GTK_IS_STYLE_PROVIDER_PRIVATE (item)) + if (!GTK_IS_STYLE_PROVIDER (item)) continue; - settings = _gtk_style_provider_private_get_settings (GTK_STYLE_PROVIDER_PRIVATE (item)); + settings = gtk_style_provider_get_settings (GTK_STYLE_PROVIDER (item)); if (settings) { gtk_style_cascade_iter_clear (&iter); @@ -129,7 +124,7 @@ gtk_style_cascade_get_settings (GtkStyleProviderPrivate *provider) } static GtkCssValue * -gtk_style_cascade_get_color (GtkStyleProviderPrivate *provider, +gtk_style_cascade_get_color (GtkStyleProvider *provider, const char *name) { GtkStyleCascade *cascade = GTK_STYLE_CASCADE (provider); @@ -141,9 +136,9 @@ gtk_style_cascade_get_color (GtkStyleProviderPrivate *provider, item; item = gtk_style_cascade_iter_next (cascade, &iter)) { - if (GTK_IS_STYLE_PROVIDER_PRIVATE (item)) + if (GTK_IS_STYLE_PROVIDER (item)) { - color = _gtk_style_provider_private_get_color (GTK_STYLE_PROVIDER_PRIVATE (item), name); + color = gtk_style_provider_get_color (GTK_STYLE_PROVIDER (item), name); if (color) { gtk_style_cascade_iter_clear (&iter); @@ -161,7 +156,7 @@ gtk_style_cascade_get_color (GtkStyleProviderPrivate *provider, } static int -gtk_style_cascade_get_scale (GtkStyleProviderPrivate *provider) +gtk_style_cascade_get_scale (GtkStyleProvider *provider) { GtkStyleCascade *cascade = GTK_STYLE_CASCADE (provider); @@ -169,8 +164,8 @@ gtk_style_cascade_get_scale (GtkStyleProviderPrivate *provider) } static GtkCssKeyframes * -gtk_style_cascade_get_keyframes (GtkStyleProviderPrivate *provider, - const char *name) +gtk_style_cascade_get_keyframes (GtkStyleProvider *provider, + const char *name) { GtkStyleCascade *cascade = GTK_STYLE_CASCADE (provider); GtkStyleCascadeIter iter; @@ -181,10 +176,10 @@ gtk_style_cascade_get_keyframes (GtkStyleProviderPrivate *provider, item; item = gtk_style_cascade_iter_next (cascade, &iter)) { - if (!GTK_IS_STYLE_PROVIDER_PRIVATE (item)) + if (!GTK_IS_STYLE_PROVIDER (item)) continue; - keyframes = _gtk_style_provider_private_get_keyframes (GTK_STYLE_PROVIDER_PRIVATE (item), name); + keyframes = gtk_style_provider_get_keyframes (GTK_STYLE_PROVIDER (item), name); if (keyframes) { gtk_style_cascade_iter_clear (&iter); @@ -197,10 +192,10 @@ gtk_style_cascade_get_keyframes (GtkStyleProviderPrivate *provider, } static void -gtk_style_cascade_lookup (GtkStyleProviderPrivate *provider, - const GtkCssMatcher *matcher, - GtkCssLookup *lookup, - GtkCssChange *change) +gtk_style_cascade_lookup (GtkStyleProvider *provider, + const GtkCssMatcher *matcher, + GtkCssLookup *lookup, + GtkCssChange *change) { GtkStyleCascade *cascade = GTK_STYLE_CASCADE (provider); GtkStyleCascadeIter iter; @@ -211,10 +206,10 @@ gtk_style_cascade_lookup (GtkStyleProviderPrivate *provider, item; item = gtk_style_cascade_iter_next (cascade, &iter)) { - GtkStyleProviderPrivate *sp = (GtkStyleProviderPrivate*)item; - if (GTK_IS_STYLE_PROVIDER_PRIVATE (sp)) + GtkStyleProvider *sp = (GtkStyleProvider *) item; + if (GTK_IS_STYLE_PROVIDER (sp)) { - _gtk_style_provider_private_lookup (sp, matcher, lookup, + gtk_style_provider_lookup (sp, matcher, lookup, change ? &iter_change : NULL); if (change) *change |= iter_change; @@ -229,7 +224,7 @@ gtk_style_cascade_lookup (GtkStyleProviderPrivate *provider, } static void -gtk_style_cascade_provider_private_iface_init (GtkStyleProviderPrivateInterface *iface) +gtk_style_cascade_provider_iface_init (GtkStyleProviderInterface *iface) { iface->get_color = gtk_style_cascade_get_color; iface->get_settings = gtk_style_cascade_get_settings; @@ -240,9 +235,7 @@ gtk_style_cascade_provider_private_iface_init (GtkStyleProviderPrivateInterface G_DEFINE_TYPE_EXTENDED (GtkStyleCascade, _gtk_style_cascade, G_TYPE_OBJECT, 0, G_IMPLEMENT_INTERFACE (GTK_TYPE_STYLE_PROVIDER, - gtk_style_cascade_provider_iface_init) - G_IMPLEMENT_INTERFACE (GTK_TYPE_STYLE_PROVIDER_PRIVATE, - gtk_style_cascade_provider_private_iface_init)); + gtk_style_cascade_provider_iface_init)); static void gtk_style_cascade_dispose (GObject *object) @@ -302,14 +295,14 @@ _gtk_style_cascade_set_parent (GtkStyleCascade *cascade, g_object_ref (parent); g_signal_connect_swapped (parent, "-gtk-private-changed", - G_CALLBACK (_gtk_style_provider_private_changed), + G_CALLBACK (gtk_style_provider_changed), cascade); } if (cascade->parent) { g_signal_handlers_disconnect_by_func (cascade->parent, - _gtk_style_provider_private_changed, + gtk_style_provider_changed, cascade); g_object_unref (cascade->parent); } @@ -333,7 +326,7 @@ _gtk_style_cascade_add_provider (GtkStyleCascade *cascade, data.priority = priority; data.changed_signal_id = g_signal_connect_swapped (provider, "-gtk-private-changed", - G_CALLBACK (_gtk_style_provider_private_changed), + G_CALLBACK (gtk_style_provider_changed), cascade); /* ensure it gets removed first */ @@ -346,7 +339,7 @@ _gtk_style_cascade_add_provider (GtkStyleCascade *cascade, } g_array_insert_val (cascade->providers, i, data); - _gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (cascade)); + gtk_style_provider_changed (GTK_STYLE_PROVIDER (cascade)); } void @@ -366,7 +359,7 @@ _gtk_style_cascade_remove_provider (GtkStyleCascade *cascade, { g_array_remove_index (cascade->providers, i); - _gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (cascade)); + gtk_style_provider_changed (GTK_STYLE_PROVIDER (cascade)); break; } } @@ -383,7 +376,7 @@ _gtk_style_cascade_set_scale (GtkStyleCascade *cascade, cascade->scale = scale; - _gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (cascade)); + gtk_style_provider_changed (GTK_STYLE_PROVIDER (cascade)); } int diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c index 24d35e0561..fbe2e6af5c 100644 --- a/gtk/gtkstylecontext.c +++ b/gtk/gtkstylecontext.c @@ -409,12 +409,12 @@ gtk_style_context_get_root (GtkStyleContext *context) return priv->cssnode; } -GtkStyleProviderPrivate * +GtkStyleProvider * gtk_style_context_get_style_provider (GtkStyleContext *context) { GtkStyleContextPrivate *priv = gtk_style_context_get_instance_private (context); - return GTK_STYLE_PROVIDER_PRIVATE (priv->cascade); + return GTK_STYLE_PROVIDER (priv->cascade); } static gboolean @@ -1451,7 +1451,7 @@ _gtk_style_context_resolve_color (GtkStyleContext *context, g_return_val_if_fail (result != NULL, FALSE); val = _gtk_css_color_value_resolve (color, - GTK_STYLE_PROVIDER_PRIVATE (priv->cascade), + GTK_STYLE_PROVIDER (priv->cascade), _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR), NULL); if (val == NULL) @@ -1484,7 +1484,7 @@ gtk_style_context_lookup_color (GtkStyleContext *context, g_return_val_if_fail (color_name != NULL, FALSE); g_return_val_if_fail (color != NULL, FALSE); - value = _gtk_style_provider_private_get_color (GTK_STYLE_PROVIDER_PRIVATE (priv->cascade), color_name); + value = gtk_style_provider_get_color (GTK_STYLE_PROVIDER (priv->cascade), color_name); if (value == NULL) return FALSE; diff --git a/gtk/gtkstylecontextprivate.h b/gtk/gtkstylecontextprivate.h index 1bb4334500..3973215abb 100644 --- a/gtk/gtkstylecontextprivate.h +++ b/gtk/gtkstylecontextprivate.h @@ -34,7 +34,7 @@ GtkCssNode *gtk_style_context_get_node (GtkStyleContext *c void gtk_style_context_set_id (GtkStyleContext *context, const char *id); const char * gtk_style_context_get_id (GtkStyleContext *context); -GtkStyleProviderPrivate * +GtkStyleProvider * gtk_style_context_get_style_provider (GtkStyleContext *context); void gtk_style_context_save_named (GtkStyleContext *context, diff --git a/gtk/gtkstyleprovider.c b/gtk/gtkstyleprovider.c index 9eb735d4de..032e9bd07a 100644 --- a/gtk/gtkstyleprovider.c +++ b/gtk/gtkstyleprovider.c @@ -17,7 +17,7 @@ #include "config.h" -#include "gtkstyleprovider.h" +#include "gtkstyleproviderprivate.h" #include "gtkintl.h" #include "gtkprivate.h" @@ -33,23 +33,135 @@ * See gtk_style_context_add_provider() and gtk_style_context_add_provider_for_display(). */ -static void gtk_style_provider_iface_init (gpointer g_iface); +enum { + CHANGED, + LAST_SIGNAL +}; -GType -gtk_style_provider_get_type (void) +G_DEFINE_INTERFACE (GtkStyleProvider, gtk_style_provider, GTK_TYPE_STYLE_PROVIDER) + +static guint signals[LAST_SIGNAL]; + +static void +gtk_style_provider_default_init (GtkStyleProviderInterface *iface) { - static GType style_provider_type = 0; + signals[CHANGED] = g_signal_new (I_("-gtk-private-changed"), + G_TYPE_FROM_INTERFACE (iface), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkStyleProviderInterface, changed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); - if (!style_provider_type) - style_provider_type = g_type_register_static_simple (G_TYPE_INTERFACE, - I_("GtkStyleProvider"), - sizeof (GtkStyleProviderIface), - (GClassInitFunc) gtk_style_provider_iface_init, - 0, NULL, 0); - return style_provider_type; } -static void -gtk_style_provider_iface_init (gpointer g_iface) +GtkCssValue * +gtk_style_provider_get_color (GtkStyleProvider *provider, + const char *name) +{ + GtkStyleProviderInterface *iface; + + /* for compat with gtk_symbolic_color_resolve() */ + if (provider == NULL) + return NULL; + + gtk_internal_return_val_if_fail (GTK_IS_STYLE_PROVIDER (provider), NULL); + + iface = GTK_STYLE_PROVIDER_GET_INTERFACE (provider); + + if (!iface->get_color) + return NULL; + + return iface->get_color (provider, name); +} + +GtkCssKeyframes * +gtk_style_provider_get_keyframes (GtkStyleProvider *provider, + const char *name) { + GtkStyleProviderInterface *iface; + + gtk_internal_return_val_if_fail (GTK_IS_STYLE_PROVIDER (provider), NULL); + gtk_internal_return_val_if_fail (name != NULL, NULL); + + iface = GTK_STYLE_PROVIDER_GET_INTERFACE (provider); + + if (!iface->get_keyframes) + return NULL; + + return iface->get_keyframes (provider, name); +} + +void +gtk_style_provider_lookup (GtkStyleProvider *provider, + const GtkCssMatcher *matcher, + GtkCssLookup *lookup, + GtkCssChange *out_change) +{ + GtkStyleProviderInterface *iface; + + gtk_internal_return_if_fail (GTK_IS_STYLE_PROVIDER (provider)); + gtk_internal_return_if_fail (matcher != NULL); + gtk_internal_return_if_fail (lookup != NULL); + + if (out_change) + *out_change = 0; + + iface = GTK_STYLE_PROVIDER_GET_INTERFACE (provider); + + if (!iface->lookup) + return; + + iface->lookup (provider, matcher, lookup, out_change); +} + +void +gtk_style_provider_changed (GtkStyleProvider *provider) +{ + gtk_internal_return_if_fail (GTK_IS_STYLE_PROVIDER (provider)); + + g_signal_emit (provider, signals[CHANGED], 0); +} + +GtkSettings * +gtk_style_provider_get_settings (GtkStyleProvider *provider) +{ + GtkStyleProviderInterface *iface; + + gtk_internal_return_val_if_fail (GTK_IS_STYLE_PROVIDER (provider), NULL); + + iface = GTK_STYLE_PROVIDER_GET_INTERFACE (provider); + + if (!iface->get_settings) + return NULL; + + return iface->get_settings (provider); +} + +int +gtk_style_provider_get_scale (GtkStyleProvider *provider) +{ + GtkStyleProviderInterface *iface; + + gtk_internal_return_val_if_fail (GTK_IS_STYLE_PROVIDER (provider), 1); + + iface = GTK_STYLE_PROVIDER_GET_INTERFACE (provider); + + if (!iface->get_scale) + return 1; + + return iface->get_scale (provider); +} + +void +gtk_style_provider_emit_error (GtkStyleProvider *provider, + GtkCssSection *section, + GError *error) +{ + GtkStyleProviderInterface *iface; + + iface = GTK_STYLE_PROVIDER_GET_INTERFACE (provider); + + if (iface->emit_error) + iface->emit_error (provider, section, error); } diff --git a/gtk/gtkstyleprovider.h b/gtk/gtkstyleprovider.h index 38bcd3b570..5e36d0c1f0 100644 --- a/gtk/gtkstyleprovider.h +++ b/gtk/gtkstyleprovider.h @@ -31,7 +31,6 @@ G_BEGIN_DECLS #define GTK_TYPE_STYLE_PROVIDER (gtk_style_provider_get_type ()) #define GTK_STYLE_PROVIDER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider)) #define GTK_IS_STYLE_PROVIDER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_STYLE_PROVIDER)) -#define GTK_STYLE_PROVIDER_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GTK_TYPE_STYLE_PROVIDER, GtkStyleProviderIface)) /** * GTK_STYLE_PROVIDER_PRIORITY_FALLBACK: @@ -84,18 +83,8 @@ G_BEGIN_DECLS */ #define GTK_STYLE_PROVIDER_PRIORITY_USER 800 -typedef struct _GtkStyleProviderIface GtkStyleProviderIface; typedef struct _GtkStyleProvider GtkStyleProvider; /* dummy typedef */ -/** - * GtkStyleProviderIface: - */ -struct _GtkStyleProviderIface -{ - /*< private >*/ - GTypeInterface g_iface; -}; - GDK_AVAILABLE_IN_ALL GType gtk_style_provider_get_type (void) G_GNUC_CONST; diff --git a/gtk/gtkstyleproviderprivate.c b/gtk/gtkstyleproviderprivate.c deleted file mode 100644 index 8779f1e57d..0000000000 --- a/gtk/gtkstyleproviderprivate.c +++ /dev/null @@ -1,157 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 2011 Benjamin Otte <otte@gnome.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "config.h" - -#include "gtkstyleproviderprivate.h" - -#include "gtkintl.h" -#include "gtkstyleprovider.h" -#include "gtkprivate.h" - -enum { - CHANGED, - LAST_SIGNAL -}; - -G_DEFINE_INTERFACE (GtkStyleProviderPrivate, _gtk_style_provider_private, GTK_TYPE_STYLE_PROVIDER) - -static guint signals[LAST_SIGNAL]; - -static void -_gtk_style_provider_private_default_init (GtkStyleProviderPrivateInterface *iface) -{ - signals[CHANGED] = g_signal_new (I_("-gtk-private-changed"), - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkStyleProviderPrivateInterface, changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - -} - -GtkCssValue * -_gtk_style_provider_private_get_color (GtkStyleProviderPrivate *provider, - const char *name) -{ - GtkStyleProviderPrivateInterface *iface; - - /* for compat with gtk_symbolic_color_resolve() */ - if (provider == NULL) - return NULL; - - gtk_internal_return_val_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider), NULL); - - iface = GTK_STYLE_PROVIDER_PRIVATE_GET_INTERFACE (provider); - - if (!iface->get_color) - return NULL; - - return iface->get_color (provider, name); -} - -GtkCssKeyframes * -_gtk_style_provider_private_get_keyframes (GtkStyleProviderPrivate *provider, - const char *name) -{ - GtkStyleProviderPrivateInterface *iface; - - gtk_internal_return_val_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider), NULL); - gtk_internal_return_val_if_fail (name != NULL, NULL); - - iface = GTK_STYLE_PROVIDER_PRIVATE_GET_INTERFACE (provider); - - if (!iface->get_keyframes) - return NULL; - - return iface->get_keyframes (provider, name); -} - -void -_gtk_style_provider_private_lookup (GtkStyleProviderPrivate *provider, - const GtkCssMatcher *matcher, - GtkCssLookup *lookup, - GtkCssChange *out_change) -{ - GtkStyleProviderPrivateInterface *iface; - - gtk_internal_return_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider)); - gtk_internal_return_if_fail (matcher != NULL); - gtk_internal_return_if_fail (lookup != NULL); - - if (out_change) - *out_change = 0; - - iface = GTK_STYLE_PROVIDER_PRIVATE_GET_INTERFACE (provider); - - if (!iface->lookup) - return; - - iface->lookup (provider, matcher, lookup, out_change); -} - -void -_gtk_style_provider_private_changed (GtkStyleProviderPrivate *provider) -{ - gtk_internal_return_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider)); - - g_signal_emit (provider, signals[CHANGED], 0); -} - -GtkSettings * -_gtk_style_provider_private_get_settings (GtkStyleProviderPrivate *provider) -{ - GtkStyleProviderPrivateInterface *iface; - - gtk_internal_return_val_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider), NULL); - - iface = GTK_STYLE_PROVIDER_PRIVATE_GET_INTERFACE (provider); - - if (!iface->get_settings) - return NULL; - - return iface->get_settings (provider); -} - -int -_gtk_style_provider_private_get_scale (GtkStyleProviderPrivate *provider) -{ - GtkStyleProviderPrivateInterface *iface; - - gtk_internal_return_val_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider), 1); - - iface = GTK_STYLE_PROVIDER_PRIVATE_GET_INTERFACE (provider); - - if (!iface->get_scale) - return 1; - - return iface->get_scale (provider); -} - -void -_gtk_style_provider_private_emit_error (GtkStyleProviderPrivate *provider, - GtkCssSection *section, - GError *error) -{ - GtkStyleProviderPrivateInterface *iface; - - iface = GTK_STYLE_PROVIDER_PRIVATE_GET_INTERFACE (provider); - - if (iface->emit_error) - iface->emit_error (provider, section, error); -} diff --git a/gtk/gtkstyleproviderprivate.h b/gtk/gtkstyleproviderprivate.h index 086119c7e8..c33438dd99 100644 --- a/gtk/gtkstyleproviderprivate.h +++ b/gtk/gtkstyleproviderprivate.h @@ -27,51 +27,45 @@ G_BEGIN_DECLS -#define GTK_TYPE_STYLE_PROVIDER_PRIVATE (_gtk_style_provider_private_get_type ()) -#define GTK_STYLE_PROVIDER_PRIVATE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_STYLE_PROVIDER_PRIVATE, GtkStyleProviderPrivate)) -#define GTK_IS_STYLE_PROVIDER_PRIVATE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_STYLE_PROVIDER_PRIVATE)) -#define GTK_STYLE_PROVIDER_PRIVATE_GET_INTERFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GTK_TYPE_STYLE_PROVIDER_PRIVATE, GtkStyleProviderPrivateInterface)) +#define GTK_STYLE_PROVIDER_GET_INTERFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GTK_TYPE_STYLE_PROVIDER, GtkStyleProviderInterface)) -typedef struct _GtkStyleProviderPrivateInterface GtkStyleProviderPrivateInterface; -/* typedef struct _GtkStyleProviderPrivate GtkStyleProviderPrivate; */ /* dummy typedef */ +typedef struct _GtkStyleProviderInterface GtkStyleProviderInterface; -struct _GtkStyleProviderPrivateInterface +struct _GtkStyleProviderInterface { GTypeInterface g_iface; - GtkCssValue * (* get_color) (GtkStyleProviderPrivate *provider, + GtkCssValue * (* get_color) (GtkStyleProvider *provider, const char *name); - GtkSettings * (* get_settings) (GtkStyleProviderPrivate *provider); - GtkCssKeyframes * (* get_keyframes) (GtkStyleProviderPrivate *provider, + GtkSettings * (* get_settings) (GtkStyleProvider *provider); + GtkCssKeyframes * (* get_keyframes) (GtkStyleProvider *provider, const char *name); - int (* get_scale) (GtkStyleProviderPrivate *provider); - void (* lookup) (GtkStyleProviderPrivate *provider, + int (* get_scale) (GtkStyleProvider *provider); + void (* lookup) (GtkStyleProvider *provider, const GtkCssMatcher *matcher, GtkCssLookup *lookup, GtkCssChange *out_change); - void (* emit_error) (GtkStyleProviderPrivate *provider, + void (* emit_error) (GtkStyleProvider *provider, GtkCssSection *section, const GError *error); /* signal */ - void (* changed) (GtkStyleProviderPrivate *provider); + void (* changed) (GtkStyleProvider *provider); }; -GType _gtk_style_provider_private_get_type (void) G_GNUC_CONST; - -GtkSettings * _gtk_style_provider_private_get_settings (GtkStyleProviderPrivate *provider); -GtkCssValue * _gtk_style_provider_private_get_color (GtkStyleProviderPrivate *provider, +GtkSettings * gtk_style_provider_get_settings (GtkStyleProvider *provider); +GtkCssValue * gtk_style_provider_get_color (GtkStyleProvider *provider, const char *name); -GtkCssKeyframes * _gtk_style_provider_private_get_keyframes(GtkStyleProviderPrivate *provider, +GtkCssKeyframes * gtk_style_provider_get_keyframes (GtkStyleProvider *provider, const char *name); -int _gtk_style_provider_private_get_scale (GtkStyleProviderPrivate *provider); -void _gtk_style_provider_private_lookup (GtkStyleProviderPrivate *provider, +int gtk_style_provider_get_scale (GtkStyleProvider *provider); +void gtk_style_provider_lookup (GtkStyleProvider *provider, const GtkCssMatcher *matcher, GtkCssLookup *lookup, GtkCssChange *out_change); -void _gtk_style_provider_private_changed (GtkStyleProviderPrivate *provider); +void gtk_style_provider_changed (GtkStyleProvider *provider); -void _gtk_style_provider_private_emit_error (GtkStyleProviderPrivate *provider, +void gtk_style_provider_emit_error (GtkStyleProvider *provider, GtkCssSection *section, GError *error); diff --git a/gtk/meson.build b/gtk/meson.build index da95435a84..166e81e1a1 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -307,7 +307,6 @@ gtk_public_sources = files([ 'gtkstylecontext.c', 'gtkstyleproperty.c', 'gtkstyleprovider.c', - 'gtkstyleproviderprivate.c', 'gtkswitch.c', 'gtktestutils.c', 'gtktextattributes.c', |