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

diff --git a/ChangeLog b/ChangeLog
index 99952b29ad7a7c3e714c019c7ff71bddc7ddf5d0..bf65c85e01fa21f3c8c7c8a6200842a57b96791e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 99952b29ad7a7c3e714c019c7ff71bddc7ddf5d0..bf65c85e01fa21f3c8c7c8a6200842a57b96791e 100644 (file)
--- 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 99952b29ad7a7c3e714c019c7ff71bddc7ddf5d0..bf65c85e01fa21f3c8c7c8a6200842a57b96791e 100644 (file)
--- 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 99952b29ad7a7c3e714c019c7ff71bddc7ddf5d0..bf65c85e01fa21f3c8c7c8a6200842a57b96791e 100644 (file)
--- 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 99952b29ad7a7c3e714c019c7ff71bddc7ddf5d0..bf65c85e01fa21f3c8c7c8a6200842a57b96791e 100644 (file)
--- 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 99952b29ad7a7c3e714c019c7ff71bddc7ddf5d0..bf65c85e01fa21f3c8c7c8a6200842a57b96791e 100644 (file)
--- 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 99952b29ad7a7c3e714c019c7ff71bddc7ddf5d0..bf65c85e01fa21f3c8c7c8a6200842a57b96791e 100644 (file)
--- 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 32d96e9bcdd20af4b7139d265cfb8acbc84cc1d3..27a3e873343f9a068ba96b8f8840409f04344167 100644 (file)
--- 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 fe94981656ceb14fdcdbf597012cd9eb8a0e8c7d..3b8624549d76be220d129611cb71bc48d4319954 100644 (file)
--- 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 fe94981656ceb14fdcdbf597012cd9eb8a0e8c7d..3b8624549d76be220d129611cb71bc48d4319954 100644 (file)
--- 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 085335be5a8b4794c4ed0f9bb368a68c7fc1dd27..0c3ded39c3191c82adcc380af99a30ade04f3dee 100644 (file)
--- 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 dfc46f6cc474a859b64b6ea361cc6e1d18711632..8f5ca5a5c3692b98ec49081ea7e855b3715a689d 100644 (file)
--- 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 47cac78214576dab64b5f4ccc212c8bd278fffb2..8122bd4885c834965ba1cecf75f038a44b3ae000 100644 (file)
--- 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);