diff options
| author | Havoc Pennington <hp@src.gnome.org> | 2000-07-14 03:08:29 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2000-07-14 03:08:29 +0000 |
| commit | b1eda0e8ffff1b466c4b07a14257c20292060645 (patch) | |
| tree | ab0ae378ab267be492c8a9da564bf6cc2a6b4f3a | |
| parent | 2fb994ca2316a5aae08d74f008a70da5452a279e (diff) | |
| download | gtk+-gtk-hp-patches.tar.gz | |
signal marshalling fixes from GeorgeGTK_HP_PATCHES_JOIN_TO_HEAD_1gtk-hp-patches
| -rw-r--r-- | gtk/gtkmarshal.list | 1 | ||||
| -rw-r--r-- | gtk/gtkmarshalers.list | 1 | ||||
| -rw-r--r-- | gtk/gtktextbuffer.c | 26 | ||||
| -rw-r--r-- | gtk/gtktextiter.c | 2 |
4 files changed, 17 insertions, 13 deletions
diff --git a/gtk/gtkmarshal.list b/gtk/gtkmarshal.list index f47fb0d62f..7f3b864647 100644 --- a/gtk/gtkmarshal.list +++ b/gtk/gtkmarshal.list @@ -36,3 +36,4 @@ NONE:UINT NONE:UINT,POINTER,UINT,ENUM,ENUM,POINTER NONE:UINT,POINTER,UINT,UINT,ENUM NONE:UINT,STRING +NONE:POINTER,POINTER,INT diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list index f47fb0d62f..7f3b864647 100644 --- a/gtk/gtkmarshalers.list +++ b/gtk/gtkmarshalers.list @@ -36,3 +36,4 @@ NONE:UINT NONE:UINT,POINTER,UINT,ENUM,ENUM,POINTER NONE:UINT,POINTER,UINT,UINT,ENUM NONE:UINT,STRING +NONE:POINTER,POINTER,INT diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c index e2d6c78fe9..6612adf882 100644 --- a/gtk/gtktextbuffer.c +++ b/gtk/gtktextbuffer.c @@ -3,6 +3,8 @@ * Developed by Havoc Pennington */ +#include <string.h> + #include "gtkinvisible.h" #include "gtkselection.h" #include "gtksignal.h" @@ -112,10 +114,10 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTextBufferClass, insert_text), - gtk_marshal_NONE__INT_POINTER_INT, + gtk_marshal_NONE__POINTER_POINTER_INT, GTK_TYPE_NONE, 3, - GTK_TYPE_INT, + GTK_TYPE_POINTER, GTK_TYPE_POINTER, GTK_TYPE_INT); @@ -124,11 +126,11 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTextBufferClass, delete_text), - gtk_marshal_NONE__INT_INT, + gtk_marshal_NONE__POINTER_POINTER, GTK_TYPE_NONE, 2, - GTK_TYPE_INT, - GTK_TYPE_INT); + GTK_TYPE_POINTER, + GTK_TYPE_POINTER); signals[CHANGED] = gtk_signal_new ("changed", @@ -174,24 +176,24 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTextBufferClass, apply_tag), - gtk_marshal_NONE__POINTER_INT_INT, + gtk_marshal_NONE__POINTER_POINTER_POINTER, GTK_TYPE_NONE, 3, GTK_TYPE_POINTER, - GTK_TYPE_INT, - GTK_TYPE_INT); + GTK_TYPE_POINTER, + GTK_TYPE_POINTER); signals[REMOVE_TAG] = gtk_signal_new ("remove_tag", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTextBufferClass, remove_tag), - gtk_marshal_NONE__POINTER_INT_INT, + gtk_marshal_NONE__POINTER_POINTER_POINTER, GTK_TYPE_NONE, 3, GTK_TYPE_POINTER, - GTK_TYPE_INT, - GTK_TYPE_INT); + GTK_TYPE_POINTER, + GTK_TYPE_POINTER); gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); @@ -700,7 +702,7 @@ gtk_text_buffer_mark_set (GtkTextBuffer *buffer, to modify the default behavior. */ gtk_signal_emit(GTK_OBJECT(buffer), signals[MARK_SET], - &location, + location, mark); } diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c index 085b12185a..48e6b17eda 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -2494,7 +2494,7 @@ gtk_text_btree_get_iter_at_last_toggle (GtkTextBTree *tree, else { iter_init_from_byte_offset(iter, tree, line, -1); - gtk_text_iter_backward_find_tag_toggle(iter, tag); + gtk_text_iter_backward_to_tag_toggle(iter, tag); check_invariants(iter); return TRUE; } |