diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2014-05-22 09:05:58 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2014-05-22 09:09:55 -0400 |
| commit | 49cf5142ba9e9542e3e848f0fc55c4fd2eaa9f7f (patch) | |
| tree | 2b0794b7842a9d9fe093db0389765ad3dd89b739 /gtk/gtktexttag.c | |
| parent | c3a9a20839955a98266463c6fad4f0190feaccc2 (diff) | |
| download | gtk+-49cf5142ba9e9542e3e848f0fc55c4fd2eaa9f7f.tar.gz | |
Deprecate GdkColor
It has been replaced by GdkRGBA. Time to make it official.
http://bugzilla.gnome.org/show_bug.cgi?id=636695
Diffstat (limited to 'gtk/gtktexttag.c')
| -rw-r--r-- | gtk/gtktexttag.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c index 4510872c51..6e16fd6689 100644 --- a/gtk/gtktexttag.c +++ b/gtk/gtktexttag.c @@ -218,7 +218,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass) g_param_spec_boxed ("background-gdk", P_("Background color"), P_("Background color as a GdkColor"), - GDK_TYPE_COLOR, + g_type_from_name ("GdkColor"), GTK_PARAM_READWRITE | G_PARAM_DEPRECATED)); /** @@ -264,7 +264,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass) g_param_spec_boxed ("foreground-gdk", P_("Foreground color"), P_("Foreground color as a GdkColor"), - GDK_TYPE_COLOR, + g_type_from_name ("GdkColor"), GTK_PARAM_READWRITE | G_PARAM_DEPRECATED)); /** @@ -581,7 +581,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass) g_param_spec_boxed ("paragraph-background-gdk", P_("Paragraph background color"), P_("Paragraph background color as a GdkColor"), - GDK_TYPE_COLOR, + g_type_from_name ("GdkColor"), GTK_PARAM_READWRITE | G_PARAM_DEPRECATED)); /** @@ -890,8 +890,10 @@ set_pg_bg_rgba (GtkTextTag *tag, GdkRGBA *rgba) if (priv->values->pg_bg_rgba) gdk_rgba_free (priv->values->pg_bg_rgba); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS if (priv->values->pg_bg_color) gdk_color_free (priv->values->pg_bg_color); +G_GNUC_END_IGNORE_DEPRECATIONS priv->values->pg_bg_rgba = NULL; priv->values->pg_bg_color = NULL; @@ -909,7 +911,9 @@ set_pg_bg_rgba (GtkTextTag *tag, GdkRGBA *rgba) priv->values->pg_bg_rgba = gdk_rgba_copy (rgba); copy_rgba_to_gdk_color (rgba, &color); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS priv->values->pg_bg_color = gdk_color_copy (&color); +G_GNUC_END_IGNORE_DEPRECATIONS } else { |