AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-30 11:07:38 +00:00
Code Issues Projects Releases Wiki Activity

Get rid of unused shaped_object list in _GtkTextLineDisplay

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=631076
This commit is contained in:
Paolo Borelli 2010-10-01 10:00:13 +02:00 committed by Tristan Van Berkom
parent 053171c530
commit 5e90bb269d
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtktextlayout.c
View File

@ -1582,9 +1582,6 @@ add_pixbuf_attrs (GtkTextLayout *layout,
attr->start_index = start; attr->start_index = start;
attr->end_index = start + seg->byte_count; attr->end_index = start + seg->byte_count;
pango_attr_list_insert (attrs, attr); pango_attr_list_insert (attrs, attr);
display->shaped_objects =
g_slist_append (display->shaped_objects, pixbuf->pixbuf);
} }
static void static void
@ -1643,8 +1640,6 @@ add_child_attrs (GtkTextLayout *layout,
widget = NULL; widget = NULL;
} }
display->shaped_objects = g_slist_append (display->shaped_objects, widget);
logical_rect.x = 0; logical_rect.x = 0;
logical_rect.y = -height * PANGO_SCALE; logical_rect.y = -height * PANGO_SCALE;
logical_rect.width = width * PANGO_SCALE; logical_rect.width = width * PANGO_SCALE;
@ -2510,8 +2505,7 @@ gtk_text_layout_free_line_display (GtkTextLayout *layout,
g_slist_foreach (display->cursors, (GFunc)g_free, NULL); g_slist_foreach (display->cursors, (GFunc)g_free, NULL);
g_slist_free (display->cursors); g_slist_free (display->cursors);
} }
g_slist_free (display->shaped_objects);
if (display->pg_bg_color) if (display->pg_bg_color)
gdk_color_free (display->pg_bg_color); gdk_color_free (display->pg_bg_color);

3
gtk/gtktextlayout.h
View File

@ -237,8 +237,7 @@ struct _GtkTextLineDisplay
{ {
PangoLayout *layout; PangoLayout *layout;
GSList *cursors; GSList *cursors;
GSList *shaped_objects; /* Only for backwards compatibility */
GtkTextDirection direction; GtkTextDirection direction;
gint width; /* Width of layout */ gint width; /* Width of layout */