diff options
author | Behdad Esfahbod <behdad@gnome.org> | 2006-12-24 05:29:25 +0000 |
---|---|---|
committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-12-24 05:29:25 +0000 |
commit | d698e3eaf25357bd6edd7c685dee06787853400e (patch) | |
tree | 2bb73f9f2950884232b3cb3de2e65549385c5611 /gtk/gtkiconview.c | |
parent | 106ddae86d5ffd3409901c5f9772b1a01f84ad04 (diff) | |
download | gtk+-d698e3eaf25357bd6edd7c685dee06787853400e.tar.gz |
Bug 340141 – Update to Pango 1.16 API
2006-12-24 Behdad Esfahbod <behdad@gnome.org>
Bug 340141 – Update to Pango 1.16 API
* gdk/gdkpango.c (layout_iter_get_line_clip_region),
(gdk_pango_layout_line_get_clip_region):
* gtk/gtkcalendar.c (gtk_calendar_size_request):
* gtk/gtkentry.c (gtk_entry_get_pixel_ranges),
(get_layout_position), (gtk_entry_find_position),
(gtk_entry_adjust_scroll):
* gtk/gtkiconview.c (get_pango_text_offsets):
* gtk/gtklabel.c (get_cursor_direction):
* gtk/gtkstyle.c (get_insensitive_layout):
* gtk/gtktextdisplay.c (render_para):
* gtk/gtktextlayout.c (allocate_child_widgets),
(find_display_line_below), (find_display_line_above),
(gtk_text_layout_move_iter_to_previous_line),
(gtk_text_layout_move_iter_to_next_line),
(gtk_text_layout_move_iter_to_line_end),
(gtk_text_layout_iter_starts_line),
(gtk_text_layout_move_iter_to_x):
* gtk/gtktextutil.c (limit_layout_lines):
Use the _readonly version of pango_layout_iter_get_line(),
pango_layout_iter_get_run(), pango_layout_get_line(), and
pango_layout_get_lines().
* gtk/gtkmain.c (gtk_get_default_language): Use
pango_get_default_language().
Diffstat (limited to 'gtk/gtkiconview.c')
-rw-r--r-- | gtk/gtkiconview.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index 45280f63c4..4b028fc4e0 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -7216,7 +7216,7 @@ get_pango_text_offsets (PangoLayout *layout, iter = pango_layout_get_iter (layout); do { - line = pango_layout_iter_get_line (iter); + line = pango_layout_iter_get_line_readonly (iter); start_index = line->start_index; end_index = start_index + line->length; @@ -7257,7 +7257,7 @@ get_pango_text_offsets (PangoLayout *layout, { case ATK_TEXT_BOUNDARY_LINE_START: if (pango_layout_iter_next_line (iter)) - end_index = pango_layout_iter_get_line (iter)->start_index; + end_index = pango_layout_iter_get_line_readonly (iter)->start_index; break; case ATK_TEXT_BOUNDARY_LINE_END: if (prev_line) @@ -7274,13 +7274,13 @@ get_pango_text_offsets (PangoLayout *layout, */ if (pango_layout_iter_next_line (iter)) { - line = pango_layout_iter_get_line (iter); + line = pango_layout_iter_get_line_readonly (iter); switch (boundary_type) { case ATK_TEXT_BOUNDARY_LINE_START: start_index = line->start_index; if (pango_layout_iter_next_line (iter)) - end_index = pango_layout_iter_get_line (iter)->start_index; + end_index = pango_layout_iter_get_line_readonly (iter)->start_index; else end_index = start_index + line->length; break; |