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
This commit is contained in:
Havoc Pennington 2000-11-02 02:38:22 +00:00 committed by Havoc Pennington
parent e667f04912
commit 820e79a467
13 changed files with 144 additions and 30 deletions

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -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))

View File

@ -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

View File

@ -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

View File

@ -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);

View File

@ -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);

View File

@ -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);