From 18458495967ccf73bc1f8b0fb2a2150402d5cd91 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 31 May 2011 16:51:38 +0200 Subject: styleproperty: Move resolving code Also, resolving now always succeeds - if it doesn't we fall back to the default value right here, instead of later. --- gtk/gtkstylepropertyprivate.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gtk/gtkstylepropertyprivate.h') diff --git a/gtk/gtkstylepropertyprivate.h b/gtk/gtkstylepropertyprivate.h index dab6f07af0..afa76be616 100644 --- a/gtk/gtkstylepropertyprivate.h +++ b/gtk/gtkstylepropertyprivate.h @@ -73,6 +73,10 @@ void _gtk_style_property_default_value (const GtkStyleProper GtkStyleProperties *properties, GValue *value); +void _gtk_style_property_resolve (const GtkStyleProperty *property, + GtkStyleProperties *properties, + GValue *value); + gboolean _gtk_style_property_is_shorthand (const GtkStyleProperty *property); GParameter * _gtk_style_property_unpack (const GtkStyleProperty *property, const GValue *value, -- cgit v1.2.1