summaryrefslogtreecommitdiff
path: root/gtk/gtkstylepropertyprivate.h
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2011-05-31 16:51:38 +0200
committerBenjamin Otte <otte@redhat.com>2011-06-02 02:03:52 +0200
commit18458495967ccf73bc1f8b0fb2a2150402d5cd91 (patch)
tree5fb63df8a6e2d046e5378a1ec9a5e2e962cb1d95 /gtk/gtkstylepropertyprivate.h
parentcc3afc7c0fb5fc90173ca084bb6b55e9be217252 (diff)
downloadgtk+-18458495967ccf73bc1f8b0fb2a2150402d5cd91.tar.gz
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.
Diffstat (limited to 'gtk/gtkstylepropertyprivate.h')
-rw-r--r--gtk/gtkstylepropertyprivate.h4
1 files changed, 4 insertions, 0 deletions
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,