summaryrefslogtreecommitdiff
path: root/gtk/gtkcssimage.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2014-10-22 23:41:50 +0200
committerBenjamin Otte <otte@redhat.com>2015-01-07 14:26:46 +0100
commit572f46067f44da99e9ee0ea3210e1c0fac148928 (patch)
treeb6ce55172ca2708e60b3ef98ad357ff2c6ac42a0 /gtk/gtkcssimage.c
parentf51419adb0034ad784d013db4e57bbdbc7b80153 (diff)
downloadgtk+-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/gtkcssimage.c')
-rw-r--r--gtk/gtkcssimage.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk/gtkcssimage.c b/gtk/gtkcssimage.c
index 049d49e689..bdcbcf3c80 100644
--- a/gtk/gtkcssimage.c
+++ b/gtk/gtkcssimage.c
@@ -21,7 +21,7 @@
#include "gtkcssimageprivate.h"
-#include "gtkcsscomputedvaluesprivate.h"
+#include "gtkcssstyleprivate.h"
/* for the types only */
#include "gtk/gtkcssimagecrossfadeprivate.h"
@@ -65,8 +65,8 @@ gtk_css_image_real_compute (GtkCssImage *image,
guint property_id,
GtkStyleProviderPrivate *provider,
int scale,
- GtkCssComputedValues *values,
- GtkCssComputedValues *parent_values,
+ GtkCssStyle *values,
+ GtkCssStyle *parent_values,
GtkCssDependencies *dependencies)
{
return g_object_ref (image);
@@ -150,16 +150,16 @@ _gtk_css_image_compute (GtkCssImage *image,
guint property_id,
GtkStyleProviderPrivate *provider,
int scale,
- GtkCssComputedValues *values,
- GtkCssComputedValues *parent_values,
+ GtkCssStyle *values,
+ GtkCssStyle *parent_values,
GtkCssDependencies *dependencies)
{
GtkCssDependencies unused;
GtkCssImageClass *klass;
g_return_val_if_fail (GTK_IS_CSS_IMAGE (image), NULL);
- g_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL);
- g_return_val_if_fail (parent_values == NULL || GTK_IS_CSS_COMPUTED_VALUES (parent_values), NULL);
+ g_return_val_if_fail (GTK_IS_CSS_STYLE (values), NULL);
+ g_return_val_if_fail (parent_values == NULL || GTK_IS_CSS_STYLE (parent_values), NULL);
if (dependencies == NULL)
dependencies = &unused;