diff options
author | Havoc Pennington <hp@pobox.com> | 2000-09-30 17:08:25 +0000 |
---|---|---|
committer | Havoc Pennington <hp@src.gnome.org> | 2000-09-30 17:08:25 +0000 |
commit | 632fda6f0bd578006226b29badcfb63729f5eba2 (patch) | |
tree | 3326ce59b9514267f898dbd4b1d7cd9f49517c7c /gtk/gtktextview.c | |
parent | f717bda19732f874762f2c48521d8370f15bf3f0 (diff) | |
download | gtk+-632fda6f0bd578006226b29badcfb63729f5eba2.tar.gz |
Handle NULL start/end pointers
2000-09-30 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.c (gtk_text_btree_get_selection_bounds): Handle
NULL start/end pointers
* gtk/gtktextbuffer.c: Write some docs
(gtk_text_buffer_get_selection_bounds): Allow start/end to be
NULL, so you can just check whether there's a selection.
* gtk/gtktextbtree.c (gtk_text_btree_remove_mark): No need to
cleanup_line or segments_changed ourselves, it gets done
in unlink_segment
* gtk/gtktextmark.h:
s/gtk_text_mark_deleted/gtk_text_mark_get_deleted/
* gtk/gtktextsegment.h: Clean up some indentation and naming mess
* gtk/gtktextmark.c: delete some more old Tk cruft
* gtk/gtktextbuffer.c (gtk_text_buffer_delete_mark): add ref to
mark before removing it, so we can emit MARK_DELETED with a valid
pointer.
(gtk_text_buffer_mark_set): hold ref across signal emission
* gtk/gtktextbtree.c (gtk_text_btree_remove_mark): improve
whining about attempts to delete special marks
* gtk/gtktextbuffer.c (_gtk_text_buffer_spew): Prepend with
underscore, since it's internal.
* gtk/gtktextbuffer.h: Remove find_string prototype, this is
now implemented in terms of iterators in gtktextiter.h
* gtk/gtktextbuffer.c (gtk_text_buffer_set_text):
New function, destructively sets contents of buffer. Also
a convenient way to clear the buffer by setting text to ""
* gtk/gtktextiter.c (gtk_text_iter_make_surreal): reformat
multiline string literal
* gtk/testtext.c (text_changed_callback): Redraw line numbers if
text changes.
* gtk/gtktextiter.c (forward_char): Return FALSE if new location
is not dereferenceable
(gtk_text_iter_forward_lines): fix return value
Diffstat (limited to 'gtk/gtktextview.c')
-rw-r--r-- | gtk/gtktextview.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 3e198bed67..fffa2bca3a 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -721,7 +721,7 @@ gtk_text_view_set_buffer (GtkTextView *text_view, gtk_text_buffer_get_iter_at_offset (text_view->buffer, &start, 0); text_view->dnd_mark = gtk_text_buffer_create_mark (text_view->buffer, - "__drag_target", + "gtk_drag_target", &start, FALSE); text_view->first_para_mark = gtk_text_buffer_create_mark (text_view->buffer, @@ -1866,7 +1866,7 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event) /* debug hack */ if (event->button == 3 && (event->state & GDK_CONTROL_MASK) != 0) - gtk_text_buffer_spew (GTK_TEXT_VIEW (widget)->buffer); + _gtk_text_buffer_spew (GTK_TEXT_VIEW (widget)->buffer); else if (event->button == 3) gtk_text_layout_spew (GTK_TEXT_VIEW (widget)->layout); @@ -3116,7 +3116,7 @@ gtk_text_view_drag_motion (GtkWidget *widget, gtk_text_buffer_move_mark (text_view->buffer, gtk_text_buffer_get_mark (text_view->buffer, - "__drag_target"), + "gtk_drag_target"), &newplace); { @@ -3130,7 +3130,7 @@ gtk_text_view_drag_motion (GtkWidget *widget, gtk_text_view_scroll_to_mark_adjusted (text_view, gtk_text_buffer_get_mark (text_view->buffer, - "__drag_target"), + "gtk_drag_target"), margin, 1.0); } @@ -3176,7 +3176,7 @@ gtk_text_view_drag_data_received (GtkWidget *widget, text_view = GTK_TEXT_VIEW (widget); drag_target_mark = gtk_text_buffer_get_mark (text_view->buffer, - "__drag_target"); + "gtk_drag_target"); if (drag_target_mark == NULL) return; |