diff options
| author | Benjamin Otte <otte@redhat.com> | 2014-10-23 04:10:03 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2015-01-07 14:26:46 +0100 |
| commit | 4168e0385efd9231731ed35b96ce58bafc3eb03f (patch) | |
| tree | 1b43a6658abd650fce4f1eb1a4a17dd16d0098d6 /gtk/gtkcsslookup.c | |
| parent | 572f46067f44da99e9ee0ea3210e1c0fac148928 (diff) | |
| download | gtk+-4168e0385efd9231731ed35b96ce58bafc3eb03f.tar.gz | |
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle
GtkCssStyle is the base class to be used for all types of styles that do
exist.
GtkCssAnimatedStyle is the only implementation so far, that is exactly a
copy/paste of the old GtkCssStyle code.
Diffstat (limited to 'gtk/gtkcsslookup.c')
| -rw-r--r-- | gtk/gtkcsslookup.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gtk/gtkcsslookup.c b/gtk/gtkcsslookup.c index ed586016ee..0e2a952a8b 100644 --- a/gtk/gtkcsslookup.c +++ b/gtk/gtkcsslookup.c @@ -106,15 +106,15 @@ void _gtk_css_lookup_resolve (GtkCssLookup *lookup, GtkStyleProviderPrivate *provider, int scale, - GtkCssStyle *values, - GtkCssStyle *parent_values) + GtkCssAnimatedStyle *style, + GtkCssStyle *parent_style) { guint i, n; g_return_if_fail (lookup != NULL); g_return_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider)); - g_return_if_fail (GTK_IS_CSS_STYLE (values)); - g_return_if_fail (parent_values == NULL || GTK_IS_CSS_STYLE (parent_values)); + g_return_if_fail (GTK_IS_CSS_ANIMATED_STYLE (style)); + g_return_if_fail (parent_style == NULL || GTK_IS_CSS_ANIMATED_STYLE (parent_style)); n = _gtk_css_style_property_get_n_properties (); @@ -122,13 +122,13 @@ _gtk_css_lookup_resolve (GtkCssLookup *lookup, { if (lookup->values[i].value || _gtk_bitmask_get (lookup->missing, i)) - gtk_css_style_compute_value (values, - provider, - scale, - parent_values, - i, - lookup->values[i].value, - lookup->values[i].section); + gtk_css_animated_style_compute_value (style, + provider, + scale, + parent_style, + i, + lookup->values[i].value, + lookup->values[i].section); /* else not a relevant property */ } } |