diff options
| author | Benjamin Otte <otte@redhat.com> | 2014-10-22 23:41:50 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2015-01-07 14:26:46 +0100 |
| commit | 572f46067f44da99e9ee0ea3210e1c0fac148928 (patch) | |
| tree | b6ce55172ca2708e60b3ef98ad357ff2c6ac42a0 /gtk/gtkcssenumvalue.c | |
| parent | f51419adb0034ad784d013db4e57bbdbc7b80153 (diff) | |
| download | gtk+-572f46067f44da99e9ee0ea3210e1c0fac148928.tar.gz | |
cssstyle: Rename GtkCssComputedValues => GtkCssStyle
This is literally just renaming of the object (and the associated source
files). No other changes are in there.
Diffstat (limited to 'gtk/gtkcssenumvalue.c')
| -rw-r--r-- | gtk/gtkcssenumvalue.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk/gtkcssenumvalue.c b/gtk/gtkcssenumvalue.c index d898c030e2..15140520ef 100644 --- a/gtk/gtkcssenumvalue.c +++ b/gtk/gtkcssenumvalue.c @@ -19,7 +19,7 @@ #include "gtkcssenumvalueprivate.h" -#include "gtkcsscomputedvaluesprivate.h" +#include "gtkcssstyleprivate.h" #include "gtkcssnumbervalueprivate.h" #include "gtkstyleproviderprivate.h" @@ -42,8 +42,8 @@ gtk_css_value_enum_compute (GtkCssValue *value, guint property_id, GtkStyleProviderPrivate *provider, int scale, - GtkCssComputedValues *values, - GtkCssComputedValues *parent_values, + GtkCssStyle *values, + GtkCssStyle *parent_values, GtkCssDependencies *dependencies) { return _gtk_css_value_ref (value); @@ -166,8 +166,8 @@ gtk_css_value_font_size_compute (GtkCssValue *value, guint property_id, GtkStyleProviderPrivate *provider, int scale, - GtkCssComputedValues *values, - GtkCssComputedValues *parent_values, + GtkCssStyle *values, + GtkCssStyle *parent_values, GtkCssDependencies *dependencies) { double font_size; @@ -201,7 +201,7 @@ gtk_css_value_font_size_compute (GtkCssValue *value, case GTK_CSS_FONT_SIZE_SMALLER: *dependencies = GTK_CSS_DEPENDS_ON_PARENT; if (parent_values) - font_size = _gtk_css_number_value_get (_gtk_css_computed_values_get_value (parent_values, GTK_CSS_PROPERTY_FONT_SIZE), 100); + font_size = _gtk_css_number_value_get (gtk_css_style_get_value (parent_values, GTK_CSS_PROPERTY_FONT_SIZE), 100); else font_size = _gtk_css_font_size_get_default (provider); /* XXX: This is what WebKit does... */ @@ -210,7 +210,7 @@ gtk_css_value_font_size_compute (GtkCssValue *value, case GTK_CSS_FONT_SIZE_LARGER: *dependencies = GTK_CSS_DEPENDS_ON_PARENT; if (parent_values) - font_size = _gtk_css_number_value_get (_gtk_css_computed_values_get_value (parent_values, GTK_CSS_PROPERTY_FONT_SIZE), 100); + font_size = _gtk_css_number_value_get (gtk_css_style_get_value (parent_values, GTK_CSS_PROPERTY_FONT_SIZE), 100); else font_size = _gtk_css_font_size_get_default (provider); /* XXX: This is what WebKit does... */ |