add varargs for properties to set on the tag.

2001-03-15  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): add varargs
	for properties to set on the tag.

	* gtk/testtext.c: fixups to reflect create_tag change

	* gtk/gtktexttag.c (gtk_text_tag_set_property):
	background/foreground stipple are objects, not boxed.

	* demos/gtk-demo/textview.c: intellihancing

2 files changed, 45 insertions, 52 deletions

diff --git a/tests/testtext.c b/tests/testtext.c
index 1969589f12..51b03d2443 100644
--- a/tests/testtext.c
+++ b/tests/testtext.c
@@ -434,7 +434,7 @@ fill_example_buffer (GtkTextBuffer *buffer)
    * we try to create tags a second time.
    */
   
-  tag = gtk_text_buffer_create_tag (buffer, "fg_blue");
+  tag = gtk_text_buffer_create_tag (buffer, "fg_blue", NULL);
 
   /*       gtk_timeout_add (1000, blink_timeout, tag); */
       
@@ -446,23 +446,23 @@ fill_example_buffer (GtkTextBuffer *buffer)
   color2.blue = 0x0;
   color2.green = 0;
   g_object_set (G_OBJECT (tag),
-		 "foreground_gdk", &color,
-		 "background_gdk", &color2,
-                  "size_points", 24.0,
-		 NULL);
+                "foreground_gdk", &color,
+                "background_gdk", &color2,
+                "size_points", 24.0,
+                NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "fg_red");
+  tag = gtk_text_buffer_create_tag (buffer, "fg_red", NULL);
 
   setup_tag (tag);
       
   color.blue = color.green = 0;
   color.red = 0xffff;
   g_object_set (G_OBJECT (tag),
-		 "rise", -4 * PANGO_SCALE,
-		 "foreground_gdk", &color,
-		 NULL);
+                "rise", -4 * PANGO_SCALE,
+                "foreground_gdk", &color,
+                NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "bg_green");
+  tag = gtk_text_buffer_create_tag (buffer, "bg_green", NULL);
 
   setup_tag (tag);
       
@@ -473,7 +473,7 @@ fill_example_buffer (GtkTextBuffer *buffer)
                 "size_points", 10.0,
                 NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "strikethrough");
+  tag = gtk_text_buffer_create_tag (buffer, "strikethrough", NULL);
 
   setup_tag (tag);
       
@@ -482,7 +482,7 @@ fill_example_buffer (GtkTextBuffer *buffer)
                 NULL);
 
 
-  tag = gtk_text_buffer_create_tag (buffer, "underline");
+  tag = gtk_text_buffer_create_tag (buffer, "underline", NULL);
 
   setup_tag (tag);
       
@@ -496,13 +496,13 @@ fill_example_buffer (GtkTextBuffer *buffer)
                 "underline", PANGO_UNDERLINE_SINGLE,
                 NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "centered");
+  tag = gtk_text_buffer_create_tag (buffer, "centered", NULL);
       
   g_object_set (G_OBJECT (tag),
                 "justification", GTK_JUSTIFY_CENTER,
                 NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "rtl_quote");
+  tag = gtk_text_buffer_create_tag (buffer, "rtl_quote", NULL);
       
   g_object_set (G_OBJECT (tag),
                 "wrap_mode", GTK_WRAP_WORD,
@@ -1413,26 +1413,23 @@ create_buffer (void)
     {
       GtkTextTag *tag;
 
-      tag = gtk_text_buffer_create_tag (buffer->buffer, NULL);
+      tag = gtk_text_buffer_create_tag (buffer->buffer, NULL, NULL);
       
       buffer->color_tags = g_slist_prepend (buffer->color_tags, tag);
       
       ++i;
     }
   
-  buffer->invisible_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL);
-  g_object_set (G_OBJECT (buffer->invisible_tag),
-                  "invisible", TRUE,
-                  NULL);
+  buffer->invisible_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL,
+                                                      "invisible", TRUE);
   
-  buffer->not_editable_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL);
-  g_object_set (G_OBJECT (buffer->not_editable_tag),
-                  "editable", FALSE,
-                  "foreground", "purple", NULL);
+  buffer->not_editable_tag =
+    gtk_text_buffer_create_tag (buffer->buffer, NULL,
+                                "editable", FALSE,
+                                "foreground", "purple", NULL);
 
