diff options
| author | Havoc Pennington <hp@redhat.com> | 2000-12-14 23:26:59 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2000-12-14 23:26:59 +0000 |
| commit | 94ec8cff934d0d5559d6474131b3682e943bbc8e (patch) | |
| tree | 1e28209981e5b72a75bd7e49f88f0f673e3a6e29 /gtk/gtktextbuffer.c | |
| parent | 2e70f892ccf120947b4ab34a968ca4818208211d (diff) | |
| download | gdk-pixbuf-94ec8cff934d0d5559d6474131b3682e943bbc8e.tar.gz | |
remove unused call to get_last_line()
2000-12-14 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (_gtk_text_btree_validate_line): remove
unused call to get_last_line()
* gtk/gtkobject.c (gtk_object_add_arg_type): add G_TYPE_POINTER
here until boxed is working (and maybe after that - we should
really not gratuitously break old code)
* gtk/gtktexttag.c (gtk_text_tag_class_init): add commented-out
specific types for font_desc and tabs args, move them to
GTK_TYPE_POINTER for now, waiting on g_param_spec_boxed() to get
fixed. Move GdkColor args to GTK_TYPE_POINTER also.
* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): temporarily
use GTK_TYPE_POINTER for signal signatures as a hack-around
* gtk/gtk-boxed.defs: Add boxed types for PangoFontDescription and
PangoTabArray
* gtk/gtktextlayout.c (line_display_iter_to_index):
make static
(line_display_index_to_iter): make static
* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): fix marshaller
to marshal a string not a boxed
* gtk/gtkmarshal.list: add marshaller for GtkTextBuffer:insert_text
* gtk/testtext.c (fill_file_buffer): don't use g_utf8_next_char
since the UTF-8 isn't validated yet
* gtk/gtktextsegment.c (char_segment_check_func): don't require
lines to end in '\n'
* gtk/gtktextview.c (gtk_text_view_move_cursor): update to use
forward_to_delimiters, and grapheme boundaries
(gtk_text_view_delete_from_cursor): properly handle non-newline
delimiters, and grapheme boundaries
* gtk/gtktextiter.c (gtk_text_iter_forward_to_newline): rename
to gtk_text_iter_forward_to_delimiters, and make it work properly
if empty lines end with a character other than '\n'
* gtk/gtktextiter.h, gtk/gtktextiter.c: Add movement by cursor
position
Diffstat (limited to 'gtk/gtktextbuffer.c')
| -rw-r--r-- | gtk/gtktextbuffer.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c index e501b3776..276d77f81 100644 --- a/gtk/gtktextbuffer.c +++ b/gtk/gtktextbuffer.c @@ -148,11 +148,16 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTextBufferClass, insert_text), - gtk_marshal_VOID__BOXED_BOXED_INT_BOOLEAN, + gtk_marshal_VOID__BOXED_STRING_INT_BOOLEAN, GTK_TYPE_NONE, 4, +#if 0 + /* FIXME */ GTK_TYPE_TEXT_ITER, - GTK_TYPE_TEXT_ITER, + GTK_TYPE_STRING, +#endif + GTK_TYPE_POINTER, + GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_BOOL); @@ -164,8 +169,13 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) gtk_marshal_VOID__BOXED_BOXED_BOOLEAN, GTK_TYPE_NONE, 3, +#if 0 + /* FIXME */ GTK_TYPE_TEXT_ITER, GTK_TYPE_TEXT_ITER, +#endif + GTK_TYPE_POINTER, + GTK_TYPE_POINTER, GTK_TYPE_BOOL); signals[CHANGED] = @@ -410,10 +420,10 @@ gtk_text_buffer_real_insert_text (GtkTextBuffer *buffer, static void gtk_text_buffer_emit_insert (GtkTextBuffer *buffer, - GtkTextIter *iter, - const gchar *text, - gint len, - gboolean interactive) + GtkTextIter *iter, + const gchar *text, + gint len, + gboolean interactive) { g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer)); g_return_if_fail (iter != NULL); @@ -422,6 +432,8 @@ gtk_text_buffer_emit_insert (GtkTextBuffer *buffer, if (len < 0) len = strlen (text); + g_assert (g_utf8_validate (text, len, NULL)); + if (len > 0) { gtk_signal_emit (GTK_OBJECT (buffer), signals[INSERT_TEXT], |