remove unused codepath.

Fri Oct  4 21:21:47 2002  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtkhandlebox.c (gtk_handle_box_paint): remove unused
	codepath.

	* gtk/gtkmenuitem.c (gtk_real_menu_item_{de,}select): call
	gtk_widget_queue_draw() instead of gtk_widget_draw().

23 files changed, 254 insertions, 223 deletions

diff --git a/ChangeLog b/ChangeLog
index bf0786580c..46ff941042 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Oct  4 21:21:47 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkhandlebox.c (gtk_handle_box_paint): remove unused
+	codepath.
+
+	* gtk/gtkmenuitem.c (gtk_real_menu_item_{de,}select): call 
+	gtk_widget_queue_draw() instead of gtk_widget_draw().
+
 Fri Oct  4 14:49:04 2002  Owen Taylor  <otaylor@redhat.com>
 
 	Patch from Shivram U <shivaram.upadhyayula@wipro.com>
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bf0786580c..46ff941042 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Fri Oct  4 21:21:47 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkhandlebox.c (gtk_handle_box_paint): remove unused
+	codepath.
+
+	* gtk/gtkmenuitem.c (gtk_real_menu_item_{de,}select): call 
+	gtk_widget_queue_draw() instead of gtk_widget_draw().
+
 Fri Oct  4 14:49:04 2002  Owen Taylor  <otaylor@redhat.com>
 
 	Patch from Shivram U <shivaram.upadhyayula@wipro.com>
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index bf0786580c..46ff941042 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Fri Oct  4 21:21:47 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkhandlebox.c (gtk_handle_box_paint): remove unused
+	codepath.
+
+	* gtk/gtkmenuitem.c (gtk_real_menu_item_{de,}select): call 
+	gtk_widget_queue_draw() instead of gtk_widget_draw().
+
 Fri Oct  4 14:49:04 2002  Owen Taylor  <otaylor@redhat.com>
 
 	Patch from Shivram U <shivaram.upadhyayula@wipro.com>
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bf0786580c..46ff941042 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Fri Oct  4 21:21:47 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkhandlebox.c (gtk_handle_box_paint): remove unused
+	codepath.
+
+	* gtk/gtkmenuitem.c (gtk_real_menu_item_{de,}select): call 
+	gtk_widget_queue_draw() instead of gtk_widget_draw().
+
 Fri Oct  4 14:49:04 2002  Owen Taylor  <otaylor@redhat.com>
 
 	Patch from Shivram U <shivaram.upadhyayula@wipro.com>
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bf0786580c..46ff941042 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Fri Oct  4 21:21:47 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkhandlebox.c (gtk_handle_box_paint): remove unused
+	codepath.
+
+	* gtk/gtkmenuitem.c (gtk_real_menu_item_{de,}select): call 
+	gtk_widget_queue_draw() instead of gtk_widget_draw().
+
 Fri Oct  4 14:49:04 2002  Owen Taylor  <otaylor@redhat.com>
 
 	Patch from Shivram U <shivaram.upadhyayula@wipro.com>
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bf0786580c..46ff941042 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Fri Oct  4 21:21:47 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkhandlebox.c (gtk_handle_box_paint): remove unused
+	codepath.
+
+	* gtk/gtkmenuitem.c (gtk_real_menu_item_{de,}select): call 
+	gtk_widget_queue_draw() instead of gtk_widget_draw().
+
 Fri Oct  4 14:49:04 2002  Owen Taylor  <otaylor@redhat.com>
 
 	Patch from Shivram U <shivaram.upadhyayula@wipro.com>
diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
index 3c67abbc71..857e0664f2 100644
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
@@ -365,6 +365,21 @@ XlibRGB
 
 @obj: A GTK+ object.
 
+<!-- ##### STRUCT GdkPixbufFormat ##### -->
+<para>
+A #GdkPixbufFormat contains information about the image format accepted by a
+module. Only modules should access the fields directly.
+</para>
+
+@name: the name of the image format
+@signature: the signature of the module
+@domain: the message domain for the @description
+@description: a description of the image format
+@mime_types: a %NULL-terminated array of MIME types for the image format.
+@extensions: a %NULL-terminated array of typical filename extensions for the
+image format.
+@flags: 
+
 <!-- ##### STRUCT GdkPixbufFrame ##### -->
 <para>
  This object describes an individual frame of an animation.
