diff options
| author | Benjamin Otte <otte@redhat.com> | 2012-03-30 02:19:39 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2012-04-17 08:59:15 +0200 |
| commit | 4ba9be5b976df6f51b7ae0f81af5b29246b7ac80 (patch) | |
| tree | 522839fd82c7012564b3a58f08546e3fb48bf059 /gtk/gtkcssshorthandpropertyimpl.c | |
| parent | 8e17f9c2338c2e64ced679dc11cc9d2c3d76daf6 (diff) | |
| download | gtk+-4ba9be5b976df6f51b7ae0f81af5b29246b7ac80.tar.gz | |
cssvalue: Add GtkCssArea to the enum values
... and get rid of its GType.
This makes it non-queryable using gtk_style_context_get() but it used to
be a private struct anyway.
Diffstat (limited to 'gtk/gtkcssshorthandpropertyimpl.c')
| -rw-r--r-- | gtk/gtkcssshorthandpropertyimpl.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gtk/gtkcssshorthandpropertyimpl.c b/gtk/gtkcssshorthandpropertyimpl.c index fe6707083b..b7eb6d72c7 100644 --- a/gtk/gtkcssshorthandpropertyimpl.c +++ b/gtk/gtkcssshorthandpropertyimpl.c @@ -511,10 +511,13 @@ parse_background (GtkCssShorthandProperty *shorthand, values[1] = _gtk_css_value_new_from_enum (GTK_TYPE_CSS_BACKGROUND_REPEAT, enum_value); } else if ((values[2] == NULL || values[3] == NULL) && - _gtk_css_parser_try_enum (parser, GTK_TYPE_CSS_AREA, &enum_value)) + (values[3] = _gtk_css_area_value_try_parse (parser))) { - guint idx = values[2] == NULL ? 2 : 3; - values[idx] = _gtk_css_value_new_from_enum (GTK_TYPE_CSS_AREA, enum_value); + if (values[2] == NULL) + { + values[2] = values[3]; + values[3] = NULL; + } } else if (values[4] == NULL) { |