diff options
author | Benjamin Otte <otte@redhat.com> | 2014-10-24 21:22:43 +0200 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2014-10-24 21:31:40 +0200 |
commit | a51378dda882115449b185aaa33b921d397568c9 (patch) | |
tree | a72f846cf957789223e4a5ae1b69f048dab24389 /gtk/gtkmodifierstyle.c | |
parent | 433c20e59d84045438a91f2703c76b50b10116ed (diff) | |
download | gtk+-a51378dda882115449b185aaa33b921d397568c9.tar.gz |
styleproperties: Deprecate
Diffstat (limited to 'gtk/gtkmodifierstyle.c')
-rw-r--r-- | gtk/gtkmodifierstyle.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gtk/gtkmodifierstyle.c b/gtk/gtkmodifierstyle.c index ca23223dcb..e09f67172c 100644 --- a/gtk/gtkmodifierstyle.c +++ b/gtk/gtkmodifierstyle.c @@ -20,6 +20,8 @@ #include "gtkstyleproviderprivate.h" #include "gtkintl.h" +G_GNUC_BEGIN_IGNORE_DEPRECATIONS + typedef struct StylePropertyValue StylePropertyValue; struct _GtkModifierStylePrivate @@ -75,14 +77,10 @@ gtk_modifier_style_get_style_property (GtkStyleProvider *provider, GdkColor color; gchar *str; -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - /* Reject non-color types for now */ if (pspec->value_type != GDK_TYPE_COLOR) return FALSE; -G_GNUC_END_IGNORE_DEPRECATIONS - priv = GTK_MODIFIER_STYLE (provider)->priv; str = g_strdup_printf ("-%s-%s", g_type_name (pspec->owner_type), @@ -240,16 +238,12 @@ _gtk_modifier_style_map_color (GtkModifierStyle *style, priv = style->priv; - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - if (color) symbolic_color = gtk_symbolic_color_new_literal (color); gtk_style_properties_map_color (priv->style, name, symbolic_color); - G_GNUC_END_IGNORE_DEPRECATIONS; - _gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (style)); } @@ -292,3 +286,5 @@ _gtk_modifier_style_set_color_property (GtkModifierStyle *style, _gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (style)); } + +G_GNUC_END_IGNORE_DEPRECATIONS |