Doc comment fixing. (Mostly non-matching parameter names.)

Thu Sep  7 11:47:02 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtktextbuffer.c gtk/gtkimcontext.c gtk/gtkwidget.c:
	Doc comment fixing. (Mostly non-matching parameter names.)

	* gtk/gtkcalendar.c gtk/gtklist.c gtk/gtknotebook.c: Modify
	comments a little to avoid looking like a doc comment.

	* gtk/gtkspinbutton.h (GTK_INPUT_ERROR): Change INPUT_ERROR to
	GTK_INPUT_ERROR. (Should the mechanism for erros in spin button
	conversions be changed to GError?)

	* gtk/gtkcolorsel.c (GTK_CUSTOM_PALETTE_WIDTH/HEIGHT):
	Move private #defines into .c file.

	* gtk/gtktexttag.c (gtk_text_tag_class_init): Alphabetize
	order of argument addition, remove duplicates.

	* gtk/gtkaspectframe.h (struct _GtkAspectFrameClass):
	parent class is FrameClass, not BinClass.

	* gtk/gtk.h: Add gtkinvisible, which was missing.
	(It's occasionalyl useful for client apps, if seldom.)

	* gdk/gdktypes.h: Remove obsolete GDK_CORE_POINTER
	#define.

22 files changed, 96 insertions, 113 deletions

diff --git a/gdk/gdkkeyuni.c b/gdk/gdkkeyuni.c
index b3793cc80..2c37033c6 100644
--- a/gdk/gdkkeyuni.c
+++ b/gdk/gdkkeyuni.c
@@ -800,7 +800,7 @@ static struct {
 
 /**
  * gdk_keyval_to_unicode:
- * @keysym: a GDK key symbol 
+ * @keyval: a GDK key symbol 
  * 
  * Convert from a GDK key symbol to the corresponding ISO10646 (Unicode)
  * character.
@@ -809,28 +809,28 @@ static struct {
  *               is no corresponding character.
  **/
 guint32
-gdk_keyval_to_unicode (guint keysym)
+gdk_keyval_to_unicode (guint keyval)
 {
   int min = 0;
   int max = G_N_ELEMENTS (gdk_keysym_to_unicode_tab) - 1;
   int mid;
 
   /* First check for Latin-1 characters (1:1 mapping) */
-  if ((keysym >= 0x0020 && keysym <= 0x007e) ||
-      (keysym >= 0x00a0 && keysym <= 0x00ff))
-    return keysym;
+  if ((keyval >= 0x0020 && keyval <= 0x007e) ||
+      (keyval >= 0x00a0 && keyval <= 0x00ff))
+    return keyval;
 
   /* Also check for directly encoded 24-bit UCS characters:
    */
-  if ((keysym & 0xff000000) == 0x01000000)
-    return keysym & 0x00ffffff;
+  if ((keyval & 0xff000000) == 0x01000000)
+    return keyval & 0x00ffffff;
 
   /* binary search in table */
   while (max >= min) {
     mid = (min + max) / 2;
-    if (gdk_keysym_to_unicode_tab[mid].keysym < keysym)
+    if (gdk_keysym_to_unicode_tab[mid].keysym < keyval)
       min = mid + 1;
-    else if (gdk_keysym_to_unicode_tab[mid].keysym > keysym)
+    else if (gdk_keysym_to_unicode_tab[mid].keysym > keyval)
       max = mid - 1;
     else {
       /* found it */
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index ba78b0472..aeaccb980 100644
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -55,8 +55,6 @@
 #define GDK_CURRENT_TIME     0L
 #define GDK_PARENT_RELATIVE  1L
 
-/* special deviceid for core pointer events */
-#define GDK_CORE_POINTER 0xfedc
 
 
 #ifdef __cplusplus
diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c
index 95c83a27c..de2749cf9 100644
--- a/gdk/x11/gdkinput.c
+++ b/gdk/x11/gdkinput.c
@@ -327,7 +327,7 @@ gdk_input_exit (void)
 
 /**
  * gdk_device_get_axis:
- * @axis: a #GdkDevice
+ * @device: a #GdkDevice
  * @axes: pointer to an array of axes
  * @use: the use to look for
  * @value: location to store the found value.
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 73ec1fe31..d4741a4f7 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -465,8 +465,8 @@ gdk_window_new (GdkWindow     *parent,
 
   draw_impl->xid = XCreateWindow (GDK_WINDOW_XDISPLAY (parent),
                                   xparent,
-                                  x, y,
-                                  impl->width, impl->height,
+                                  impl->position_info.x, impl->position_info.y,
+                                  impl->position_info.width, impl->position_info.height,
                                   0, depth, class, xvisual,
                                   xattributes_mask, &xattributes);
 
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 1ac309b26..1f335cefa 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -187,7 +187,9 @@ gtk_semipublic_h_sources = @STRIP_BEGIN@ \
 
 # GTK+ header files that don't get installed
 gtk_private_h_sources = @STRIP_BEGIN@ \
+	gtktexttagprivate.h	\
 @STRIP_END@
+
 # GTK+ C sources to build the library from
 gtk_c_sources = @STRIP_BEGIN@ \
 	gtkaccelgroup.c		\
@@ -295,7 +297,6 @@ gtk_c_sources = @STRIP_BEGIN@ \
 	gtktextmarkprivate.h	\
 	gtktextsegment.c	\
 	gtktexttag.c		\
-	gtktexttagprivate.h	\
 	gtktexttagtable.c	\
 	gtktexttypes.c		\
 	gtktextview.c		\
diff --git a/gtk/gtk.h b/gtk/gtk.h
index c1fc06f8a..2b2ad43d3 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -75,7 +75,10 @@
 #include <gtk/gtkhscrollbar.h>
 #include <gtk/gtkhseparator.h>
 #include <gtk/gtkimage.h>
+#include <gtk/gtkimcontext.h>
+#include <gtk/gtkimmulticontext.h>
 #include <gtk/gtkinputdialog.h>
+#include <gtk/gtkinvisible.h>
 #include <gtk/gtkitem.h>
 #include <gtk/gtkitemfactory.h>
 #include <gtk/gtklabel.h>
diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h
index 1df1293d3..0bb0603b6 100644
--- a/gtk/gtkaspectframe.h
+++ b/gtk/gtkaspectframe.h
@@ -62,7 +62,7 @@ struct _GtkAspectFrame
 
 struct _GtkAspectFrameClass
 {
-  GtkBinClass parent_class;
+  GtkFrameClass parent_class;
 };
 
 
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 056530194..90b2c8d0d 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -160,7 +160,7 @@ dates_difference(N_int year1, N_int mm1, N_int dd1,
   return( calc_days(year2, mm2, dd2) - calc_days(year1, mm1, dd1) );
 }
 
-/** END OF lib_date routines ************************************************/
+/*** END OF lib_date routines ********************************************/
 
 #define CALENDAR_MARGIN		 0
 #define CALENDAR_YSEP		 4
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index c39b85407..8093a0221 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -58,13 +58,15 @@
 #include "gtkhseparator.h"
 #include "gtkintl.h"
 
+/* Number of elements in the custom palatte */
+#define GTK_CUSTOM_PALETTE_WIDTH 10
+#define GTK_CUSTOM_PALETTE_HEIGHT 2
+
 enum {
   COLOR_CHANGED,
   LAST_SIGNAL
 };
 
-
-
 enum {
   COLORSEL_RED = 0,
   COLORSEL_GREEN = 1,
@@ -1504,7 +1506,6 @@ gtk_color_selection_destroy (GtkObject *object)
 
 /**
  * gtk_color_selection_new:
- * @void: 
  * 
  * Creates a new GtkColorSelection.
  * 
diff --git a/gtk/gtkcolorsel.h b/gtk/gtkcolorsel.h
index 2dd8ecdd9..4044d4c1c 100644
--- a/gtk/gtkcolorsel.h
+++ b/gtk/gtkcolorsel.h
@@ -43,10 +43,6 @@ extern "C" {
 #define GTK_COLOR_SELECTION_GET_CLASS(obj)              (GTK_CHECK_GET_CLAS ((obj), GTK_TYPE_COLOR_SELECTION, GtkColorSelectionClass))
 
 
-/* Number of elements in the custom palatte */
-#define GTK_CUSTOM_PALETTE_WIDTH 10
-#define GTK_CUSTOM_PALETTE_HEIGHT 2
-
 typedef struct _GtkColorSelection       GtkColorSelection;
 typedef struct _GtkColorSelectionClass  GtkColorSelectionClass;
 
diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index 89b97bfc0..6eb3f4dec 100644
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -75,7 +75,7 @@ void       gtk_frame_set_label        (GtkFrame      *frame,
 /* Temporarily commented out until memory management behavior is figured out */
 /* gchar *    gtk_frame_get_label        (GtkFrame      *frame); */
 void       gtk_frame_set_label_widget (GtkFrame      *frame,
-				       GtkWidget     *title_widget);
+				       GtkWidget     *label_widget);
 void       gtk_frame_set_label_align  (GtkFrame      *frame,
 				       gfloat         xalign,
 				       gfloat         yalign);
diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c
index 54015839b..70b3a6d8f 100644
--- a/gtk/gtkimcontext.c
+++ b/gtk/gtkimcontext.c
@@ -189,7 +189,7 @@ gtk_im_context_get_preedit_string (GtkIMContext   *context,
 /**
  * gtk_im_context_filter_keypress:
  * @context: a #GtkIMContext
- * @key: the key event
+ * @event: the key event
  * 
  * Allow an input method to internally handle a key press event.
  * if this function returns %TRUE, then no further processing
diff --git a/gtk/gtklist.c b/gtk/gtklist.c
index 6c8cb9935..de3eeb987 100644
--- a/gtk/gtklist.c
+++ b/gtk/gtklist.c
@@ -44,7 +44,7 @@ enum {
 
 #define SCROLL_TIME  100
 
-/** GtkList Methods **/
+/*** GtkList Methods ***/
 static void gtk_list_class_init	     (GtkListClass   *klass);
 static void gtk_list_init	     (GtkList	     *list);
 static void gtk_list_set_arg         (GtkObject      *object,
@@ -53,10 +53,10 @@ static void gtk_list_set_arg         (GtkObject      *object,
 static void gtk_list_get_arg         (GtkObject      *object,
 				      GtkArg         *arg,
 				      guint           arg_id);
-/** GtkObject Methods **/
+/*** GtkObject Methods ***/
 static void gtk_list_shutdown	     (GObject	     *object);
 
-/** GtkWidget Methods **/
+/*** GtkWidget Methods ***/
 static void gtk_list_size_request    (GtkWidget	     *widget,
 				      GtkRequisition *requisition);
 static void gtk_list_size_allocate   (GtkWidget	     *widget,
@@ -77,7 +77,7 @@ static gint gtk_list_button_press    (GtkWidget      *widget,
 static gint gtk_list_button_release  (GtkWidget	     *widget,
 				      GdkEventButton *event);
 
-/** GtkContainer Methods **/
+/*** GtkContainer Methods ***/
 static void gtk_list_add	     (GtkContainer     *container,
 				      GtkWidget        *widget);
 static void gtk_list_remove	     (GtkContainer     *container,
@@ -92,7 +92,7 @@ static void gtk_list_set_focus_child (GtkContainer     *container,
 static gint gtk_list_focus           (GtkContainer     *container,
 				      GtkDirectionType  direction);
 
-/** GtkList Private Functions **/
+/*** GtkList Private Functions ***/
 static void gtk_list_move_focus_child      (GtkList       *list,
 					    GtkScrollType  scroll_type,
 					    gfloat         position);
@@ -102,13 +102,13 @@ static void gtk_list_remove_items_internal (GtkList       *list,
 					    GList         *items,
 					    gboolean       no_unref);
 
-/** GtkList Selection Methods **/
+/*** GtkList Selection Methods ***/
 static void gtk_real_list_select_child	        (GtkList   *list,
 						 GtkWidget *child);
 static void gtk_real_list_unselect_child        (GtkList   *list,
 						 GtkWidget *child);
 
-/** GtkList Selection Functions **/
+/*** GtkList Selection Functions ***/
 static void gtk_list_set_anchor                 (GtkList   *list,
 					         gboolean   add_mode,
 					         gint       anchor,
@@ -121,7 +121,7 @@ static void gtk_list_update_extended_selection  (GtkList   *list,
 					         gint       row);
 static void gtk_list_reset_extended_selection   (GtkList   *list);
 
-/** GtkListItem Signal Functions **/
+/*** GtkListItem Signal Functions ***/
 static void gtk_list_signal_drag_begin         (GtkWidget      *widget,
 						GdkDragContext *context,
 						GtkList        *list);
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 271a4dc2a..839c77811 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -78,11 +78,11 @@ enum {
   CHILD_ARG_TAB_PACK
 };
 
-/** GtkNotebook Methods **/
+/*** GtkNotebook Methods ***/
 static void gtk_notebook_class_init          (GtkNotebookClass *klass);
 static void gtk_notebook_init                (GtkNotebook      *notebook);
 
-/** GtkObject Methods **/
+/*** GtkObject Methods ***/
 static void gtk_notebook_destroy             (GtkObject        *object);
 static void gtk_notebook_set_arg             (GtkObject        *object,
 				              GtkArg           *arg,
@@ -91,7 +91,7 @@ static void gtk_notebook_get_arg	     (GtkObject        *object,
 					      GtkArg           *arg,
 					      guint             arg_id);
 
-/** GtkWidget Methods **/
+/*** GtkWidget Methods ***/
 static void gtk_notebook_map                 (GtkWidget        *widget);
 static void gtk_notebook_unmap               (GtkWidget        *widget);
 static void gtk_notebook_realize             (GtkWidget        *widget);
@@ -124,7 +124,7 @@ static void gtk_notebook_draw_focus          (GtkWidget        *widget);
 static void gtk_notebook_style_set           (GtkWidget        *widget,
 					      GtkStyle         *previous_style);
 
-/** GtkContainer Methods **/
+/*** GtkContainer Methods ***/
 static void gtk_notebook_set_child_arg	     (GtkContainer     *container,
 					      GtkWidget        *child,
 					      GtkArg           *arg,
@@ -147,7 +147,7 @@ static void gtk_notebook_forall              (GtkContainer     *container,
 					      GtkCallback       callback,
 					      gpointer          callback_data);
 
-/** GtkNotebook Private Functions **/
+/*** GtkNotebook Private Functions ***/
 static void gtk_notebook_panel_realize       (GtkNotebook      *notebook);
 static void gtk_notebook_expose_tabs         (GtkNotebook      *notebook);
 static void gtk_notebook_focus_changed       (GtkNotebook      *notebook,
@@ -165,7 +165,7 @@ static GList * gtk_notebook_search_page      (GtkNotebook      *notebook,
 					      gint              direction,
 					      gboolean          find_visible);
 
-/** GtkNotebook Drawing Functions **/
+/*** GtkNotebook Drawing Functions ***/
 static void gtk_notebook_paint               (GtkWidget        *widget,
 					      GdkRectangle     *area);
 static void gtk_notebook_draw_tab            (GtkNotebook      *notebook,
@@ -175,7 +175,7 @@ static void gtk_notebook_draw_arrow          (GtkNotebook      *notebook,
 					      guint             arrow);
 static void gtk_notebook_set_shape           (GtkNotebook      *notebook);
 
-/** GtkNotebook Size Allocate Functions **/
+/*** GtkNotebook Size Allocate Functions ***/
 static void gtk_notebook_pages_allocate      (GtkNotebook      *notebook,
 					      GtkAllocation    *allocation);
 static void gtk_notebook_page_allocate       (GtkNotebook      *notebook,
@@ -187,12 +187,12 @@ static void gtk_notebook_calc_tabs           (GtkNotebook      *notebook,
 					      gint             *tab_space,
 					      guint             direction);
 
-/** GtkNotebook Page Switch Methods **/
+/*** GtkNotebook Page Switch Methods ***/
 static void gtk_notebook_real_switch_page    (GtkNotebook      *notebook,
 					      GtkNotebookPage  *page,
 					      guint             page_num);
 
-/** GtkNotebook Page Switch Functions **/
+/*** GtkNotebook Page Switch Functions ***/
 static void gtk_notebook_switch_page         (GtkNotebook      *notebook,
 					      GtkNotebookPage  *page,
 					      gint              page_num);
@@ -202,7 +202,7 @@ static void gtk_notebook_switch_focus_tab    (GtkNotebook      *notebook,
 static void gtk_notebook_menu_switch_page    (GtkWidget        *widget,
 					      GtkNotebookPage  *page);
 
-/** GtkNotebook Menu Functions **/
+/*** GtkNotebook Menu Functions ***/
 static void gtk_notebook_menu_item_create    (GtkNotebook      *notebook,
 					      GList            *list);
 static void gtk_notebook_menu_label_unparent (GtkWidget        *widget,
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 2a79fb490..9b400cefa 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -1351,7 +1351,7 @@ gtk_spin_button_default_input (GtkSpinButton *spin_button,
 
   *new_val = strtod (gtk_entry_get_text (GTK_ENTRY (spin_button)), &err);
   if (*err)
-    return INPUT_ERROR;
+    return GTK_INPUT_ERROR;
   else
     return FALSE;
 }
@@ -1656,9 +1656,9 @@ gtk_spin_button_update (GtkSpinButton *spin_button)
   if (return_val == FALSE)
     {
       return_val = gtk_spin_button_default_input (spin_button, &val);
-      error = (return_val == INPUT_ERROR);
+      error = (return_val == GTK_INPUT_ERROR);
     }
-  else if (return_val == INPUT_ERROR)
+  else if (return_val == GTK_INPUT_ERROR)
     error = 1;
 
   if (spin_button->update_policy == GTK_UPDATE_ALWAYS)
diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h
index 220969eb6..2f46ebdcb 100644
--- a/gtk/gtkspinbutton.h
+++ b/gtk/gtkspinbutton.h
@@ -48,7 +48,7 @@ extern "C" {
 #define GTK_IS_SPIN_BUTTON_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SPIN_BUTTON))
 #define GTK_SPIN_BUTTON_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_SPIN_BUTTON, GtkSpinButtonClass))
 
-#define INPUT_ERROR -1
+#define GTK_INPUT_ERROR -1
 
 typedef enum
 {
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 986990215..52f7e664d 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -478,7 +478,7 @@ gtk_text_buffer_insert_at_cursor (GtkTextBuffer *buffer,
  * @iter: a position in @buffer
  * @text: some UTF-8 text
  * @len: length of text in bytes, or -1
- * @editable_by_default: default editability of buffer
+ * @default_editable: default editability of buffer
  * 
  * Like gtk_text_buffer_insert(), but the insertion will not occur if
  * @iter is at a non-editable location in the buffer.  Usually you
@@ -492,12 +492,12 @@ gtk_text_buffer_insert_interactive(GtkTextBuffer *buffer,
                                    GtkTextIter   *iter,
                                    const gchar   *text,
                                    gint           len,
-                                   gboolean       editable_by_default)
+                                   gboolean       default_editable)
 {
   g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), FALSE);
   g_return_val_if_fail(text != NULL, FALSE);
   
-  if (gtk_text_iter_editable (iter, editable_by_default))
+  if (gtk_text_iter_editable (iter, default_editable))
     {
       gtk_text_buffer_emit_insert (buffer, iter, text, len, TRUE);
       return TRUE;
diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h
index 63a620c8d..7680294b7 100644
--- a/gtk/gtktextbuffer.h
+++ b/gtk/gtktextbuffer.h
@@ -123,8 +123,8 @@ gboolean gtk_text_buffer_insert_interactive_at_cursor (GtkTextBuffer *buffer,
 
 /* Delete from the buffer */
 void     gtk_text_buffer_delete             (GtkTextBuffer *buffer,
-                                             GtkTextIter   *start_iter,
-                                             GtkTextIter   *end_iter);
+                                             GtkTextIter   *start,
+                                             GtkTextIter   *end);
 gboolean gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
                                              GtkTextIter   *start_iter,
                                              GtkTextIter   *end_iter,
@@ -134,13 +134,13 @@ gboolean gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
 
 /* Obtain strings from the buffer */
 gchar          *gtk_text_buffer_get_text            (GtkTextBuffer     *buffer,
-                                                     const GtkTextIter *start_iter,
-                                                     const GtkTextIter *end_iter,
+                                                     const GtkTextIter *start,
+                                                     const GtkTextIter *end,
                                                      gboolean           include_hidden_chars);
 
 gchar          *gtk_text_buffer_get_slice           (GtkTextBuffer     *buffer,
-                                                     const GtkTextIter *start_iter,
-                                                     const GtkTextIter *end_iter,
+                                                     const GtkTextIter *start,
+                                                     const GtkTextIter *end,
                                                      gboolean           include_hidden_chars);
 
 /* Insert a pixmap */
diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index e5152af61..724f648c6 100644
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -172,112 +172,96 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
   /* Style args */
   gtk_object_add_arg_type ("GtkTextTag::background", GTK_TYPE_STRING,
                            GTK_ARG_WRITABLE, ARG_BACKGROUND);
-  gtk_object_add_arg_type ("GtkTextTag::foreground", GTK_TYPE_STRING,
-                           GTK_ARG_WRITABLE, ARG_FOREGROUND);
   gtk_object_add_arg_type ("GtkTextTag::background_gdk", GTK_TYPE_GDK_COLOR,
                            GTK_ARG_READWRITE, ARG_BACKGROUND_GDK);
-  gtk_object_add_arg_type ("GtkTextTag::foreground_gdk", GTK_TYPE_GDK_COLOR,
-                           GTK_ARG_READWRITE, ARG_FOREGROUND_GDK);
+  gtk_object_add_arg_type ("GtkTextTag::background_full_height", GTK_TYPE_BOOL,
+                           GTK_ARG_READWRITE, ARG_BG_FULL_HEIGHT);
   gtk_object_add_arg_type ("GtkTextTag::background_stipple",
                            GDK_TYPE_PIXMAP,
                            GTK_ARG_READWRITE, ARG_BACKGROUND_STIPPLE);
-  gtk_object_add_arg_type ("GtkTextTag::foreground_stipple",
-                           GDK_TYPE_PIXMAP,
-                           GTK_ARG_READWRITE, ARG_FOREGROUND_STIPPLE);
+  gtk_object_add_arg_type ("GtkTextTag::direction", GTK_TYPE_ENUM,
+                           GTK_ARG_READWRITE, ARG_DIRECTION);
+  gtk_object_add_arg_type ("GtkTextTag::editable", GTK_TYPE_BOOL,
+                           GTK_ARG_READWRITE, ARG_EDITABLE);
   gtk_object_add_arg_type ("GtkTextTag::font", GTK_TYPE_STRING,
                            GTK_ARG_READWRITE, ARG_FONT);
   gtk_object_add_arg_type ("GtkTextTag::font_desc", GTK_TYPE_BOXED,
                            GTK_ARG_READWRITE, ARG_FONT_DESC);
-  gtk_object_add_arg_type ("GtkTextTag::pixels_above_lines", GTK_TYPE_INT,
-                           GTK_ARG_READWRITE, ARG_PIXELS_ABOVE_LINES);
-  gtk_object_add_arg_type ("GtkTextTag::pixels_below_lines", GTK_TYPE_INT,
-                           GTK_ARG_READWRITE, ARG_PIXELS_BELOW_LINES);
-  gtk_object_add_arg_type ("GtkTextTag::pixels_inside_wrap", GTK_TYPE_INT,
-                           GTK_ARG_READWRITE, ARG_PIXELS_INSIDE_WRAP);
-  gtk_object_add_arg_type ("GtkTextTag::editable", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_EDITABLE);
-  gtk_object_add_arg_type ("GtkTextTag::wrap_mode", GTK_TYPE_ENUM,
-                           GTK_ARG_READWRITE, ARG_WRAP_MODE);
+  gtk_object_add_arg_type ("GtkTextTag::foreground", GTK_TYPE_STRING,
+                           GTK_ARG_WRITABLE, ARG_FOREGROUND);
+  gtk_object_add_arg_type ("GtkTextTag::foreground_gdk", GTK_TYPE_GDK_COLOR,
+                           GTK_ARG_READWRITE, ARG_FOREGROUND_GDK);
+  gtk_object_add_arg_type ("GtkTextTag::foreground_stipple",
+                           GDK_TYPE_PIXMAP,
+                           GTK_ARG_READWRITE, ARG_FOREGROUND_STIPPLE);
   gtk_object_add_arg_type ("GtkTextTag::justify", GTK_TYPE_ENUM,
                            GTK_ARG_READWRITE, ARG_JUSTIFY);
-  gtk_object_add_arg_type ("GtkTextTag::direction", GTK_TYPE_ENUM,
-                           GTK_ARG_READWRITE, ARG_DIRECTION);
+  gtk_object_add_arg_type ("GtkTextTag::language", GTK_TYPE_STRING,
+                           GTK_ARG_READWRITE, ARG_LANGUAGE);
   gtk_object_add_arg_type ("GtkTextTag::left_margin", GTK_TYPE_INT,
                            GTK_ARG_READWRITE, ARG_LEFT_MARGIN);
   gtk_object_add_arg_type ("GtkTextTag::left_wrapped_line_margin", GTK_TYPE_INT,
                            GTK_ARG_READWRITE, ARG_LEFT_WRAPPED_LINE_MARGIN);
+  gtk_object_add_arg_type ("GtkTextTag::offset", GTK_TYPE_INT,
+                           GTK_ARG_READWRITE, ARG_OFFSET);
   gtk_object_add_arg_type ("GtkTextTag::overstrike", GTK_TYPE_BOOL,
                            GTK_ARG_READWRITE, ARG_OVERSTRIKE);
-  gtk_object_add_arg_type ("GtkTextTag::right_margin", GTK_TYPE_INT,
-                           GTK_ARG_READWRITE, ARG_RIGHT_MARGIN);
   gtk_object_add_arg_type ("GtkTextTag::pixels_above_lines", GTK_TYPE_INT,
                            GTK_ARG_READWRITE, ARG_PIXELS_ABOVE_LINES);
   gtk_object_add_arg_type ("GtkTextTag::pixels_below_lines", GTK_TYPE_INT,
                            GTK_ARG_READWRITE, ARG_PIXELS_BELOW_LINES);
   gtk_object_add_arg_type ("GtkTextTag::pixels_inside_wrap", GTK_TYPE_INT,
                            GTK_ARG_READWRITE, ARG_PIXELS_INSIDE_WRAP);
+  gtk_object_add_arg_type ("GtkTextTag::right_margin", GTK_TYPE_INT,
+                           GTK_ARG_READWRITE, ARG_RIGHT_MARGIN);
   gtk_object_add_arg_type ("GtkTextTag::underline", GTK_TYPE_ENUM,
                            GTK_ARG_READWRITE, ARG_UNDERLINE);
   gtk_object_add_arg_type ("GtkTextTag::wrap_mode", GTK_TYPE_ENUM,
                            GTK_ARG_READWRITE, ARG_WRAP_MODE);
-  gtk_object_add_arg_type ("GtkTextTag::offset", GTK_TYPE_INT,
-                           GTK_ARG_READWRITE, ARG_OFFSET);
-  gtk_object_add_arg_type ("GtkTextTag::background_full_height", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_BG_FULL_HEIGHT);
-  gtk_object_add_arg_type ("GtkTextTag::language", GTK_TYPE_STRING,
-                           GTK_ARG_READWRITE, ARG_LANGUAGE);
   
   /* Style args are set or not */
   gtk_object_add_arg_type ("GtkTextTag::background_set", GTK_TYPE_BOOL,
                            GTK_ARG_READWRITE, ARG_BACKGROUND_SET);
-  gtk_object_add_arg_type ("GtkTextTag::foreground_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_FOREGROUND_SET);
+  gtk_object_add_arg_type ("GtkTextTag::background_full_height_set", GTK_TYPE_BOOL,
+                           GTK_ARG_READWRITE, ARG_BG_FULL_HEIGHT_SET);
   gtk_object_add_arg_type ("GtkTextTag::background_gdk_set", GTK_TYPE_BOOL,
                            GTK_ARG_READWRITE, ARG_BACKGROUND_GDK_SET);
-  gtk_object_add_arg_type ("GtkTextTag::foreground_gdk_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_FOREGROUND_GDK_SET);
   gtk_object_add_arg_type ("GtkTextTag::background_stipple_set", GTK_TYPE_BOOL,
                            GTK_ARG_READWRITE, ARG_BACKGROUND_STIPPLE_SET);
-  gtk_object_add_arg_type ("GtkTextTag::foreground_stipple_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_FOREGROUND_STIPPLE_SET);
-  gtk_object_add_arg_type ("GtkTextTag::font_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_FONT_SET);
-  gtk_object_add_arg_type ("GtkTextTag::pixels_above_lines_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_PIXELS_ABOVE_LINES_SET);
-  gtk_object_add_arg_type ("GtkTextTag::pixels_below_lines_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_PIXELS_BELOW_LINES_SET);
-  gtk_object_add_arg_type ("GtkTextTag::pixels_inside_wrap_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_PIXELS_INSIDE_WRAP_SET);
   gtk_object_add_arg_type ("GtkTextTag::editable_set", GTK_TYPE_BOOL,
                            GTK_ARG_READWRITE, ARG_EDITABLE_SET);
-  gtk_object_add_arg_type ("GtkTextTag::wrap_mode_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_WRAP_MODE_SET);
+  gtk_object_add_arg_type ("GtkTextTag::font_set", GTK_TYPE_BOOL,
+                           GTK_ARG_READWRITE, ARG_FONT_SET);
+  gtk_object_add_arg_type ("GtkTextTag::foreground_set", GTK_TYPE_BOOL,
+                           GTK_ARG_READWRITE, ARG_FOREGROUND_SET);
+  gtk_object_add_arg_type ("GtkTextTag::foreground_gdk_set", GTK_TYPE_BOOL,
+                           GTK_ARG_READWRITE, ARG_FOREGROUND_GDK_SET);
+  gtk_object_add_arg_type ("GtkTextTag::foreground_stipple_set", GTK_TYPE_BOOL,
+                           GTK_ARG_READWRITE, ARG_FOREGROUND_STIPPLE_SET);
   gtk_object_add_arg_type ("GtkTextTag::justify_set", GTK_TYPE_BOOL,
                            GTK_ARG_READWRITE, ARG_JUSTIFY_SET);
+  gtk_object_add_arg_type ("GtkTextTag::language_set", GTK_TYPE_BOOL,
+                           GTK_ARG_READWRITE, ARG_LANGUAGE_SET);
   gtk_object_add_arg_type ("GtkTextTag::left_margin_set", GTK_TYPE_BOOL,
                            GTK_ARG_READWRITE, ARG_LEFT_MARGIN_SET);
   gtk_object_add_arg_type ("GtkTextTag::left_wrapped_line_margin_set", GTK_TYPE_BOOL,
                            GTK_ARG_READWRITE, ARG_LEFT_WRAPPED_LINE_MARGIN_SET);
+  gtk_object_add_arg_type ("GtkTextTag::offset_set", GTK_TYPE_BOOL,
+                           GTK_ARG_READWRITE, ARG_OFFSET_SET);  
   gtk_object_add_arg_type ("GtkTextTag::overstrike_set", GTK_TYPE_BOOL,
                            GTK_ARG_READWRITE, ARG_OVERSTRIKE_SET);
-  gtk_object_add_arg_type ("GtkTextTag::right_margin_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_RIGHT_MARGIN_SET);
   gtk_object_add_arg_type ("GtkTextTag::pixels_above_lines_set", GTK_TYPE_BOOL,
                            GTK_ARG_READWRITE, ARG_PIXELS_ABOVE_LINES_SET);
   gtk_object_add_arg_type ("GtkTextTag::pixels_below_lines_set", GTK_TYPE_BOOL,
                            GTK_ARG_READWRITE, ARG_PIXELS_BELOW_LINES_SET);
   gtk_object_add_arg_type ("GtkTextTag::pixels_inside_wrap_set", GTK_TYPE_BOOL,
                            GTK_ARG_READWRITE, ARG_PIXELS_INSIDE_WRAP_SET);
+  gtk_object_add_arg_type ("GtkTextTag::right_margin_set", GTK_TYPE_BOOL,
+                           GTK_ARG_READWRITE, ARG_RIGHT_MARGIN_SET);
   gtk_object_add_arg_type ("GtkTextTag::underline_set", GTK_TYPE_ENUM,
                            GTK_ARG_READWRITE, ARG_UNDERLINE_SET);
   gtk_object_add_arg_type ("GtkTextTag::wrap_mode_set", GTK_TYPE_BOOL,
                            GTK_ARG_READWRITE, ARG_WRAP_MODE_SET);
-  gtk_object_add_arg_type ("GtkTextTag::offset_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_OFFSET_SET);  
-  gtk_object_add_arg_type ("GtkTextTag::background_full_height_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_BG_FULL_HEIGHT_SET);
-  gtk_object_add_arg_type ("GtkTextTag::language_set", GTK_TYPE_BOOL,
-                           GTK_ARG_READWRITE, ARG_LANGUAGE_SET);
   
   signals[EVENT] =
     gtk_signal_new ("event",
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 440cbbaa7..bd084de24 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -3247,7 +3247,7 @@ gtk_widget_modify_base (GtkWidget  *widget,
 /**
  * gtk_widget_modify_font:
  * @widget: a #GtkWidget
- * @font: the font description to use
+ * @font_desc: the font description to use
  * 
  * Set the font to use for a widget.  All other style values are left
  * untouched. See also gtk_widget_modify_style().
diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index eb58685e2..88fe44983 100644
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -2997,7 +2997,7 @@ spin_button_month_input_func (GtkSpinButton *spin_button,
   if (!found)
     {
       *new_val = 0.0;
-      return INPUT_ERROR;
+      return GTK_INPUT_ERROR;
     }
   *new_val = (gfloat) i;
   return TRUE;
@@ -3032,7 +3032,7 @@ spin_button_hex_input_func (GtkSpinButton *spin_button,
   res = (gfloat)(strtol(buf, &err, 16));
   *new_val = res;
   if (*err)
-    return INPUT_ERROR;
+    return GTK_INPUT_ERROR;
   else
     return TRUE;
 }
diff --git a/tests/testgtk.c b/tests/testgtk.c
index eb58685e2..88fe44983 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -2997,7 +2997,7 @@ spin_button_month_input_func (GtkSpinButton *spin_button,
   if (!found)
     {
       *new_val = 0.0;
-      return INPUT_ERROR;
+      return GTK_INPUT_ERROR;
     }
   *new_val = (gfloat) i;
   return TRUE;
@@ -3032,7 +3032,7 @@ spin_button_hex_input_func (GtkSpinButton *spin_button,
   res = (gfloat)(strtol(buf, &err, 16));
   *new_val = res;
   if (*err)
-    return INPUT_ERROR;
+    return GTK_INPUT_ERROR;
   else
     return TRUE;
 }