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/gtktextlayout.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/gtktextlayout.c')
| -rw-r--r-- | gtk/gtktextlayout.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index 4ad0aee3ae..99909288f0 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -1400,10 +1400,12 @@ set_para_values (GtkTextLayout *layout, display->total_width = MAX (layout->screen_width, layout->width) - display->left_margin - display->right_margin; +G_GNUC_BEGIN_IGNORE_DEPRECATIONS if (style->pg_bg_color) display->pg_bg_color = gdk_color_copy (style->pg_bg_color); else display->pg_bg_color = NULL; +G_GNUC_END_IGNORE_DEPRECATIONS if (style->pg_bg_rgba) display->pg_bg_rgba = gdk_rgba_copy (style->pg_bg_rgba); @@ -2497,8 +2499,10 @@ gtk_text_layout_free_line_display (GtkTextLayout *layout, if (display->cursors) g_array_free (display->cursors, TRUE); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS if (display->pg_bg_color) gdk_color_free (display->pg_bg_color); +G_GNUC_END_IGNORE_DEPRECATIONS if (display->pg_bg_rgba) gdk_rgba_free (display->pg_bg_rgba); |