[gtk/matthiasc/css-values: 11/23] css: Stop supporting builtin images
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/matthiasc/css-values: 11/23] css: Stop supporting builtin images
- Date: Fri, 10 Jan 2020 19:18:02 +0000 (UTC)
commit bbda4a43e2108fd01398b1abfcdb5b0464534eba
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Jan 10 12:56:47 2020 -0500
css: Stop supporting builtin images
Change the default value of -gtk-icon-source to 'none',
and stop parsing 'builtin' as a value.
gtk/gtkcssstylepropertyimpl.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c
index 5a36b933cb..02e9521403 100644
--- a/gtk/gtkcssstylepropertyimpl.c
+++ b/gtk/gtkcssstylepropertyimpl.c
@@ -46,7 +46,6 @@
#include "gtkcssfontfeaturesvalueprivate.h"
#include "gtkcssiconthemevalueprivate.h"
#include "gtkcssimageprivate.h"
-#include "gtkcssimagebuiltinprivate.h"
#include "gtkcssimagevalueprivate.h"
#include "gtkcssinitialvalueprivate.h"
#include "gtkcssenumvalueprivate.h"
@@ -677,16 +676,6 @@ css_image_value_parse (GtkCssStyleProperty *property,
return _gtk_css_image_value_new (image);
}
-static GtkCssValue *
-css_image_value_parse_with_builtin (GtkCssStyleProperty *property,
- GtkCssParser *parser)
-{
- if (gtk_css_parser_try_ident (parser, "builtin"))
- return _gtk_css_image_value_new (gtk_css_image_builtin_new ());
-
- return css_image_value_parse (property, parser);
-}
-
static GtkCssValue *
background_image_value_parse_one (GtkCssParser *parser)
{
@@ -1512,9 +1501,9 @@ _gtk_css_style_property_init_properties (void)
G_TYPE_NONE,
GTK_STYLE_PROPERTY_ANIMATED,
GTK_CSS_AFFECTS_ICON | GTK_CSS_AFFECTS_SYMBOLIC_ICON,
- css_image_value_parse_with_builtin,
+ css_image_value_parse,
NULL,
- _gtk_css_image_value_new (gtk_css_image_builtin_new ()));
+ _gtk_css_image_value_new (NULL));
gtk_css_style_property_register ("-gtk-icon-size",
GTK_CSS_PROPERTY_ICON_SIZE,
G_TYPE_NONE,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]