diff options
| author | Havoc Pennington <hp@redhat.com> | 2000-11-07 21:01:02 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2000-11-07 21:01:02 +0000 |
| commit | f1de9df0511db6e82ee12c8e7f78d68d7a31cbbe (patch) | |
| tree | e7c7ec7be138908bef2c5395d50ab6710f86f6d9 /gtk/gtktextiter.h | |
| parent | 163dc54dea828d41fe12eb762c730e57444d63f3 (diff) | |
| download | gtk+-f1de9df0511db6e82ee12c8e7f78d68d7a31cbbe.tar.gz | |
rename to gtk_text_mark_get_visible
2000-11-07 Havoc Pennington <hp@redhat.com>
* gtk/gtktextmark.c (gtk_text_mark_is_visible): rename
to gtk_text_mark_get_visible
* gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): fix
bug that was generating an invalid iterator
* gtk/gtktextiter.c (gtk_text_iter_get_offset): move call to
ensure_char_offsets() in front of code placing the iter in an
invalid state.
* gtk/gtktextbuffer.c (gtk_text_buffer_paste_primary):
make override_location arg const
(paste): Replace the selection if we paste into the
current selection
* gtk/gtkselection.h: Remove "GtkSelectioData"
(struct _GtkSelectionData): move the definition here.
* gtk/gtktextbuffer.c (gtk_text_buffer_update_primary_selection):
Export the GTK_TEXT_BUFFER_CONTENTS target for in-process copies
* gtk/gtktextiter.c (gtk_text_iter_get_tags): New function
* gtk/gtktextbuffer.c (gtk_text_buffer_insert_range): implement
(gtk_text_buffer_insert_range_interactive): implement
(gtk_text_buffer_get_tags): Remove, replaced by
gtk_text_iter_get_tags()
* gtk/gtktextiter.c (gtk_text_iter_forward_search): Add a search
limit parameter, to avoid infinite linear scan.
(gtk_text_iter_backward_search): Add search limit
(gtk_text_iter_forward_find_char): Add search limit
(gtk_text_iter_backward_find_char): Add search limit
Diffstat (limited to 'gtk/gtktextiter.h')
| -rw-r--r-- | gtk/gtktextiter.h | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h index 3e649d0b40..caadecb2a2 100644 --- a/gtk/gtktextiter.h +++ b/gtk/gtktextiter.h @@ -119,6 +119,7 @@ gboolean gtk_text_iter_toggles_tag (const GtkTextIter *iter, gboolean gtk_text_iter_has_tag (const GtkTextIter *iter, GtkTextTag *tag); +GSList *gtk_text_iter_get_tags (const GtkTextIter *iter); gboolean gtk_text_iter_editable (const GtkTextIter *iter, gboolean default_setting); @@ -170,8 +171,9 @@ gboolean gtk_text_iter_forward_to_newline (GtkTextIter *iter); /* returns TRUE if a toggle was found; NULL for the tag pointer - means "any tag toggle", otherwise the next toggle of the - specified tag is located. */ + * means "any tag toggle", otherwise the next toggle of the + * specified tag is located. + */ gboolean gtk_text_iter_forward_to_tag_toggle (GtkTextIter *iter, GtkTextTag *tag); @@ -180,27 +182,30 @@ gboolean gtk_text_iter_backward_to_tag_toggle (GtkTextIter *iter, typedef gboolean (* GtkTextCharPredicate) (gunichar ch, gpointer user_data); -gboolean gtk_text_iter_forward_find_char (GtkTextIter *iter, - GtkTextCharPredicate pred, - gpointer user_data); - -gboolean gtk_text_iter_backward_find_char (GtkTextIter *iter, - GtkTextCharPredicate pred, - gpointer user_data); +gboolean gtk_text_iter_forward_find_char (GtkTextIter *iter, + GtkTextCharPredicate pred, + gpointer user_data, + const GtkTextIter *limit); +gboolean gtk_text_iter_backward_find_char (GtkTextIter *iter, + GtkTextCharPredicate pred, + gpointer user_data, + const GtkTextIter *limit); gboolean gtk_text_iter_forward_search (const GtkTextIter *iter, const gchar *str, gboolean visible_only, gboolean slice, GtkTextIter *match_start, - GtkTextIter *match_end); + GtkTextIter *match_end, + const GtkTextIter *limit); + gboolean gtk_text_iter_backward_search (const GtkTextIter *iter, const gchar *str, gboolean visible_only, gboolean slice, GtkTextIter *match_start, - GtkTextIter *match_end); - + GtkTextIter *match_end, + const GtkTextIter *limit); /* |