@@ -397,6 +412,92 @@ XlibRGB
 @pixbuf: The pixbuf that is losing its last reference.
 @data: User closure data.
 
+<!-- ##### USER_FUNCTION GdkPixbufModuleFillInfoFunc ##### -->
+<para>
+Defines the type of the function used to fill a 
+#GdkPixbufFormat structure with information about a module.
+</para>
+
+@info: a #GdkPixbufFormat.
+
+<!-- ##### USER_FUNCTION GdkPixbufModuleFillVtableFunc ##### -->
+<para>
+Defines the type of the function used to set the vtable of a 
+#GdkPixbufModule when it is loaded. 
+</para>
+
+@module: a #GdkPixbufModule.
+
+<!-- ##### STRUCT GdkPixbufModulePattern ##### -->
+<para>
+The signature of a module is a set of prefixes. Prefixes are encoded as
+pairs of ordinary strings, where the second string, if not %NULL,
+may contain ' ', '!', 'x', 'z', and 'n' to indicate bytes that must be 
+matched, not matched, "don't-care"-bytes, zeros and non-zeros.
+Each prefix has an associated integer that describes the relevance of 
+the prefix, with 0 meaning a mismatch and 100 a "perfect match".
+</para>
+
+<para>
+The signature of a module is stored as an array of 
+#GdkPixbufModulePattern<!-- -->s. 
+</para>
+
+@prefix: the prefix for this pattern
+@mask: mask containing bytes which modify how the prefix is matched against
+  test data
+@relevance: relevance of this pattern
+
+<!-- ##### USER_FUNCTION GdkPixbufModulePreparedFunc ##### -->
+<para>
+Defines the type of the function that gets called once the initial 
+setup of @pixbuf is done.
+</para>
+<para>
+#GdkPixbufLoader uses a function of this type to emit the 
+"<link linkend="GdkPixbufLoader-area-prepared">area_prepared</link>"
+signal.
+</para>
+
+@pixbuf: the #GdkPixbuf that is currently being loaded.
+@anim: if an animation is being loaded, the #GdkPixbufAnimation, else %NULL.
+@user_data: the loader.
+
+<!-- ##### USER_FUNCTION GdkPixbufModuleSizeFunc ##### -->
+<para>
+Defines the type of the function that gets called once the size 
+of the loaded image is known.
+</para>
+<para>
+The function is expected to set @width and @height to the desired
+size to which the image should be scaled. If a module has no efficient 
+way to achieve the desired scaling during the loading of the image, it may
+either ignore the size request, or only approximate it -- &gdk-pixbuf; will
+then perform the required scaling on the completely loaded image. 
+</para>
+
+@width: pointer to a location containing the current image width
+@height: pointer to a location containing the current image height
+@user_data: the loader.
+
+<!-- ##### USER_FUNCTION GdkPixbufModuleUpdatedFunc ##### -->
+<para>
+Defines the type of the function that gets called every time a region
+of @pixbuf is updated.
+</para>
+<para>
+#GdkPixbufLoader uses a function of this type to emit the 
+"<link linkend="GdkPixbufLoader-area-updated">area_updated</link>"
+signal.
+</para>
+
+@pixbuf: the #GdkPixbuf that is currently being loaded.
+@x: the X origin of the updated area.
+@y: the Y origin of the updated area.
+@width: the width of the updated area.
+@height: the height of the updated area.
+@user_data: the loader.
+
 <!-- ##### ARG GnomeCanvasPixbuf:height ##### -->
   <para>
     Indicates the height the pixbuf will be scaled to.  This argument
@@ -567,6 +668,53 @@ End:
   </para>
 
 
+<!-- ##### FUNCTION gdk_pixbuf_format_get_description ##### -->
+<para>
+
+</para>
+
+@format: 
+@Returns: 
+
+<!-- ##### FUNCTION gdk_pixbuf_format_get_extensions ##### -->
+<para>
+
+</para>
+
+@format: 
+@Returns: 
+
+<!-- ##### FUNCTION gdk_pixbuf_format_get_mime_types ##### -->
+<para>
+
+</para>
+
+@format: 
+@Returns: 
+
+<!-- ##### FUNCTION gdk_pixbuf_format_get_name ##### -->
+<para>
+
+</para>
+
+@format: 
+@Returns: 
+
+<!-- ##### FUNCTION gdk_pixbuf_format_is_writable ##### -->
+<para>
+
+</para>
+
+@format: 
+@Returns: 
+
+<!-- ##### FUNCTION gdk_pixbuf_get_formats ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
 <!-- ##### FUNCTION gdk_pixbuf_new_from_stream ##### -->
 <para>
 
