AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

styleproperties: Implement unsetting directly

Browse Source 
With subproperties, there's no need anymore for custom unset functions.
This commit is contained in:
Benjamin Otte 2011-12-31 22:17:25 +01:00
parent 341a738dc6
commit 674485a138
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/gtkstyleproperties.c
View File

@ -886,10 +886,23 @@ gtk_style_properties_unset_property (GtkStyleProperties *props,
g_warning ("Style property \"%s\" is not registered", property); g_warning ("Style property \"%s\" is not registered", property);
return; return;
} }
if (_gtk_style_property_get_value_type (node) == G_TYPE_NONE)
if (node->unset_func)
{ {
node->unset_func (props, state); g_warning ("Style property \"%s\" is not settable", property);
return;
}
if (GTK_IS_CSS_SHORTHAND_PROPERTY (node))
{
GtkCssShorthandProperty *shorthand = GTK_CSS_SHORTHAND_PROPERTY (node);
for (pos = 0; pos < _gtk_css_shorthand_property_get_n_subproperties (shorthand); pos++)
{
GtkCssStyleProperty *sub = _gtk_css_shorthand_property_get_subproperty (shorthand, pos);
gtk_style_properties_unset_property (props,
_gtk_style_property_get_name (GTK_STYLE_PROPERTY (sub)),
state);
}
return; return;
} }