summaryrefslogtreecommitdiff
path: root/gtk/gtktextlayout.c
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2006-12-24 05:29:25 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2006-12-24 05:29:25 +0000
commitd698e3eaf25357bd6edd7c685dee06787853400e (patch)
tree2bb73f9f2950884232b3cb3de2e65549385c5611 /gtk/gtktextlayout.c
parent106ddae86d5ffd3409901c5f9772b1a01f84ad04 (diff)
downloadgtk+-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/gtktextlayout.c')
-rw-r--r--gtk/gtktextlayout.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 5f62e70304..37696fa498 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -1651,7 +1651,7 @@ allocate_child_widgets (GtkTextLayout *text_layout,
do
{
- PangoLayoutRun *run = pango_layout_iter_get_run (iter);
+ PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
if (run && is_shape (run))
{
@@ -2565,7 +2565,7 @@ find_display_line_below (GtkTextLayout *layout,
do
{
gint first_y, last_y;
- PangoLayoutLine *layout_line = pango_layout_iter_get_line (layout_iter);
+ PangoLayoutLine *layout_line = pango_layout_iter_get_line_readonly (layout_iter);
found_byte = layout_line->start_index;
@@ -2636,7 +2636,7 @@ find_display_line_above (GtkTextLayout *layout,
do
{
gint first_y, last_y;
- PangoLayoutLine *layout_line = pango_layout_iter_get_line (layout_iter);
+ PangoLayoutLine *layout_line = pango_layout_iter_get_line_readonly (layout_iter);
found_byte = layout_line->start_index;
@@ -2767,7 +2767,7 @@ gtk_text_layout_move_iter_to_previous_line (GtkTextLayout *layout,
update_byte = TRUE;
}
- tmp_list = pango_layout_get_lines (display->layout);
+ tmp_list = pango_layout_get_lines_readonly (display->layout);
layout_line = tmp_list->data;
if (update_byte)
@@ -2793,7 +2793,7 @@ gtk_text_layout_move_iter_to_previous_line (GtkTextLayout *layout,
if (display->height > 0)
{
- tmp_list = g_slist_last (pango_layout_get_lines (display->layout));
+ tmp_list = g_slist_last (pango_layout_get_lines_readonly (display->layout));
layout_line = tmp_list->data;
line_display_index_to_iter (layout, display, iter,
@@ -2879,7 +2879,7 @@ gtk_text_layout_move_iter_to_next_line (GtkTextLayout *layout,
else
line_byte = 0;
- tmp_list = pango_layout_get_lines (display->layout);
+ tmp_list = pango_layout_get_lines_readonly (display->layout);
while (tmp_list && !found_after)
{
PangoLayoutLine *layout_line = tmp_list->data;
@@ -2939,7 +2939,7 @@ gtk_text_layout_move_iter_to_line_end (GtkTextLayout *layout,
display = gtk_text_layout_get_line_display (layout, line, FALSE);
line_byte = line_display_iter_to_index (layout, display, iter);
- tmp_list = pango_layout_get_lines (display->layout);
+ tmp_list = pango_layout_get_lines_readonly (display->layout);
while (tmp_list)
{
PangoLayoutLine *layout_line = tmp_list->data;
@@ -2995,7 +2995,7 @@ gtk_text_layout_iter_starts_line (GtkTextLayout *layout,
display = gtk_text_layout_get_line_display (layout, line, FALSE);
line_byte = line_display_iter_to_index (layout, display, iter);
- tmp_list = pango_layout_get_lines (display->layout);
+ tmp_list = pango_layout_get_lines_readonly (display->layout);
while (tmp_list)
{
PangoLayoutLine *layout_line = tmp_list->data;
@@ -3064,7 +3064,7 @@ gtk_text_layout_move_iter_to_x (GtkTextLayout *layout,
do
{
- PangoLayoutLine *layout_line = pango_layout_iter_get_line (layout_iter);
+ PangoLayoutLine *layout_line = pango_layout_iter_get_line_readonly (layout_iter);
if (line_byte < layout_line->start_index + layout_line->length ||
pango_layout_iter_at_last_line (layout_iter))