diff --git a/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml b/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml
index a87dac8793..412fec6981 100644
--- a/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/module_interface.sgml
@@ -65,165 +65,6 @@ They are not covered by the same stability guarantees as the regular
 
 </para>
 
-<!-- ##### FUNCTION gdk_pixbuf_get_formats ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_format_get_name ##### -->
-<para>
-
-</para>
-
-@format: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_format_get_description ##### -->
-<para>
-
-</para>
-
-@format: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_format_get_mime_types ##### -->
-<para>
-
-</para>
-
-@format: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_format_get_extensions ##### -->
-<para>
-
-</para>
-
-@format: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_format_is_writable ##### -->
-<para>
-
-</para>
-
-@format: 
-@Returns: 
-
-
-<!-- ##### STRUCT GdkPixbufFormat ##### -->
-<para>
-A #GdkPixbufFormat contains information about the image format accepted by a
-module. Only modules should access the fields directly.
-</para>
-
-@name: the name of the image format
-@signature: the signature of the module
-@domain: the message domain for the @description
-@description: a description of the image format
-@mime_types: a %NULL-terminated array of MIME types for the image format.
-@extensions: a %NULL-terminated array of typical filename extensions for the
-image format.
-@flags: 
-
-<!-- ##### STRUCT GdkPixbufModulePattern ##### -->
-<para>
-The signature of a module is a set of prefixes. Prefixes are encoded as
-pairs of ordinary strings, where the second string, if not %NULL,
-may contain ' ', '!', 'x', 'z', and 'n' to indicate bytes that must be 
-matched, not matched, "don't-care"-bytes, zeros and non-zeros.
-Each prefix has an associated integer that describes the relevance of 
-the prefix, with 0 meaning a mismatch and 100 a "perfect match".
-</para>
-
-<para>
-The signature of a module is stored as an array of 
-#GdkPixbufModulePattern<!-- -->s. 
-</para>
-
-@prefix: the prefix for this pattern
-@mask: mask containing bytes which modify how the prefix is matched against
-  test data
-@relevance: relevance of this pattern
-
-<!-- ##### USER_FUNCTION GdkPixbufModuleFillVtableFunc ##### -->
-<para>
-Defines the type of the function used to set the vtable of a 
-#GdkPixbufModule when it is loaded. 
-</para>
-
-@module: a #GdkPixbufModule.
-
-
-<!-- ##### USER_FUNCTION GdkPixbufModuleFillInfoFunc ##### -->
-<para>
-Defines the type of the function used to fill a 
-#GdkPixbufFormat structure with information about a module.
-</para>
-
-@info: a #GdkPixbufFormat.
-
-
-<!-- ##### USER_FUNCTION GdkPixbufModuleSizeFunc ##### -->
-<para>
-Defines the type of the function that gets called once the size 
-of the loaded image is known.
-</para>
-<para>
-The function is expected to set @width and @height to the desired
-size to which the image should be scaled. If a module has no efficient 
-way to achieve the desired scaling during the loading of the image, it may
-either ignore the size request, or only approximate it -- &gdk-pixbuf; will
-then perform the required scaling on the completely loaded image. 
-</para>
-
-@width: pointer to a location containing the current image width
-@height: pointer to a location containing the current image height
-@user_data: the loader.
-
-
-<!-- ##### USER_FUNCTION GdkPixbufModulePreparedFunc ##### -->
-<para>
-Defines the type of the function that gets called once the initial 
-setup of @pixbuf is done.
-</para>
-<para>
-#GdkPixbufLoader uses a function of this type to emit the 
-"<link linkend="GdkPixbufLoader-area-prepared">area_prepared</link>"
-signal.
-</para>
-
-@pixbuf: the #GdkPixbuf that is currently being loaded.
-@anim: if an animation is being loaded, the #GdkPixbufAnimation, else %NULL.
-@user_data: the loader.
-
-
-<!-- ##### USER_FUNCTION GdkPixbufModuleUpdatedFunc ##### -->
-<para>
-Defines the type of the function that gets called every time a region
-of @pixbuf is updated.
-</para>
-<para>
-#GdkPixbufLoader uses a function of this type to emit the 
-"<link linkend="GdkPixbufLoader-area-updated">area_updated</link>"
-signal.
-</para>
-
-@pixbuf: the #GdkPixbuf that is currently being loaded.
-@x: the X origin of the updated area.
-@y: the Y origin of the updated area.
-@width: the width of the updated area.
-@height: the height of the updated area.
-@user_data: the loader.
-
-
 <!-- ##### STRUCT GdkPixbufModule ##### -->
 <para>
 A #GdkPixbufModule contains the necessary functions to load and save 
