diff options
author | Benjamin Otte <otte@redhat.com> | 2010-07-31 11:27:34 +0200 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2010-08-10 21:02:30 +0200 |
commit | 25fc4d97f853b459836a1999a65832697897b728 (patch) | |
tree | dcdca233ff62b173ffe99623c20bba7ca4f4e523 /gtk/gtktexttag.c | |
parent | 13087315808a2bf88a647dcbf75446cd48c563a1 (diff) | |
download | gtk+-25fc4d97f853b459836a1999a65832697897b728.tar.gz |
textview: remove GtkTextAttributes (un)realize code
It was unused (apart from a few assertion that indeed it was unused).
Diffstat (limited to 'gtk/gtktexttag.c')
-rw-r--r-- | gtk/gtktexttag.c | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c index 9131e4179c..25928ce0d9 100644 --- a/gtk/gtktexttag.c +++ b/gtk/gtktexttag.c @@ -699,8 +699,6 @@ gtk_text_tag_finalize (GObject *object) text_tag = GTK_TEXT_TAG (object); - g_assert (!text_tag->values->realized); - if (text_tag->table) gtk_text_tag_table_remove (text_tag->table, text_tag); @@ -957,8 +955,6 @@ gtk_text_tag_set_property (GObject *object, text_tag = GTK_TEXT_TAG (object); - g_return_if_fail (!text_tag->values->realized); - switch (prop_id) { case PROP_NAME: @@ -1914,8 +1910,6 @@ gtk_text_attributes_copy_values (GtkTextAttributes *src, { guint orig_refcount; - g_return_if_fail (!dest->realized); - if (src == dest) return; @@ -1941,7 +1935,6 @@ gtk_text_attributes_copy_values (GtkTextAttributes *src, dest->pg_bg_color = gdk_color_copy (src->pg_bg_color); dest->refcount = orig_refcount; - dest->realized = FALSE; } /** @@ -1979,8 +1972,6 @@ gtk_text_attributes_unref (GtkTextAttributes *values) if (values->refcount == 0) { - g_assert (!values->realized); - if (values->tabs) pango_tab_array_free (values->tabs); @@ -1995,61 +1986,6 @@ gtk_text_attributes_unref (GtkTextAttributes *values) } void -_gtk_text_attributes_realize (GtkTextAttributes *values, - GdkColormap *cmap, - GdkVisual *visual) -{ - g_return_if_fail (values != NULL); - g_return_if_fail (values->refcount > 0); - g_return_if_fail (!values->realized); - - /* It is wrong to use this colormap, FIXME */ - gdk_colormap_alloc_color (cmap, - &values->appearance.fg_color, - FALSE, TRUE); - - gdk_colormap_alloc_color (cmap, - &values->appearance.bg_color, - FALSE, TRUE); - - if (values->pg_bg_color) - gdk_colormap_alloc_color (cmap, - values->pg_bg_color, - FALSE, TRUE); - - values->realized = TRUE; -} - -void -_gtk_text_attributes_unrealize (GtkTextAttributes *values, - GdkColormap *cmap, - GdkVisual *visual) -{ - g_return_if_fail (values != NULL); - g_return_if_fail (values->refcount > 0); - g_return_if_fail (values->realized); - - gdk_colormap_free_colors (cmap, - &values->appearance.fg_color, 1); - - - gdk_colormap_free_colors (cmap, - &values->appearance.bg_color, 1); - - values->appearance.fg_color.pixel = 0; - values->appearance.bg_color.pixel = 0; - - if (values->pg_bg_color) - { - gdk_colormap_free_colors (cmap, values->pg_bg_color, 1); - - values->pg_bg_color->pixel = 0; - } - - values->realized = FALSE; -} - -void _gtk_text_attributes_fill_from_tags (GtkTextAttributes *dest, GtkTextTag** tags, guint n_tags) @@ -2059,8 +1995,6 @@ _gtk_text_attributes_fill_from_tags (GtkTextAttributes *dest, guint left_margin_accumulative = 0; guint right_margin_accumulative = 0; - g_return_if_fail (!dest->realized); - while (n < n_tags) { GtkTextTag *tag = tags[n]; |