callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

css: Remove _gtk_css_style_property_is_specified_type()

Browse Source 
That check is going to be refactored away.
This commit is contained in:
Benjamin Otte
2012-03-26 16:22:53 +02:00
parent 04f5c8708a
commit 718ceaec45
3 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gtk/gtkcssprovider.c
View File

@ -1254,7 +1254,6 @@ gtk_css_ruleset_add (GtkCssRuleset *ruleset,
{ {
guint i; guint i;
g_return_if_fail (_gtk_css_style_property_is_specified_type (property, G_VALUE_TYPE (value)));
g_return_if_fail (ruleset->owns_styles || ruleset->n_styles == 0); g_return_if_fail (ruleset->owns_styles || ruleset->n_styles == 0);
if (ruleset->set_styles == NULL) if (ruleset->set_styles == NULL)

26
gtk/gtkcssstyleproperty.c
View File

@ -464,32 +464,6 @@ _gtk_css_style_property_get_specified_type (GtkCssStyleProperty *property)
return _gtk_css_value_get_content_type (property->initial_value); return _gtk_css_value_get_content_type (property->initial_value);
} }
gboolean
_gtk_css_style_property_is_specified_type (GtkCssStyleProperty *property,
GType type)
{
g_return_val_if_fail (GTK_IS_CSS_STYLE_PROPERTY (property), FALSE);
/* If it's our specified type, of course it's valid */
if (type == _gtk_css_value_get_content_type (property->initial_value))
return TRUE;
/* The special values 'inherit' and 'initial' are always valid */
if (type == GTK_TYPE_CSS_SPECIAL_VALUE)
return TRUE;
/* XXX: Someone needs to fix that legacy */
if ((_gtk_css_value_holds (property->initial_value, GDK_TYPE_RGBA) ||
_gtk_css_value_holds (property->initial_value, GDK_TYPE_COLOR)) &&
type == GTK_TYPE_SYMBOLIC_COLOR)
return TRUE;
if (_gtk_css_value_holds (property->initial_value, CAIRO_GOBJECT_TYPE_PATTERN) &&
type == GTK_TYPE_GRADIENT)
return TRUE;
return FALSE;
}
/** /**
* _gtk_css_style_property_compute_value: * _gtk_css_style_property_compute_value:
* @property: the property * @property: the property

2
gtk/gtkcssstylepropertyprivate.h
View File

@ -82,8 +82,6 @@ GtkCssValue * _gtk_css_style_property_get_initial_value
(GtkCssStyleProperty *property); (GtkCssStyleProperty *property);
GType _gtk_css_style_property_get_computed_type (GtkCssStyleProperty *property); GType _gtk_css_style_property_get_computed_type (GtkCssStyleProperty *property);
GType _gtk_css_style_property_get_specified_type (GtkCssStyleProperty *property); GType _gtk_css_style_property_get_specified_type (GtkCssStyleProperty *property);
gboolean _gtk_css_style_property_is_specified_type (GtkCssStyleProperty *property,
GType type);
GtkCssValue * _gtk_css_style_property_compute_value (GtkCssStyleProperty *property, GtkCssValue * _gtk_css_style_property_compute_value (GtkCssStyleProperty *property,
GtkStyleContext *context, GtkStyleContext *context,