diff --git a/docs/reference/gdk/tmpl/gdk-unused.sgml b/docs/reference/gdk/tmpl/gdk-unused.sgml
index 6d161312a4..d13f51750e 100644
--- a/docs/reference/gdk/tmpl/gdk-unused.sgml
+++ b/docs/reference/gdk/tmpl/gdk-unused.sgml
@@ -596,6 +596,14 @@ status information, so the application does not need to do anything.
 </para>
 
 
+<!-- ##### FUNCTION gdk_display_set_sm_client_id ##### -->
+<para>
+
+</para>
+
+@display: 
+@sm_client_id: 
+
 <!-- ##### FUNCTION gdk_font_full_name_free ##### -->
 <para>
 Frees a full font name obtained from gdk_font_full_name_get().
diff --git a/docs/reference/gdk/tmpl/gdkdisplay.sgml b/docs/reference/gdk/tmpl/gdkdisplay.sgml
index b7a50b47f1..acf62b5da8 100644
--- a/docs/reference/gdk/tmpl/gdkdisplay.sgml
+++ b/docs/reference/gdk/tmpl/gdkdisplay.sgml
@@ -196,15 +196,6 @@ of an X display. All its fields are private and should not be accessed directly.
 @msec: 
 
 
-<!-- ##### FUNCTION gdk_display_set_sm_client_id ##### -->
-<para>
-
-</para>
-
-@display: 
-@sm_client_id: 
-
-
 <!-- ##### SIGNAL GdkDisplay::closed ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkbbox.sgml b/docs/reference/gtk/tmpl/gtkbbox.sgml
index 46d633dc5f..d48f2ae890 100644
--- a/docs/reference/gtk/tmpl/gtkbbox.sgml
+++ b/docs/reference/gtk/tmpl/gtkbbox.sgml
@@ -162,22 +162,22 @@ box.
 
 </para>
 
-<!-- ##### ARG GtkButtonBox:child-internal-pad-x ##### -->
+<!-- ##### ARG GtkButtonBox:child-min-height ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkButtonBox:child-min-height ##### -->
+<!-- ##### ARG GtkButtonBox:child-internal-pad-y ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkButtonBox:child-min-width ##### -->
+<!-- ##### ARG GtkButtonBox:child-internal-pad-x ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkButtonBox:child-internal-pad-y ##### -->
+<!-- ##### ARG GtkButtonBox:child-min-width ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkbutton.sgml b/docs/reference/gtk/tmpl/gtkbutton.sgml
index ecc477c1de..1b60ff31a0 100644
--- a/docs/reference/gtk/tmpl/gtkbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkbutton.sgml
@@ -248,17 +248,17 @@ mouse cursor is.
 
 </para>
 
-<!-- ##### ARG GtkButton:child-displacement-y ##### -->
+<!-- ##### ARG GtkButton:default-border ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkButton:child-displacement-x ##### -->
+<!-- ##### ARG GtkButton:child-displacement-y ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkButton:default-border ##### -->
+<!-- ##### ARG GtkButton:child-displacement-x ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkdialog.sgml b/docs/reference/gtk/tmpl/gtkdialog.sgml
index 721baf0fb5..24dc48ecd3 100644
--- a/docs/reference/gtk/tmpl/gtkdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkdialog.sgml
@@ -299,12 +299,12 @@ was clicked.
 
 </para>
 
