diff options
| author | Benjamin Otte <otte@redhat.com> | 2011-12-31 13:50:03 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2012-01-09 18:37:51 +0100 |
| commit | 81b2bb0adebb06807fd637a6de8432714a8b097e (patch) | |
| tree | 9cb965cc1c3f468ca2c52c8c9a619281da5edf37 /gtk/gtkstyleproperty.c | |
| parent | f9485241b1b9dde6604ec6aa92ae25f3c27e80c4 (diff) | |
| download | gtk+-81b2bb0adebb06807fd637a6de8432714a8b097e.tar.gz | |
styleproperty: Get rid of _gtk_style_property_is_shorthand()
Use GTK_IS_CSS_SHORTHAND_PROPERTY() instead now that we have it.
Diffstat (limited to 'gtk/gtkstyleproperty.c')
| -rw-r--r-- | gtk/gtkstyleproperty.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/gtk/gtkstyleproperty.c b/gtk/gtkstyleproperty.c index 7364e9912e..a2073be612 100644 --- a/gtk/gtkstyleproperty.c +++ b/gtk/gtkstyleproperty.c @@ -2675,14 +2675,6 @@ _gtk_style_property_get_initial_value (const GtkStyleProperty *property) return &property->initial_value; } -gboolean -_gtk_style_property_is_shorthand (const GtkStyleProperty *property) -{ - g_return_val_if_fail (property != NULL, FALSE); - - return property->pack_func != NULL; -} - GParameter * _gtk_style_property_unpack (const GtkStyleProperty *property, const GValue *value, @@ -2730,7 +2722,7 @@ _gtk_style_property_query (const GtkStyleProperty *property, if (val) _gtk_style_property_resolve (property, props, state, context, (GValue *) val, value); - else if (_gtk_style_property_is_shorthand (property)) + else if (GTK_IS_CSS_SHORTHAND_PROPERTY (property)) _gtk_style_property_pack (property, props, state, context, value); else _gtk_style_property_default_value (property, props, state, value); @@ -3268,7 +3260,7 @@ _gtk_style_property_register (GParamSpec *pspec, node->print_func = print_func; node->unset_func = unset_func; - if (!_gtk_style_property_is_shorthand (node)) + if (!GTK_IS_CSS_SHORTHAND_PROPERTY (node)) { _gtk_style_property_generate_id (node); |