-  buffer->found_text_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL);
-  g_object_set (G_OBJECT (buffer->found_text_tag),
-                  "foreground", "red", NULL);
+  buffer->found_text_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL,
+                                                       "foreground", "red", NULL);
 
   tabs = pango_tab_array_new_with_positions (4,
                                              TRUE,
@@ -1441,10 +1438,9 @@ create_buffer (void)
                                              PANGO_TAB_LEFT, 60,
                                              PANGO_TAB_LEFT, 120);
   
-  buffer->custom_tabs_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL);
-  g_object_set (G_OBJECT (buffer->custom_tabs_tag),
-                  "tabs", tabs,
-                  "foreground", "green", NULL);
+  buffer->custom_tabs_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL,
+                                                        "tabs", tabs,
+                                                        "foreground", "green", NULL);
 
   pango_tab_array_free (tabs);
   
diff --git a/tests/testtextbuffer.c b/tests/testtextbuffer.c
index 0d42dcb19a..bc94c69c4c 100644
--- a/tests/testtextbuffer.c
+++ b/tests/testtextbuffer.c
@@ -585,36 +585,33 @@ fill_buffer (GtkTextBuffer *buffer)
   GdkPixbuf *pixbuf;
   int i;
 
-  tag = gtk_text_buffer_create_tag (buffer, "fg_blue");
-
   color.red = color.green = 0;
   color.blue = 0xffff;
   color2.red = 0xfff;
   color2.blue = 0x0;
   color2.green = 0;
-  g_object_set (G_OBJECT (tag),
-                "foreground_gdk", &color,
-                "background_gdk", &color2,
-                "font", "-*-courier-bold-r-*-*-30-*-*-*-*-*-*-*",
-                NULL);
-
-  tag = gtk_text_buffer_create_tag (buffer, "fg_red");
+  
+  gtk_text_buffer_create_tag (buffer, "fg_blue",
+                              "foreground_gdk", &color,
+                              "background_gdk", &color2,
+                              "font", "-*-courier-bold-r-*-*-30-*-*-*-*-*-*-*",
+                              NULL);
 
   color.blue = color.green = 0;
   color.red = 0xffff;
-  g_object_set (G_OBJECT (tag),
-                "rise", -4,
-                "foreground_gdk", &color,
-                NULL);
-
-  tag = gtk_text_buffer_create_tag (buffer, "bg_green");
+  
+  gtk_text_buffer_create_tag (buffer, "fg_red",
+                              "rise", -4,
+                              "foreground_gdk", &color,
+                              NULL);
 
   color.blue = color.red = 0;
   color.green = 0xffff;
-  g_object_set (G_OBJECT (tag),
-                "background_gdk", &color,
-                "font", "-*-courier-bold-r-*-*-10-*-*-*-*-*-*-*",
-                NULL);
+  
+  gtk_text_buffer_create_tag (buffer, "bg_green",
+                              "background_gdk", &color,
+                              "font", "-*-courier-bold-r-*-*-10-*-*-*-*-*-*-*",
+                              NULL);
 
   pixbuf = gdk_pixbuf_new_from_xpm_data (book_closed_xpm);
 
@@ -708,13 +705,13 @@ fill_buffer (GtkTextBuffer *buffer)
   /* Put in tags that are just at the beginning, and just near the end,
    * and just near the middle.
    */
-  tag = gtk_text_buffer_create_tag (buffer, "front_tag");
+  tag = gtk_text_buffer_create_tag (buffer, "front_tag", NULL);
   gtk_text_buffer_get_iter_at_offset (buffer, &iter, 3);
   gtk_text_buffer_get_iter_at_offset (buffer, &iter2, 300);
 
   gtk_text_buffer_apply_tag (buffer, tag, &iter, &iter2);  
   
-  tag = gtk_text_buffer_create_tag (buffer, "end_tag");
+  tag = gtk_text_buffer_create_tag (buffer, "end_tag", NULL);
   gtk_text_buffer_get_end_iter (buffer, &iter2);
   gtk_text_iter_backward_chars (&iter2, 12);
   iter = iter2;
@@ -722,7 +719,7 @@ fill_buffer (GtkTextBuffer *buffer)
 
   gtk_text_buffer_apply_tag (buffer, tag, &iter, &iter2);
   
-  tag = gtk_text_buffer_create_tag (buffer, "center_tag");
+  tag = gtk_text_buffer_create_tag (buffer, "center_tag", NULL);
   gtk_text_buffer_get_iter_at_offset (buffer, &iter,
                                       gtk_text_buffer_get_char_count (buffer)/2);
   gtk_text_iter_backward_chars (&iter, 37);