-<!-- ##### ARG GtkDialog:action-area-border ##### -->
+<!-- ##### ARG GtkDialog:content-area-border ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkDialog:content-area-border ##### -->
+<!-- ##### ARG GtkDialog:action-area-border ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
index 31debc57f8..876a046a5d 100644
--- a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
+++ b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
@@ -100,12 +100,12 @@ selected value for the option menu.
 
 </para>
 
-<!-- ##### ARG GtkOptionMenu:indicator-size ##### -->
+<!-- ##### ARG GtkOptionMenu:indicator-spacing ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkOptionMenu:indicator-spacing ##### -->
+<!-- ##### ARG GtkOptionMenu:indicator-size ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkrange.sgml b/docs/reference/gtk/tmpl/gtkrange.sgml
index 7ce45ef6e5..caa4ee4368 100644
--- a/docs/reference/gtk/tmpl/gtkrange.sgml
+++ b/docs/reference/gtk/tmpl/gtkrange.sgml
@@ -153,32 +153,32 @@ Emitted when the range value changes.
 
 </para>
 
-<!-- ##### ARG GtkRange:trough-border ##### -->
+<!-- ##### ARG GtkRange:stepper-size ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkRange:arrow-displacement-y ##### -->
+<!-- ##### ARG GtkRange:trough-border ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkRange:arrow-displacement-x ##### -->
+<!-- ##### ARG GtkRange:stepper-spacing ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkRange:stepper-size ##### -->
+<!-- ##### ARG GtkRange:slider-width ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkRange:stepper-spacing ##### -->
+<!-- ##### ARG GtkRange:arrow-displacement-y ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkRange:slider-width ##### -->
+<!-- ##### ARG GtkRange:arrow-displacement-x ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkscale.sgml b/docs/reference/gtk/tmpl/gtkscale.sgml
index 8935f1164b..d2861f1900 100644
--- a/docs/reference/gtk/tmpl/gtkscale.sgml
+++ b/docs/reference/gtk/tmpl/gtkscale.sgml
@@ -148,12 +148,12 @@ format_value_callback (GtkScale *scale,
 
 </para>
 
-<!-- ##### ARG GtkScale:slider-length ##### -->
+<!-- ##### ARG GtkScale:value-spacing ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkScale:value-spacing ##### -->
+<!-- ##### ARG GtkScale:slider-length ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkscrollbar.sgml b/docs/reference/gtk/tmpl/gtkscrollbar.sgml
index f7710183aa..330691b466 100644
--- a/docs/reference/gtk/tmpl/gtkscrollbar.sgml
+++ b/docs/reference/gtk/tmpl/gtkscrollbar.sgml
@@ -54,17 +54,17 @@ The #GtkScrollbar struct does not contain any public data.
 </para>
 
 
-<!-- ##### ARG GtkScrollbar:has-secondary-backward-stepper ##### -->
+<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkScrollbar:min-slider-length ##### -->
+<!-- ##### ARG GtkScrollbar:has-secondary-backward-stepper ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkScrollbar:fixed-slider-length ##### -->
+<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### -->
 <para>
 
 </para>
@@ -74,12 +74,12 @@ The #GtkScrollbar struct does not contain any public data.
 
 </para>
 
-<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### -->
+<!-- ##### ARG GtkScrollbar:min-slider-length ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### -->
+<!-- ##### ARG GtkScrollbar:fixed-slider-length ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtktextbuffer.sgml b/docs/reference/gtk/tmpl/gtktextbuffer.sgml
index 0c72d90755..28e0afa3d6 100644
--- a/docs/reference/gtk/tmpl/gtktextbuffer.sgml
+++ b/docs/reference/gtk/tmpl/gtktextbuffer.sgml
@@ -722,3 +722,8 @@ types related to the text widget and how they work together.
 @arg2: 
 @arg3: 
 
+<!-- ##### ARG GtkTextBuffer:tag-table ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml
index a7d25b3d69..9ebf2d6d86 100644
--- a/docs/reference/gtk/tmpl/gtktoolbar.sgml
+++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml
@@ -386,27 +386,27 @@ Should be used if you wish to perform an action when ever the style of a toolbar
 
 </para>
 
-<!-- ##### ARG GtkToolbar:internal-padding ##### -->
+<!-- ##### ARG GtkToolbar:shadow-type ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkToolbar:space-size ##### -->
+<!-- ##### ARG GtkToolbar:space-style ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkToolbar:space-style ##### -->
+<!-- ##### ARG GtkToolbar:button-relief ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkToolbar:shadow-type ##### -->
+<!-- ##### ARG GtkToolbar:internal-padding ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkToolbar:button-relief ##### -->
+<!-- ##### ARG GtkToolbar:space-size ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml
index 70776581ed..62f5fc3ac3 100644
--- a/docs/reference/gtk/tmpl/gtktreeview.sgml
+++ b/docs/reference/gtk/tmpl/gtktreeview.sgml
@@ -901,17 +901,17 @@ Function used for #gtk_tree_view_map_expanded_rows.
 
 </para>
 
-<!-- ##### ARG GtkTreeView:vertical-separator ##### -->
+<!-- ##### ARG GtkTreeView:horizontal-separator ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkTreeView:horizontal-separator ##### -->
+<!-- ##### ARG GtkTreeView:indent-expanders ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkTreeView:indent-expanders ##### -->
+<!-- ##### ARG GtkTreeView:allow-rules ##### -->
 <para>
 
 </para>
@@ -921,7 +921,7 @@ Function used for #gtk_tree_view_map_expanded_rows.
 
 </para>
 
-<!-- ##### ARG GtkTreeView:allow-rules ##### -->
+<!-- ##### ARG GtkTreeView:vertical-separator ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml
index d3cdd9ebec..ab7a967a57 100644
--- a/docs/reference/gtk/tmpl/gtkwidget.sgml
+++ b/docs/reference/gtk/tmpl/gtkwidget.sgml
@@ -2158,12 +2158,12 @@ a widget changes from un-anchored to anchored or vice-versa.
 
 </para>
 
-<!-- ##### ARG GtkWidget:has-focus ##### -->
+<!-- ##### ARG GtkWidget:is-focus ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:is-focus ##### -->
+<!-- ##### ARG GtkWidget:has-focus ##### -->
 <para>
 
 </para>
@@ -2203,37 +2203,37 @@ a widget changes from un-anchored to anchored or vice-versa.
 
 </para>
 
-<!-- ##### ARG GtkWidget:secondary-cursor-color ##### -->
+<!-- ##### ARG GtkWidget:focus-padding ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### -->
+<!-- ##### ARG GtkWidget:cursor-color ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:cursor-color ##### -->
+<!-- ##### ARG GtkWidget:secondary-cursor-color ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:focus-line-width ##### -->
+<!-- ##### ARG GtkWidget:interior-focus ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:focus-padding ##### -->
+<!-- ##### ARG GtkWidget:focus-line-width ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:focus-line-pattern ##### -->
+<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkWidget:interior-focus ##### -->
+<!-- ##### ARG GtkWidget:focus-line-pattern ##### -->
 <para>
 
 </para>
diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index 22ec053943..4c72df49d8 100644
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -877,17 +877,7 @@ gtk_handle_box_paint (GtkWidget      *widget,
 			 event ? &event->area : area);
 
   if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
-    {
-      GdkRectangle child_area;
-
-      if (!event) /* we were called from draw() */
-	{
-	  if (gtk_widget_intersect (bin->child, area, &child_area))
-	    gtk_widget_draw (bin->child, &child_area);
-	}
-      else /* we were called from expose() */
-	(* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
-    }
+    (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
 }
 
 static gint
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 908ba4790f..0589ba18b6 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -724,7 +724,7 @@ gtk_real_menu_item_select (GtkItem *item)
     }
   
   gtk_widget_set_state (GTK_WIDGET (menu_item), GTK_STATE_PRELIGHT);
-  gtk_widget_draw (GTK_WIDGET (menu_item), NULL);
+  gtk_widget_queue_draw (GTK_WIDGET (menu_item));
 }
 
 static void
@@ -757,7 +757,7 @@ gtk_real_menu_item_deselect (GtkItem *item)
     }
 
   gtk_widget_set_state (GTK_WIDGET (menu_item), GTK_STATE_NORMAL);
-  gtk_widget_draw (GTK_WIDGET (menu_item), NULL);
+  gtk_widget_queue_draw (GTK_WIDGET (menu_item));
 }
 
 static gboolean