diff options
| author | Havoc Pennington <hp@pobox.com> | 2000-11-02 02:38:22 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2000-11-02 02:38:22 +0000 |
| commit | 820e79a467e9cc95b8bb9f115d3ed11c1d248e53 (patch) | |
| tree | d57ffcd84485943349cb73e3676ce1a10a17073d | |
| parent | e667f0491207c90eddf5f7400f99ec4349f10a24 (diff) | |
| download | gtk+-820e79a467e9cc95b8bb9f115d3ed11c1d248e53.tar.gz | |
Use GTK_TYPE_TEXT_ITER and BOXED marshallers
2000-11-01 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use
GTK_TYPE_TEXT_ITER and BOXED marshallers
* gtk/gtktexttagtable.c (gtk_text_tag_table_class_init): ditto
* gtk/gtktexttag.c (gtk_text_tag_class_init): ditto
* gtk/gtk-boxed.defs: add GtkTextIter
* gtk/gtkmarshal.list: Add marshallers for text widget that
properly use OBJECT and BOXED
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 14 | ||||
| -rw-r--r-- | gtk/gtk-boxed.defs | 6 | ||||
| -rw-r--r-- | gtk/gtkmarshal.list | 7 | ||||
| -rw-r--r-- | gtk/gtkmarshalers.list | 7 | ||||
| -rw-r--r-- | gtk/gtktextbuffer.c | 38 | ||||
| -rw-r--r-- | gtk/gtktexttag.c | 6 | ||||
| -rw-r--r-- | gtk/gtktexttagtable.c | 12 |
13 files changed, 144 insertions, 30 deletions
@@ -1,3 +1,17 @@ +2000-11-01 Havoc Pennington <hp@pobox.com> + + * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use + GTK_TYPE_TEXT_ITER and BOXED marshallers + + * gtk/gtktexttagtable.c (gtk_text_tag_table_class_init): ditto + + * gtk/gtktexttag.c (gtk_text_tag_class_init): ditto + + * gtk/gtk-boxed.defs: add GtkTextIter + + * gtk/gtkmarshal.list: Add marshallers for text widget that + properly use OBJECT and BOXED + 2000-11-01 Havoc Pennington <hp@redhat.com> * gtk/testgtk.c (create_labels): Test set_markup_with_accel() diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 99952b29ad..bf65c85e01 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,17 @@ +2000-11-01 Havoc Pennington <hp@pobox.com> + + * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use + GTK_TYPE_TEXT_ITER and BOXED marshallers + + * gtk/gtktexttagtable.c (gtk_text_tag_table_class_init): ditto + + * gtk/gtktexttag.c (gtk_text_tag_class_init): ditto + + * gtk/gtk-boxed.defs: add GtkTextIter + + * gtk/gtkmarshal.list: Add marshallers for text widget that + properly use OBJECT and BOXED + 2000-11-01 Havoc Pennington <hp@redhat.com> * gtk/testgtk.c (create_labels): Test set_markup_with_accel() diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 99952b29ad..bf65c85e01 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,17 @@ +2000-11-01 Havoc Pennington <hp@pobox.com> + + * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use + GTK_TYPE_TEXT_ITER and BOXED marshallers + + * gtk/gtktexttagtable.c (gtk_text_tag_table_class_init): ditto + + * gtk/gtktexttag.c (gtk_text_tag_class_init): ditto + + * gtk/gtk-boxed.defs: add GtkTextIter + + * gtk/gtkmarshal.list: Add marshallers for text widget that + properly use OBJECT and BOXED + 2000-11-01 Havoc Pennington <hp@redhat.com> * gtk/testgtk.c (create_labels): Test set_markup_with_accel() diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 99952b29ad..bf65c85e01 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,17 @@ +2000-11-01 Havoc Pennington <hp@pobox.com> + + * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use + GTK_TYPE_TEXT_ITER and BOXED marshallers + + * gtk/gtktexttagtable.c (gtk_text_tag_table_class_init): ditto + + * gtk/gtktexttag.c (gtk_text_tag_class_init): ditto + + * gtk/gtk-boxed.defs: add GtkTextIter + + * gtk/gtkmarshal.list: Add marshallers for text widget that + properly use OBJECT and BOXED + 2000-11-01 Havoc Pennington <hp@redhat.com> * gtk/testgtk.c (create_labels): Test set_markup_with_accel() diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 99952b29ad..bf65c85e01 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,17 @@ +2000-11-01 Havoc Pennington <hp@pobox.com> + + * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use + GTK_TYPE_TEXT_ITER and BOXED marshallers + + * gtk/gtktexttagtable.c (gtk_text_tag_table_class_init): ditto + + * gtk/gtktexttag.c (gtk_text_tag_class_init): ditto + + * gtk/gtk-boxed.defs: add GtkTextIter + + * gtk/gtkmarshal.list: Add marshallers for text widget that + properly use OBJECT and BOXED + 2000-11-01 Havoc Pennington <hp@redhat.com> * gtk/testgtk.c (create_labels): Test set_markup_with_accel() diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 99952b29ad..bf65c85e01 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,17 @@ +2000-11-01 Havoc Pennington <hp@pobox.com> + + * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use + GTK_TYPE_TEXT_ITER and BOXED marshallers + + * gtk/gtktexttagtable.c (gtk_text_tag_table_class_init): ditto + + * gtk/gtktexttag.c (gtk_text_tag_class_init): ditto + + * gtk/gtk-boxed.defs: add GtkTextIter + + * gtk/gtkmarshal.list: Add marshallers for text widget that + properly use OBJECT and BOXED + 2000-11-01 Havoc Pennington <hp@redhat.com> * gtk/testgtk.c (create_labels): Test set_markup_with_accel() diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 99952b29ad..bf65c85e01 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,17 @@ +2000-11-01 Havoc Pennington <hp@pobox.com> + + * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use + GTK_TYPE_TEXT_ITER and BOXED marshallers + + * gtk/gtktexttagtable.c (gtk_text_tag_table_class_init): ditto + + * gtk/gtktexttag.c (gtk_text_tag_class_init): ditto + + * gtk/gtk-boxed.defs: add GtkTextIter + + * gtk/gtkmarshal.list: Add marshallers for text widget that + properly use OBJECT and BOXED + 2000-11-01 Havoc Pennington <hp@redhat.com> * gtk/testgtk.c (create_labels): Test set_markup_with_accel() diff --git a/gtk/gtk-boxed.defs b/gtk/gtk-boxed.defs index 32d96e9bcd..27a3e87334 100644 --- a/gtk/gtk-boxed.defs +++ b/gtk/gtk-boxed.defs @@ -1280,6 +1280,12 @@ ((GtkText text) (uint nchars))) +;; TextView + +(define-boxed GtkTextIter + gtk_text_iter_copy + gtk_text_iter_free) + ;; Alignment (define-object GtkAlignment (GtkBin)) diff --git a/gtk/gtkmarshal.list b/gtk/gtkmarshal.list index fe94981656..3b8624549d 100644 --- a/gtk/gtkmarshal.list +++ b/gtk/gtkmarshal.list @@ -31,7 +31,7 @@ BOOLEAN:POINTER,STRING,STRING,POINTER BOOLEAN:VOID ENUM:ENUM INT:INT -INT:OBJECT,BOXED,POINTER +INT:OBJECT,BOXED,BOXED INT:POINTER INT:POINTER,CHAR,CHAR INT:VOID @@ -40,6 +40,9 @@ POINTER:POINTER,INT POINTER:VOID VOID:BOOLEAN VOID:BOXED +VOID:BOXED,OBJECT +VOID:BOXED,BOXED,BOOLEAN +VOID:BOXED,BOXED,INT,BOOLEAN VOID:BOXED,UINT,FLAGS VOID:ENUM VOID:ENUM,FLOAT @@ -51,6 +54,8 @@ VOID:INT,INT,INT VOID:INT,INT,INT,INT VOID:INT,INT,POINTER VOID:OBJECT +VOID:OBJECT,BOXED,BOXED +VOID:OBJECT,BOOLEAN VOID:ENUM,INT VOID:POINTER VOID:POINTER,BOOLEAN diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list index fe94981656..3b8624549d 100644 --- a/gtk/gtkmarshalers.list +++ b/gtk/gtkmarshalers.list @@ -31,7 +31,7 @@ BOOLEAN:POINTER,STRING,STRING,POINTER BOOLEAN:VOID ENUM:ENUM INT:INT -INT:OBJECT,BOXED,POINTER +INT:OBJECT,BOXED,BOXED INT:POINTER INT:POINTER,CHAR,CHAR INT:VOID @@ -40,6 +40,9 @@ POINTER:POINTER,INT POINTER:VOID VOID:BOOLEAN VOID:BOXED +VOID:BOXED,OBJECT +VOID:BOXED,BOXED,BOOLEAN +VOID:BOXED,BOXED,INT,BOOLEAN VOID:BOXED,UINT,FLAGS VOID:ENUM VOID:ENUM,FLOAT @@ -51,6 +54,8 @@ VOID:INT,INT,INT VOID:INT,INT,INT,INT VOID:INT,INT,POINTER VOID:OBJECT +VOID:OBJECT,BOXED,BOXED +VOID:OBJECT,BOOLEAN VOID:ENUM,INT VOID:POINTER VOID:POINTER,BOOLEAN diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c index 085335be5a..0c3ded39c3 100644 --- a/gtk/gtktextbuffer.c +++ b/gtk/gtktextbuffer.c @@ -137,11 +137,11 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTextBufferClass, insert_text), - gtk_marshal_VOID__POINTER_POINTER_INT_BOOLEAN, + gtk_marshal_VOID__BOXED_BOXED_INT_BOOLEAN, GTK_TYPE_NONE, 4, - GTK_TYPE_POINTER, - GTK_TYPE_POINTER, + GTK_TYPE_TEXT_ITER, + GTK_TYPE_TEXT_ITER, GTK_TYPE_INT, GTK_TYPE_BOOL); @@ -150,11 +150,11 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTextBufferClass, delete_text), - gtk_marshal_VOID__POINTER_POINTER_BOOLEAN, + gtk_marshal_VOID__BOXED_BOXED_BOOLEAN, GTK_TYPE_NONE, 3, - GTK_TYPE_POINTER, - GTK_TYPE_POINTER, + GTK_TYPE_TEXT_ITER, + GTK_TYPE_TEXT_ITER, GTK_TYPE_BOOL); signals[CHANGED] = @@ -180,45 +180,45 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTextBufferClass, mark_set), - gtk_marshal_VOID__POINTER_POINTER, + gtk_marshal_VOID__BOXED_OBJECT, GTK_TYPE_NONE, 2, - GTK_TYPE_POINTER, - GTK_TYPE_POINTER); + GTK_TYPE_TEXT_ITER, + G_TYPE_OBJECT); signals[MARK_DELETED] = gtk_signal_new ("mark_deleted", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTextBufferClass, mark_deleted), - gtk_marshal_VOID__POINTER, + gtk_marshal_VOID__OBJECT, GTK_TYPE_NONE, 1, - GTK_TYPE_POINTER); + G_TYPE_OBJECT); signals[APPLY_TAG] = gtk_signal_new ("apply_tag", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTextBufferClass, apply_tag), - gtk_marshal_VOID__POINTER_POINTER_POINTER, + gtk_marshal_VOID__OBJECT_BOXED_BOXED, GTK_TYPE_NONE, 3, - GTK_TYPE_POINTER, - GTK_TYPE_POINTER, - GTK_TYPE_POINTER); + G_TYPE_OBJECT, + GTK_TYPE_TEXT_ITER, + GTK_TYPE_TEXT_ITER); signals[REMOVE_TAG] = gtk_signal_new ("remove_tag", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTextBufferClass, remove_tag), - gtk_marshal_VOID__POINTER_POINTER_POINTER, + gtk_marshal_VOID__OBJECT_BOXED_BOXED, GTK_TYPE_NONE, 3, - GTK_TYPE_POINTER, - GTK_TYPE_POINTER, - GTK_TYPE_POINTER); + G_TYPE_OBJECT, + GTK_TYPE_TEXT_ITER, + GTK_TYPE_TEXT_ITER); gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c index dfc46f6cc4..8f5ca5a5c3 100644 --- a/gtk/gtktexttag.c +++ b/gtk/gtktexttag.c @@ -276,12 +276,12 @@ gtk_text_tag_class_init (GtkTextTagClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTextTagClass, event), - gtk_marshal_INT__OBJECT_BOXED_POINTER, + gtk_marshal_INT__OBJECT_BOXED_BOXED, GTK_TYPE_INT, 3, - GTK_TYPE_OBJECT, + G_TYPE_OBJECT, GTK_TYPE_GDK_EVENT, - GTK_TYPE_POINTER); + GTK_TYPE_TEXT_ITER); gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); diff --git a/gtk/gtktexttagtable.c b/gtk/gtktexttagtable.c index 47cac78214..8122bd4885 100644 --- a/gtk/gtktexttagtable.c +++ b/gtk/gtktexttagtable.c @@ -63,10 +63,10 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTextTagTableClass, tag_changed), - gtk_marshal_VOID__POINTER_BOOLEAN, + gtk_marshal_VOID__OBJECT_BOOLEAN, GTK_TYPE_NONE, 2, - GTK_TYPE_OBJECT, + G_TYPE_OBJECT, GTK_TYPE_BOOL); signals[TAG_ADDED] = @@ -74,20 +74,20 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTextTagTableClass, tag_added), - gtk_marshal_VOID__POINTER, + gtk_marshal_VOID__OBJECT, GTK_TYPE_NONE, 1, - GTK_TYPE_OBJECT); + G_TYPE_OBJECT); signals[TAG_REMOVED] = gtk_signal_new ("tag_removed", GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTextTagTableClass, tag_removed), - gtk_marshal_VOID__POINTER, + gtk_marshal_VOID__OBJECT, GTK_TYPE_NONE, 1, - GTK_TYPE_OBJECT); + G_TYPE_OBJECT); gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); |