Commit bacb35ba authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington
Browse files

Put _ in front of every function in this header file

2000-12-13  Havoc Pennington  <hp@pobox.com>

* gtk/gtktextbtree.h: Put _ in front of every function in this
header file

* gtk/gtktext*.[hc]: update to reflect renamed btree functions
parent 02eac1c6
2000-12-13 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.h: Put _ in front of every function in this
header file
* gtk/gtktext*.[hc]: update to reflect renamed btree functions
2000-12-13 <alexl@redhat.com> 2000-12-13 <alexl@redhat.com>
* gdk/linux-fb/gdkmouse-fb.c (mouse_devs): * gdk/linux-fb/gdkmouse-fb.c (mouse_devs):
......
2000-12-13 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.h: Put _ in front of every function in this
header file
* gtk/gtktext*.[hc]: update to reflect renamed btree functions
2000-12-13 <alexl@redhat.com> 2000-12-13 <alexl@redhat.com>
* gdk/linux-fb/gdkmouse-fb.c (mouse_devs): * gdk/linux-fb/gdkmouse-fb.c (mouse_devs):
......
2000-12-13 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.h: Put _ in front of every function in this
header file
* gtk/gtktext*.[hc]: update to reflect renamed btree functions
2000-12-13 <alexl@redhat.com> 2000-12-13 <alexl@redhat.com>
* gdk/linux-fb/gdkmouse-fb.c (mouse_devs): * gdk/linux-fb/gdkmouse-fb.c (mouse_devs):
......
2000-12-13 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.h: Put _ in front of every function in this
header file
* gtk/gtktext*.[hc]: update to reflect renamed btree functions
2000-12-13 <alexl@redhat.com> 2000-12-13 <alexl@redhat.com>
* gdk/linux-fb/gdkmouse-fb.c (mouse_devs): * gdk/linux-fb/gdkmouse-fb.c (mouse_devs):
......
2000-12-13 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.h: Put _ in front of every function in this
header file
* gtk/gtktext*.[hc]: update to reflect renamed btree functions
2000-12-13 <alexl@redhat.com> 2000-12-13 <alexl@redhat.com>
* gdk/linux-fb/gdkmouse-fb.c (mouse_devs): * gdk/linux-fb/gdkmouse-fb.c (mouse_devs):
......
2000-12-13 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.h: Put _ in front of every function in this
header file
* gtk/gtktext*.[hc]: update to reflect renamed btree functions
2000-12-13 <alexl@redhat.com> 2000-12-13 <alexl@redhat.com>
* gdk/linux-fb/gdkmouse-fb.c (mouse_devs): * gdk/linux-fb/gdkmouse-fb.c (mouse_devs):
......
2000-12-13 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.h: Put _ in front of every function in this
header file
* gtk/gtktext*.[hc]: update to reflect renamed btree functions
2000-12-13 <alexl@redhat.com> 2000-12-13 <alexl@redhat.com>
* gdk/linux-fb/gdkmouse-fb.c (mouse_devs): * gdk/linux-fb/gdkmouse-fb.c (mouse_devs):
......
This diff is collapsed.
This diff is collapsed.
...@@ -288,7 +288,7 @@ gtk_text_buffer_finalize (GObject *object) ...@@ -288,7 +288,7 @@ gtk_text_buffer_finalize (GObject *object)
if (buffer->btree) if (buffer->btree)
{ {
gtk_text_btree_unref (buffer->btree); _gtk_text_btree_unref (buffer->btree);
buffer->btree = NULL; buffer->btree = NULL;
} }
...@@ -318,7 +318,7 @@ static GtkTextBTree* ...@@ -318,7 +318,7 @@ static GtkTextBTree*
get_btree (GtkTextBuffer *buffer) get_btree (GtkTextBuffer *buffer)
{ {
if (buffer->btree == NULL) if (buffer->btree == NULL)
buffer->btree = gtk_text_btree_new (gtk_text_buffer_get_tag_table (buffer), buffer->btree = _gtk_text_btree_new (gtk_text_buffer_get_tag_table (buffer),
buffer); buffer);
return buffer->btree; return buffer->btree;
...@@ -403,7 +403,7 @@ gtk_text_buffer_real_insert_text (GtkTextBuffer *buffer, ...@@ -403,7 +403,7 @@ gtk_text_buffer_real_insert_text (GtkTextBuffer *buffer,
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer)); g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
g_return_if_fail (iter != NULL); g_return_if_fail (iter != NULL);
gtk_text_btree_insert (iter, text, len); _gtk_text_btree_insert (iter, text, len);
gtk_signal_emit (GTK_OBJECT (buffer), signals[CHANGED]); gtk_signal_emit (GTK_OBJECT (buffer), signals[CHANGED]);
} }
...@@ -1046,7 +1046,7 @@ gtk_text_buffer_real_delete_text (GtkTextBuffer *buffer, ...@@ -1046,7 +1046,7 @@ gtk_text_buffer_real_delete_text (GtkTextBuffer *buffer,
g_return_if_fail (start != NULL); g_return_if_fail (start != NULL);
g_return_if_fail (end != NULL); g_return_if_fail (end != NULL);
gtk_text_btree_delete (start, end); _gtk_text_btree_delete (start, end);
/* may have deleted the selection... */ /* may have deleted the selection... */
gtk_text_buffer_update_primary_selection (buffer); gtk_text_buffer_update_primary_selection (buffer);
...@@ -1330,7 +1330,7 @@ gtk_text_buffer_insert_pixbuf (GtkTextBuffer *buffer, ...@@ -1330,7 +1330,7 @@ gtk_text_buffer_insert_pixbuf (GtkTextBuffer *buffer,
g_return_if_fail (iter != NULL); g_return_if_fail (iter != NULL);
g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
gtk_text_btree_insert_pixbuf (iter, pixbuf); __gtk_text_btree_insert_pixbuf (iter, pixbuf);
/* FIXME pixbuf-specific signal like insert_text */ /* FIXME pixbuf-specific signal like insert_text */
...@@ -1350,7 +1350,7 @@ gtk_text_buffer_create_child_anchor (GtkTextBuffer *buffer, ...@@ -1350,7 +1350,7 @@ gtk_text_buffer_create_child_anchor (GtkTextBuffer *buffer,
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL); g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
g_return_val_if_fail (iter != NULL, NULL); g_return_val_if_fail (iter != NULL, NULL);
anchor = gtk_text_btree_create_child_anchor (iter); anchor = _gtk_text_btree_create_child_anchor (iter);
/* FIXME child-anchor-specific signal */ /* FIXME child-anchor-specific signal */
...@@ -1414,20 +1414,20 @@ gtk_text_buffer_set_mark (GtkTextBuffer *buffer, ...@@ -1414,20 +1414,20 @@ gtk_text_buffer_set_mark (GtkTextBuffer *buffer,
GtkTextIter location; GtkTextIter location;
GtkTextMark *mark; GtkTextMark *mark;
mark = gtk_text_btree_set_mark (get_btree (buffer), mark = _gtk_text_btree_set_mark (get_btree (buffer),
existing_mark, existing_mark,
mark_name, mark_name,
left_gravity, left_gravity,
iter, iter,
should_exist); should_exist);
if (gtk_text_btree_mark_is_insert (get_btree (buffer), mark) || if (_gtk_text_btree_mark_is_insert (get_btree (buffer), mark) ||
gtk_text_btree_mark_is_selection_bound (get_btree (buffer), mark)) _gtk_text_btree_mark_is_selection_bound (get_btree (buffer), mark))
{ {
gtk_text_buffer_update_primary_selection (buffer); gtk_text_buffer_update_primary_selection (buffer);
} }
gtk_text_btree_get_iter_at_mark (get_btree (buffer), _gtk_text_btree_get_iter_at_mark (get_btree (buffer),
&location, &location,
mark); mark);
...@@ -1513,7 +1513,7 @@ gtk_text_buffer_get_iter_at_mark (GtkTextBuffer *buffer, ...@@ -1513,7 +1513,7 @@ gtk_text_buffer_get_iter_at_mark (GtkTextBuffer *buffer,
g_return_if_fail (!gtk_text_mark_get_deleted (mark)); g_return_if_fail (!gtk_text_mark_get_deleted (mark));
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer)); g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
gtk_text_btree_get_iter_at_mark (get_btree (buffer), _gtk_text_btree_get_iter_at_mark (get_btree (buffer),
iter, iter,
mark); mark);
} }
...@@ -1543,7 +1543,7 @@ gtk_text_buffer_delete_mark (GtkTextBuffer *buffer, ...@@ -1543,7 +1543,7 @@ gtk_text_buffer_delete_mark (GtkTextBuffer *buffer,
g_object_ref (G_OBJECT (mark)); g_object_ref (G_OBJECT (mark));
gtk_text_btree_remove_mark (get_btree (buffer), mark); _gtk_text_btree_remove_mark (get_btree (buffer), mark);
/* See rationale above for MARK_SET on why we emit this after /* See rationale above for MARK_SET on why we emit this after
* removing the mark, rather than removing the mark in a default * removing the mark, rather than removing the mark in a default
...@@ -1574,7 +1574,7 @@ gtk_text_buffer_get_mark (GtkTextBuffer *buffer, ...@@ -1574,7 +1574,7 @@ gtk_text_buffer_get_mark (GtkTextBuffer *buffer,
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL); g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
g_return_val_if_fail (name != NULL, NULL); g_return_val_if_fail (name != NULL, NULL);
mark = gtk_text_btree_get_mark_by_name (get_btree (buffer), name); mark = _gtk_text_btree_get_mark_by_name (get_btree (buffer), name);
return mark; return mark;
} }
...@@ -1599,7 +1599,7 @@ gtk_text_buffer_move_mark_by_name (GtkTextBuffer *buffer, ...@@ -1599,7 +1599,7 @@ gtk_text_buffer_move_mark_by_name (GtkTextBuffer *buffer,
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer)); g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
g_return_if_fail (name != NULL); g_return_if_fail (name != NULL);
mark = gtk_text_btree_get_mark_by_name (get_btree (buffer), name); mark = _gtk_text_btree_get_mark_by_name (get_btree (buffer), name);
if (mark == NULL) if (mark == NULL)
{ {
...@@ -1627,7 +1627,7 @@ gtk_text_buffer_delete_mark_by_name (GtkTextBuffer *buffer, ...@@ -1627,7 +1627,7 @@ gtk_text_buffer_delete_mark_by_name (GtkTextBuffer *buffer,
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer)); g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
g_return_if_fail (name != NULL); g_return_if_fail (name != NULL);
mark = gtk_text_btree_get_mark_by_name (get_btree (buffer), name); mark = _gtk_text_btree_get_mark_by_name (get_btree (buffer), name);
if (mark == NULL) if (mark == NULL)
{ {
...@@ -1695,7 +1695,7 @@ gtk_text_buffer_get_iter_at_child_anchor (GtkTextBuffer *buffer, ...@@ -1695,7 +1695,7 @@ gtk_text_buffer_get_iter_at_child_anchor (GtkTextBuffer *buffer,
g_return_if_fail (GTK_IS_TEXT_CHILD_ANCHOR (anchor)); g_return_if_fail (GTK_IS_TEXT_CHILD_ANCHOR (anchor));
g_return_if_fail (!gtk_text_child_anchor_get_deleted (anchor)); g_return_if_fail (!gtk_text_child_anchor_get_deleted (anchor));
gtk_text_btree_get_iter_at_child_anchor (get_btree (buffer), _gtk_text_btree_get_iter_at_child_anchor (get_btree (buffer),
iter, iter,
anchor); anchor);
} }
...@@ -1726,7 +1726,7 @@ gtk_text_buffer_place_cursor (GtkTextBuffer *buffer, ...@@ -1726,7 +1726,7 @@ gtk_text_buffer_place_cursor (GtkTextBuffer *buffer,
if (gtk_text_iter_is_last (&real)) if (gtk_text_iter_is_last (&real))
gtk_text_iter_backward_char (&real); gtk_text_iter_backward_char (&real);
gtk_text_btree_place_cursor (get_btree (buffer), &real); _gtk_text_btree_place_cursor (get_btree (buffer), &real);
gtk_text_buffer_mark_set (buffer, &real, gtk_text_buffer_mark_set (buffer, &real,
gtk_text_buffer_get_mark (buffer, gtk_text_buffer_get_mark (buffer,
"insert")); "insert"));
...@@ -1774,7 +1774,7 @@ gtk_text_buffer_real_apply_tag (GtkTextBuffer *buffer, ...@@ -1774,7 +1774,7 @@ gtk_text_buffer_real_apply_tag (GtkTextBuffer *buffer,
const GtkTextIter *start, const GtkTextIter *start,
const GtkTextIter *end) const GtkTextIter *end)
{ {
gtk_text_btree_tag (start, end, tag, TRUE); _gtk_text_btree_tag (start, end, tag, TRUE);
} }
static void static void
...@@ -1783,7 +1783,7 @@ gtk_text_buffer_real_remove_tag (GtkTextBuffer *buffer, ...@@ -1783,7 +1783,7 @@ gtk_text_buffer_real_remove_tag (GtkTextBuffer *buffer,
const GtkTextIter *start, const GtkTextIter *start,
const GtkTextIter *end) const GtkTextIter *end)
{ {
gtk_text_btree_tag (start, end, tag, FALSE); _gtk_text_btree_tag (start, end, tag, FALSE);
} }
static void static void
...@@ -1909,7 +1909,7 @@ gtk_text_buffer_get_iter_at_line_offset (GtkTextBuffer *buffer, ...@@ -1909,7 +1909,7 @@ gtk_text_buffer_get_iter_at_line_offset (GtkTextBuffer *buffer,
g_return_if_fail (iter != NULL); g_return_if_fail (iter != NULL);
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer)); g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
gtk_text_btree_get_iter_at_line_char (get_btree (buffer), __gtk_text_btree_get_iter_at_line_char (get_btree (buffer),
iter, line_number, char_offset); iter, line_number, char_offset);
} }
...@@ -1922,7 +1922,7 @@ gtk_text_buffer_get_iter_at_line_index (GtkTextBuffer *buffer, ...@@ -1922,7 +1922,7 @@ gtk_text_buffer_get_iter_at_line_index (GtkTextBuffer *buffer,
g_return_if_fail (iter != NULL); g_return_if_fail (iter != NULL);
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer)); g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
gtk_text_btree_get_iter_at_line_byte (get_btree (buffer), __gtk_text_btree_get_iter_at_line_byte (get_btree (buffer),
iter, line_number, byte_index); iter, line_number, byte_index);
} }
...@@ -1945,7 +1945,7 @@ gtk_text_buffer_get_iter_at_offset (GtkTextBuffer *buffer, ...@@ -1945,7 +1945,7 @@ gtk_text_buffer_get_iter_at_offset (GtkTextBuffer *buffer,
g_return_if_fail (iter != NULL); g_return_if_fail (iter != NULL);
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer)); g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
gtk_text_btree_get_iter_at_char (get_btree (buffer), iter, char_offset); _gtk_text_btree_get_iter_at_char (get_btree (buffer), iter, char_offset);
} }
void void
...@@ -1955,7 +1955,7 @@ gtk_text_buffer_get_last_iter (GtkTextBuffer *buffer, ...@@ -1955,7 +1955,7 @@ gtk_text_buffer_get_last_iter (GtkTextBuffer *buffer,
g_return_if_fail (iter != NULL); g_return_if_fail (iter != NULL);
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer)); g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
gtk_text_btree_get_last_iter (get_btree (buffer), iter); _gtk_text_btree_get_last_iter (get_btree (buffer), iter);
} }
void void
...@@ -1967,8 +1967,8 @@ gtk_text_buffer_get_bounds (GtkTextBuffer *buffer, ...@@ -1967,8 +1967,8 @@ gtk_text_buffer_get_bounds (GtkTextBuffer *buffer,
g_return_if_fail (end != NULL); g_return_if_fail (end != NULL);
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer)); g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
gtk_text_btree_get_iter_at_char (get_btree (buffer), start, 0); _gtk_text_btree_get_iter_at_char (get_btree (buffer), start, 0);
gtk_text_btree_get_last_iter (get_btree (buffer), end); _gtk_text_btree_get_last_iter (get_btree (buffer), end);
} }
/* /*
...@@ -2012,7 +2012,7 @@ gtk_text_buffer_get_line_count (GtkTextBuffer *buffer) ...@@ -2012,7 +2012,7 @@ gtk_text_buffer_get_line_count (GtkTextBuffer *buffer)
{ {
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), 0); g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), 0);
return gtk_text_btree_line_count (get_btree (buffer)); return _gtk_text_btree_line_count (get_btree (buffer));
} }
gint gint
...@@ -2020,7 +2020,7 @@ gtk_text_buffer_get_char_count (GtkTextBuffer *buffer) ...@@ -2020,7 +2020,7 @@ gtk_text_buffer_get_char_count (GtkTextBuffer *buffer)
{ {
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), 0); g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), 0);
return gtk_text_btree_char_count (get_btree (buffer)); return _gtk_text_btree_char_count (get_btree (buffer));
} }
/* Called when we lose the primary selection. /* Called when we lose the primary selection.
...@@ -2613,7 +2613,7 @@ gtk_text_buffer_get_selection_bounds (GtkTextBuffer *buffer, ...@@ -2613,7 +2613,7 @@ gtk_text_buffer_get_selection_bounds (GtkTextBuffer *buffer,
{ {
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE); g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
return gtk_text_btree_get_selection_bounds (get_btree (buffer), start, end); return _gtk_text_btree_get_selection_bounds (get_btree (buffer), start, end);
} }
/* /*
...@@ -2725,10 +2725,10 @@ _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer *buffer, ...@@ -2725,10 +2725,10 @@ _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer *buffer,
{ {
buffer->log_attr_cache = g_new0 (GtkTextLogAttrCache, 1); buffer->log_attr_cache = g_new0 (GtkTextLogAttrCache, 1);
buffer->log_attr_cache->chars_changed_stamp = buffer->log_attr_cache->chars_changed_stamp =
gtk_text_btree_get_chars_changed_stamp (get_btree (buffer)); _gtk_text_btree_get_chars_changed_stamp (get_btree (buffer));
} }
else if (buffer->log_attr_cache->chars_changed_stamp != else if (buffer->log_attr_cache->chars_changed_stamp !=
gtk_text_btree_get_chars_changed_stamp (get_btree (buffer))) _gtk_text_btree_get_chars_changed_stamp (get_btree (buffer)))
{ {
clear_log_attr_cache (buffer->log_attr_cache); clear_log_attr_cache (buffer->log_attr_cache);
} }
...@@ -2773,7 +2773,7 @@ _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer *buffer, ...@@ -2773,7 +2773,7 @@ _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer *buffer,
void void
_gtk_text_buffer_spew (GtkTextBuffer *buffer) _gtk_text_buffer_spew (GtkTextBuffer *buffer)
{ {
gtk_text_btree_spew (get_btree (buffer)); _gtk_text_btree_spew (get_btree (buffer));
} }
......
...@@ -142,7 +142,7 @@ child_segment_delete_func (GtkTextLineSegment *seg, ...@@ -142,7 +142,7 @@ child_segment_delete_func (GtkTextLineSegment *seg,
GSList *tmp_list; GSList *tmp_list;
GSList *copy; GSList *copy;
gtk_text_btree_unregister_child_anchor (seg->body.child.obj); _gtk_text_btree_unregister_child_anchor (seg->body.child.obj);
seg->body.child.tree = NULL; seg->body.child.tree = NULL;
seg->body.child.line = NULL; seg->body.child.line = NULL;
......
...@@ -741,12 +741,12 @@ gtk_text_layout_draw (GtkTextLayout *layout, ...@@ -741,12 +741,12 @@ gtk_text_layout_draw (GtkTextLayout *layout,
if (have_selection) if (have_selection)
{ {
GtkTextIter line_start, line_end; GtkTextIter line_start, line_end;
gint byte_count = gtk_text_line_byte_count (line); gint byte_count = _gtk_text_line_byte_count (line);
gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer), _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
&line_start, &line_start,
line, 0); line, 0);
gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer), _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
&line_end, &line_end,
line, byte_count - 1); line, byte_count - 1);
......
This diff is collapsed.
...@@ -277,7 +277,7 @@ gtk_text_layout_set_buffer (GtkTextLayout *layout, ...@@ -277,7 +277,7 @@ gtk_text_layout_set_buffer (GtkTextLayout *layout,
if (layout->buffer) if (layout->buffer)
{ {
gtk_text_btree_remove_view (_gtk_text_buffer_get_btree (layout->buffer), _gtk_text_btree_remove_view (_gtk_text_buffer_get_btree (layout->buffer),
layout); layout);
gtk_object_unref (GTK_OBJECT (layout->buffer)); gtk_object_unref (GTK_OBJECT (layout->buffer));
...@@ -291,7 +291,7 @@ gtk_text_layout_set_buffer (GtkTextLayout *layout, ...@@ -291,7 +291,7 @@ gtk_text_layout_set_buffer (GtkTextLayout *layout,
gtk_object_sink (GTK_OBJECT (buffer)); gtk_object_sink (GTK_OBJECT (buffer));
gtk_object_ref (GTK_OBJECT (buffer)); gtk_object_ref (GTK_OBJECT (buffer));
gtk_text_btree_add_view (_gtk_text_buffer_get_btree (buffer), layout); _gtk_text_btree_add_view (_gtk_text_buffer_get_btree (buffer), layout);
} }
} }
...@@ -464,11 +464,11 @@ gtk_text_layout_set_preedit_string (GtkTextLayout *layout, ...@@ -464,11 +464,11 @@ gtk_text_layout_set_preedit_string (GtkTextLayout *layout,
gtk_text_buffer_get_mark (layout->buffer, "insert")); gtk_text_buffer_get_mark (layout->buffer, "insert"));
line = gtk_text_iter_get_text_line (&iter); line = gtk_text_iter_get_text_line (&iter);
line_data = gtk_text_line_get_data (line, layout); line_data = _gtk_text_line_get_data (line, layout);
if (line_data) if (line_data)
{ {
gtk_text_layout_invalidate_cache (layout, line); gtk_text_layout_invalidate_cache (layout, line);
gtk_text_line_invalidate_wrap (line, line_data); _gtk_text_line_invalidate_wrap (line, line_data);
gtk_text_layout_invalidated (layout); gtk_text_layout_invalidated (layout);
} }
} }
...@@ -547,7 +547,7 @@ gtk_text_layout_get_lines (GtkTextLayout *layout, ...@@ -547,7 +547,7 @@ gtk_text_layout_get_lines (GtkTextLayout *layout,
retval = NULL; retval = NULL;
first_btree_line = first_btree_line =
gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer), _gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer),
layout, top_y, first_line_y); layout, top_y, first_line_y);
if (first_btree_line == NULL) if (first_btree_line == NULL)
{ {
...@@ -558,17 +558,17 @@ gtk_text_layout_get_lines (GtkTextLayout *layout, ...@@ -558,17 +558,17 @@ gtk_text_layout_get_lines (GtkTextLayout *layout,
/* -1 since bottom_y is one past */ /* -1 since bottom_y is one past */
last_btree_line = last_btree_line =
gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer), _gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer),
layout, bottom_y - 1, NULL); layout, bottom_y - 1, NULL);
if (!last_btree_line) if (!last_btree_line)
last_btree_line = last_btree_line =
gtk_text_btree_get_line (_gtk_text_buffer_get_btree (layout->buffer), _gtk_text_btree_get_line (_gtk_text_buffer_get_btree (layout->buffer),
gtk_text_btree_line_count (_gtk_text_buffer_get_btree (layout->buffer)) - 1, _gtk_text_btree_line_count (_gtk_text_buffer_get_btree (layout->buffer)) - 1,
NULL); NULL);
{ {
GtkTextLineData *ld = gtk_text_line_get_data (last_btree_line, layout); GtkTextLineData *ld = _gtk_text_line_get_data (last_btree_line, layout);
if (ld->height == 0) if (ld->height == 0)
G_BREAKPOINT (); G_BREAKPOINT ();
} }
...@@ -583,7 +583,7 @@ gtk_text_layout_get_lines (GtkTextLayout *layout, ...@@ -583,7 +583,7 @@ gtk_text_layout_get_lines (GtkTextLayout *layout,
if (line == last_btree_line) if (line == last_btree_line)
break; break;
line = gtk_text_line_next (line); line = _gtk_text_line_next (line);
} }
retval = g_slist_reverse (retval); retval = g_slist_reverse (retval);
...@@ -675,19 +675,19 @@ gtk_text_layout_real_invalidate (GtkTextLayout *layout, ...@@ -675,19 +675,19 @@ gtk_text_layout_real_invalidate (GtkTextLayout *layout,