bracket in #ifdef GTK_ENABLE_BROKEN.

2001-01-30  Havoc Pennington  <hp@pobox.com>

	* gtk/gtktreeitem.h, gtk/gtktree.h, gtk/gtktext.h: bracket in
	#ifdef GTK_ENABLE_BROKEN.

	* gtk/gtktreeitem.c, gtk/gtktree.c, gtk/gtktext.c: #define
	GTK_ENABLE_BROKEN just before including the broken headers.

	* gtk/gtktypeutils.c: #define GTK_ENABLE_BROKEN, so we can get the
	deprecated types registered.

	* gtk/testgtk.c, gtk/testselection.c: #define GTK_ENABLE_BROKEN,
	we have to test the broken stuff.

        * docs/Changes-2.0.txt: explain GTK_ENABLE_BROKEN

2001-01-30  Havoc Pennington  <hp@pobox.com>

        Also committed a bunch of automatic changes made by gtk-doc,
	after reviewing for correctness.

	* gtk/tmpl/gtktext.sgml: add warning about deprecation and note
	about what to use instead

	* gtk/tmpl/gtktree.sgml: ditto

	* gtk/Makefile.am (scan): pass --deprecated-guards option to
	gtk-doc; requires new version of gtk-doc from CVS

	* gtk/gtk-docs.sgml: move GtkText to the deprecated section
	instead of the GtkTextView section. Oops.

43 files changed, 456 insertions, 281 deletions

diff --git a/ChangeLog b/ChangeLog
index 6f11860751..65430b8783 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2001-01-30  Havoc Pennington  <hp@pobox.com>
+
+	* gtk/gtktreeitem.h, gtk/gtktree.h, gtk/gtktext.h: bracket in 
+	#ifdef GTK_ENABLE_BROKEN.
+
+	* gtk/gtktreeitem.c, gtk/gtktree.c, gtk/gtktext.c: #define
+	GTK_ENABLE_BROKEN just before including the broken headers.
+	
+	* gtk/gtktypeutils.c: #define GTK_ENABLE_BROKEN, so we can get the
+	deprecated types registered.
+
+	* gtk/testgtk.c, gtk/testselection.c: #define GTK_ENABLE_BROKEN,
+	we have to test the broken stuff.
+
+        * docs/Changes-2.0.txt: explain GTK_ENABLE_BROKEN
+	
 2001-01-30  Havoc Pennington  <hp@redhat.com>
 
 	* gtk/gtkliststore.c (gtk_list_store_insert_before): fix bug in
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 6f11860751..65430b8783 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,19 @@
+2001-01-30  Havoc Pennington  <hp@pobox.com>
+
+	* gtk/gtktreeitem.h, gtk/gtktree.h, gtk/gtktext.h: bracket in 
+	#ifdef GTK_ENABLE_BROKEN.
+
+	* gtk/gtktreeitem.c, gtk/gtktree.c, gtk/gtktext.c: #define
+	GTK_ENABLE_BROKEN just before including the broken headers.
+	
+	* gtk/gtktypeutils.c: #define GTK_ENABLE_BROKEN, so we can get the
+	deprecated types registered.
+
+	* gtk/testgtk.c, gtk/testselection.c: #define GTK_ENABLE_BROKEN,
+	we have to test the broken stuff.
+
+        * docs/Changes-2.0.txt: explain GTK_ENABLE_BROKEN
+	
 2001-01-30  Havoc Pennington  <hp@redhat.com>
 
 	* gtk/gtkliststore.c (gtk_list_store_insert_before): fix bug in
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6f11860751..65430b8783 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,19 @@
+2001-01-30  Havoc Pennington  <hp@pobox.com>
+
+	* gtk/gtktreeitem.h, gtk/gtktree.h, gtk/gtktext.h: bracket in 
+	#ifdef GTK_ENABLE_BROKEN.
+
+	* gtk/gtktreeitem.c, gtk/gtktree.c, gtk/gtktext.c: #define
+	GTK_ENABLE_BROKEN just before including the broken headers.
+	
+	* gtk/gtktypeutils.c: #define GTK_ENABLE_BROKEN, so we can get the
+	deprecated types registered.
+
+	* gtk/testgtk.c, gtk/testselection.c: #define GTK_ENABLE_BROKEN,
+	we have to test the broken stuff.
+
+        * docs/Changes-2.0.txt: explain GTK_ENABLE_BROKEN
+	
 2001-01-30  Havoc Pennington  <hp@redhat.com>
 
 	* gtk/gtkliststore.c (gtk_list_store_insert_before): fix bug in
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6f11860751..65430b8783 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,19 @@
+2001-01-30  Havoc Pennington  <hp@pobox.com>
+
+	* gtk/gtktreeitem.h, gtk/gtktree.h, gtk/gtktext.h: bracket in 
+	#ifdef GTK_ENABLE_BROKEN.
+
+	* gtk/gtktreeitem.c, gtk/gtktree.c, gtk/gtktext.c: #define
+	GTK_ENABLE_BROKEN just before including the broken headers.
+	
+	* gtk/gtktypeutils.c: #define GTK_ENABLE_BROKEN, so we can get the
+	deprecated types registered.
+
+	* gtk/testgtk.c, gtk/testselection.c: #define GTK_ENABLE_BROKEN,
+	we have to test the broken stuff.
+
+        * docs/Changes-2.0.txt: explain GTK_ENABLE_BROKEN
+	
 2001-01-30  Havoc Pennington  <hp@redhat.com>
 
 	* gtk/gtkliststore.c (gtk_list_store_insert_before): fix bug in
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6f11860751..65430b8783 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,19 @@
+2001-01-30  Havoc Pennington  <hp@pobox.com>
+
+	* gtk/gtktreeitem.h, gtk/gtktree.h, gtk/gtktext.h: bracket in 
+	#ifdef GTK_ENABLE_BROKEN.
+
+	* gtk/gtktreeitem.c, gtk/gtktree.c, gtk/gtktext.c: #define
+	GTK_ENABLE_BROKEN just before including the broken headers.
+	
+	* gtk/gtktypeutils.c: #define GTK_ENABLE_BROKEN, so we can get the
+	deprecated types registered.
+
+	* gtk/testgtk.c, gtk/testselection.c: #define GTK_ENABLE_BROKEN,
+	we have to test the broken stuff.
+
+        * docs/Changes-2.0.txt: explain GTK_ENABLE_BROKEN
+	
 2001-01-30  Havoc Pennington  <hp@redhat.com>
 
 	* gtk/gtkliststore.c (gtk_list_store_insert_before): fix bug in
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6f11860751..65430b8783 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,19 @@
+2001-01-30  Havoc Pennington  <hp@pobox.com>
+
+	* gtk/gtktreeitem.h, gtk/gtktree.h, gtk/gtktext.h: bracket in 
+	#ifdef GTK_ENABLE_BROKEN.
+
+	* gtk/gtktreeitem.c, gtk/gtktree.c, gtk/gtktext.c: #define
+	GTK_ENABLE_BROKEN just before including the broken headers.
+	
+	* gtk/gtktypeutils.c: #define GTK_ENABLE_BROKEN, so we can get the
+	deprecated types registered.
+
+	* gtk/testgtk.c, gtk/testselection.c: #define GTK_ENABLE_BROKEN,
+	we have to test the broken stuff.
+
+        * docs/Changes-2.0.txt: explain GTK_ENABLE_BROKEN
+	
 2001-01-30  Havoc Pennington  <hp@redhat.com>
 
 	* gtk/gtkliststore.c (gtk_list_store_insert_before): fix bug in
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6f11860751..65430b8783 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,19 @@
+2001-01-30  Havoc Pennington  <hp@pobox.com>
+
+	* gtk/gtktreeitem.h, gtk/gtktree.h, gtk/gtktext.h: bracket in 
+	#ifdef GTK_ENABLE_BROKEN.
+
+	* gtk/gtktreeitem.c, gtk/gtktree.c, gtk/gtktext.c: #define
+	GTK_ENABLE_BROKEN just before including the broken headers.
+	
+	* gtk/gtktypeutils.c: #define GTK_ENABLE_BROKEN, so we can get the
+	deprecated types registered.
+
+	* gtk/testgtk.c, gtk/testselection.c: #define GTK_ENABLE_BROKEN,
+	we have to test the broken stuff.
+
+        * docs/Changes-2.0.txt: explain GTK_ENABLE_BROKEN
+	
 2001-01-30  Havoc Pennington  <hp@redhat.com>
 
 	* gtk/gtkliststore.c (gtk_list_store_insert_before): fix bug in
diff --git a/docs/Changes-2.0.txt b/docs/Changes-2.0.txt
index fa10e23404..fc0e8512d4 100644
--- a/docs/Changes-2.0.txt
+++ b/docs/Changes-2.0.txt
@@ -287,3 +287,9 @@ Incompatible Changes from GTK+-1.2 to GTK+-2.0:
   implementations. The draw method was rarely called in practice
   anyway.
  
+- GtkText and GtkTree are buggy and broken. We don't recommend using
+  them, and changing old code to avoid them is a good idea. The
+  recommended alternatives are GtkTextView and GtkTreeView.  The
+  broken widgets are not declared in the headers by default; to use
+  them, define the symbol GTK_ENABLE_BROKEN during compilation.  In
+  some future release, these widgets will be removed from GTK+.
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index e25de006cb..89b57955c7 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,19 @@
+2001-01-30  Havoc Pennington  <hp@pobox.com>
+
+        Also committed a bunch of automatic changes made by gtk-doc, 
+	after reviewing for correctness.
+	
+	* gtk/tmpl/gtktext.sgml: add warning about deprecation and note
+	about what to use instead
+
+	* gtk/tmpl/gtktree.sgml: ditto
+
+	* gtk/Makefile.am (scan): pass --deprecated-guards option to
+	gtk-doc
+
+	* gtk/gtk-docs.sgml: move GtkText to the deprecated section 
+	instead of the GtkTextView section. Oops.
+
 Tue Jan 30 16:01:54 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/tmpl/gtkclist.sgml: Added note explaining how
diff --git a/docs/reference/gdk-pixbuf/tmpl/animation.sgml b/docs/reference/gdk-pixbuf/tmpl/animation.sgml
index 4df2090cb6..8253cb491d 100644
--- a/docs/reference/gdk-pixbuf/tmpl/animation.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/animation.sgml
@@ -98,27 +98,6 @@ animation
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_pixbuf_frame_copy ##### -->
-<para>
-
-</para>
-
-@src: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@frame: 
-
-
-<!-- ##### FUNCTION gdk_pixbuf_frame_free ##### -->
-<para>
-
-</para>
-
-@frame: 
-<!-- # Unused Parameters # -->
-@src: 
-
-
 <!-- ##### FUNCTION gdk_pixbuf_frame_get_pixbuf ##### -->
 <para>
 
diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
index 0d6a1219d5..ff05728569 100644
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
@@ -19,6 +19,15 @@ Drawables to Pixbufs
 @pixbuf: The pixbuf that is losing its last reference.
 @data: User closure data.
 
+<!-- ##### FUNCTION gdk_pixbuf_frame_copy ##### -->
+<para>
+
+</para>
+
+@src: 
+@Returns: 
+@frame: 
+
 <!-- ##### SECTION ./tmpl/rendering.sgml:See_Also ##### -->
   <para>
     GdkRGB
@@ -705,6 +714,14 @@ Getting parts of a drawable's image data into a pixbuf.
 Xlib Rendering
 
 
+<!-- ##### FUNCTION gdk_pixbuf_frame_free ##### -->
+<para>
+
+</para>
+
+@frame: 
+@src: 
+
 <!-- ##### SECTION ./tmpl/gdk-pixbuf-io.sgml:Title ##### -->
 gdk-pixbuf-io
 
diff --git a/docs/reference/gdk/tmpl/colors.sgml b/docs/reference/gdk/tmpl/colors.sgml
index 3f47ec8260..e307e1a4d2 100644
--- a/docs/reference/gdk/tmpl/colors.sgml
+++ b/docs/reference/gdk/tmpl/colors.sgml
@@ -121,16 +121,6 @@ Colormaps and Colors
 @ncolors: 
 
 
-<!-- ##### FUNCTION gdk_colormap_query_color ##### -->
-<para>
-
-</para>
-
-@colormap: 
-@pixel: 
-@result: 
-
-
 <!-- ##### FUNCTION gdk_colormap_get_visual ##### -->
 <para>
 
diff --git a/docs/reference/gdk/tmpl/drawing.sgml b/docs/reference/gdk/tmpl/drawing.sgml
index f0270aea20..55adf506c7 100644
--- a/docs/reference/gdk/tmpl/drawing.sgml
+++ b/docs/reference/gdk/tmpl/drawing.sgml
@@ -111,24 +111,6 @@ Drawing Primitives
 @height: 
 
 
-<!-- ##### FUNCTION gdk_drawable_get_clip_region ##### -->
-<para>
-
-</para>
-
-@drawable: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_drawable_get_visible_region ##### -->
-<para>
-
-</para>
-
-@drawable: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_draw_point ##### -->
 <para>
 
diff --git a/docs/reference/gdk/tmpl/event_structs.sgml b/docs/reference/gdk/tmpl/event_structs.sgml
index a6d41967cb..a5741da40a 100644
--- a/docs/reference/gdk/tmpl/event_structs.sgml
+++ b/docs/reference/gdk/tmpl/event_structs.sgml
@@ -95,8 +95,6 @@ example, it is these characters which should be added to the input buffer.
 When using <link linkend="gdk-Input-Methods"> Input Methods</link> to support
 internationalized text input, the composed characters appear here after the
 pre-editing has been completed.
-@hardware_keycode: 
-@group: 
 
 <!-- ##### STRUCT GdkEventButton ##### -->
 <para>
diff --git a/docs/reference/gdk/tmpl/events.sgml b/docs/reference/gdk/tmpl/events.sgml
index 117f6f8ce4..1b3ba85e6a 100644
--- a/docs/reference/gdk/tmpl/events.sgml
+++ b/docs/reference/gdk/tmpl/events.sgml
@@ -226,16 +226,6 @@ Gets the timestamp from a #GdkEvent.
 no timestamp.
 
 
-<!-- ##### FUNCTION gdk_event_get_state ##### -->
-<para>
-
-</para>
-
-@event: 
-@state: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_event_get_axis ##### -->
 <para>
 
diff --git a/docs/reference/gdk/tmpl/gdk-unused.sgml b/docs/reference/gdk/tmpl/gdk-unused.sgml
index 1a71c10b42..fb52e4a9e9 100644
--- a/docs/reference/gdk/tmpl/gdk-unused.sgml
+++ b/docs/reference/gdk/tmpl/gdk-unused.sgml
@@ -36,6 +36,32 @@ Retrieves the motion history for a given device/window pair.
 </para>
 
 
+<!-- ##### FUNCTION gdk_keymap_translate_keyboard_state ##### -->
+<para>
+
+</para>
+
+@keymap: 
+@hardware_keycode: 
+@state: 
+@group: 
+@keyval: 
+@effective_group: 
+@level: 
+@unused_modifiers: 
+@Returns: 
+
+<!-- ##### FUNCTION gdk_keymap_get_entries_for_keyval ##### -->
+<para>
+
+</para>
+
+@keymap: 
+@keyval: 
+@keys: 
+@n_keys: 
+@Returns: 
+
 <!-- ##### SECTION ./tmpl/gdkregion.sgml:Long_Description ##### -->
 <para>
 
@@ -90,10 +116,65 @@ This is all pixels in either of @source1 or @source2.
 @source2: a #GdkRegion.
 @Returns: the union of @source1 and @source2.
 
+<!-- ##### FUNCTION gdk_drawable_get_visible_region ##### -->
+<para>
+
+</para>
+
+@drawable: 
+@Returns: 
+
+<!-- ##### FUNCTION gdk_colormap_query_color ##### -->
+<para>
+
+</para>
+
+@colormap: 
+@pixel: 
+@result: 
+
+<!-- ##### FUNCTION gdk_event_get_state ##### -->
+<para>
+
+</para>
+
+@event: 
+@state: 
+@Returns: 
+
 <!-- ##### SECTION ./tmpl/gdkregion.sgml:Short_Description ##### -->
 
 
 
+<!-- ##### FUNCTION gdk_window_get_decorations ##### -->
+<para>
+
+</para>
+
+@window: 
+@decorations: 
+@Returns: 
+
+<!-- ##### FUNCTION gdk_keymap_get_entries_for_keycode ##### -->
+<para>
+
+</para>
+
+@keymap: 
+@hardware_keycode: 
+@keys: 
+@keyvals: 
+@n_entries: 
+@Returns: 
+
+<!-- ##### FUNCTION gdk_drawable_get_clip_region ##### -->
+<para>
+
+</para>
+
+@drawable: 
+@Returns: 
+
 <!-- ##### FUNCTION gdk_input_set_key ##### -->
 <para>
 Sets the key event generated when a macro button is pressed.
@@ -116,6 +197,13 @@ configuration information.
           is internal data of GTK+ and should not be modified 
           or freed.
 
+<!-- ##### STRUCT GdkKeymap ##### -->
+<para>
+
+</para>
+
+@parent_instance: 
+
 <!-- ##### SECTION ./tmpl/input_methods.sgml.sgml:See_Also ##### -->
 <para>
 
@@ -179,6 +267,24 @@ onto the predefined valuator types that GTK+ understands.
 @axes: an array of GdkAxisUse. This length of this array
        must match the number of axes for the device.
 
+<!-- ##### STRUCT GdkSpan ##### -->
+<para>
+
+</para>
+
+@x: 
+@y: 
+@width: 
+
+<!-- ##### STRUCT GdkKeyInfo ##### -->
+<para>
+
+</para>
+
+@keycode: 
+@group: 
+@level: 
+
 <!-- ##### FUNCTION gdk_input_set_source ##### -->
 <para>
 Sets the source type for a device.
@@ -187,6 +293,27 @@ Sets the source type for a device.
 @deviceid: the device to configure
 @source: the new source type.
 
+<!-- ##### FUNCTION gdk_region_spans_intersect_foreach ##### -->
+<para>
+Intersects a set of spans with a region and call a user specified
+function for each resulting spanline. This function is a lot more effective
+if the spans are sorted.
+</para>
+
+@region: The region to intersect against.
+@spans: Array of spans to intersect.
+@n_spans: Number of spans.
+@sorted: True if the spans are sorted in increasing y order.
+@function: The function to call for each intersected spanline.
+@data: Opaque user data passed to function.
+
+<!-- ##### FUNCTION gdk_keymap_get_default ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
 <!-- ##### SECTION ./tmpl/gdkregion.sgml:Title ##### -->
 Points, Rectangles and Regions
 
@@ -200,10 +327,42 @@ Returns the intersection of two regions.
 @source2: a #GdkRegion.
 @Returns: the intersection of @source1 and @source2.
 
+<!-- ##### FUNCTION gdk_keymap_lookup_key ##### -->
+<para>
+
+</para>
+
+@keymap: 
+@key: 
+@Returns: 
+
+<!-- ##### USER_FUNCTION GdkSpanFunc ##### -->
+<para>
+
+</para>
+
+@span: The intersected part of the span.
+@data: Opaque data passed by user.
+
+<!-- ##### STRUCT GdkKeymapClass ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### SECTION ./tmpl/gdkkeys.sgml:Title ##### -->
 Keyboard Handling
 
 
+<!-- ##### STRUCT GdkKeymapKey ##### -->
+<para>
+
+</para>
+
+@keycode: 
+@group: 
+@level: 
+
 <!-- ##### FUNCTION gdk_input_set_mode ##### -->
 <para>
 Enables or disables a device, and determines how the
diff --git a/docs/reference/gdk/tmpl/keys.sgml b/docs/reference/gdk/tmpl/keys.sgml
index 006d562a48..7c4b568871 100644
--- a/docs/reference/gdk/tmpl/keys.sgml
+++ b/docs/reference/gdk/tmpl/keys.sgml
@@ -29,96 +29,6 @@ using gdk_keyval_to_upper() and gdk_keyval_to_lower().
 
 </para>
 
-<!-- ##### STRUCT GdkKeymap ##### -->
-<para>
-
-</para>
-
-@parent_instance: 
-
-<!-- ##### STRUCT GdkKeymapClass ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT GdkKeymapKey ##### -->
-<para>
-
-</para>
-
-@keycode: 
-@group: 
-@level: 
-
-<!-- ##### STRUCT GdkKeyInfo ##### -->
-<para>
-
-</para>
-
-@keycode: 
-@group: 
-@level: 
-
-<!-- ##### FUNCTION gdk_keymap_get_default ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_keymap_lookup_key ##### -->
-<para>
-
-</para>
-
-@keymap: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_keymap_translate_keyboard_state ##### -->
-<para>
-
-</para>
-
-@keymap: 
-@hardware_keycode: 
-@state: 
-@group: 
-@keyval: 
-@effective_group: 
-@level: 
-@unused_modifiers: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_keymap_get_entries_for_keyval ##### -->
-<para>
-
-</para>
-
-@keymap: 
-@keyval: 
-@keys: 
-@n_keys: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_keymap_get_entries_for_keycode ##### -->
-<para>
-
-</para>
-
-@keymap: 
-@hardware_keycode: 
-@keys: 
-@keyvals: 
-@n_entries: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_keyval_name ##### -->
 <para>
 Converts a key value into a symbolic name.
diff --git a/docs/reference/gdk/tmpl/regions.sgml b/docs/reference/gdk/tmpl/regions.sgml
index 88e3e2d62e..387544c82b 100644
--- a/docs/reference/gdk/tmpl/regions.sgml
+++ b/docs/reference/gdk/tmpl/regions.sgml
@@ -266,36 +266,3 @@ Returns the union of a region and a rectangle.
 @source2: 
 
 
-<!-- ##### STRUCT GdkSpan ##### -->
-<para>
-
-</para>
-
-@x: 
-@y: 
-@width: 
-
-<!-- ##### USER_FUNCTION GdkSpanFunc ##### -->
-<para>
-
-</para>
-
-@span: The intersected part of the span.
-@data: Opaque data passed by user.
-
-
-<!-- ##### FUNCTION gdk_region_spans_intersect_foreach ##### -->
-<para>
-Intersects a set of spans with a region and call a user specified
-function for each resulting spanline. This function is a lot more effective
-if the spans are sorted.
-</para>
-
-@region: The region to intersect against.
-@spans: Array of spans to intersect.
-@n_spans: Number of spans.
-@sorted: True if the spans are sorted in increasing y order.
-@function: The function to call for each intersected spanline.
-@data: Opaque user data passed to function.
-
-
diff --git a/docs/reference/gdk/tmpl/windows.sgml b/docs/reference/gdk/tmpl/windows.sgml
index b5569ac257..cc811058b6 100644
--- a/docs/reference/gdk/tmpl/windows.sgml
+++ b/docs/reference/gdk/tmpl/windows.sgml
@@ -871,16 +871,6 @@ Windows
 @decorations: 
 
 
-<!-- ##### FUNCTION gdk_window_get_decorations ##### -->
-<para>
-
-</para>
-
-@window: 
-@decorations: 
-@Returns: 
-
-
 <!-- ##### ENUM GdkWMDecoration ##### -->
 <para>
 
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index f723d7f738..d20fe80f24 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -103,7 +103,7 @@ endif
 scan:
 	(cd $(srcdir) \
 	&& CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) \
-	&& gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(EXTRA_HFILES))
+	&& gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED" --ignore-headers="$(IGNORE_HFILES)" $(EXTRA_HFILES))
 
 templates: 
 	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index b39fa718d4..4792e3d616 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -261,7 +261,6 @@ An advanced widget set.
         &gtk-TextWidget;
         &gtk-GtkTextIter;
         &gtk-GtkTextMark;
-        &GtkText;
         &GtkTextBuffer;
         &GtkTextTag;
         &GtkTextTagTable;
@@ -393,6 +392,7 @@ An advanced widget set.
         &GtkPreview;
         &GtkProgress;
         &GtkRuler;
+        &GtkText;
         &GtkTipsQuery;
         &GtkTree;
         &GtkTreeItem;
diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index 28e71fdecb..25cbfa812d 100644
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -327,6 +327,13 @@ A structure used to return values from @gtk_type_query.
 @func_data: 
 @args: 
 
+<!-- ##### ARG GtkTextTag:justify ##### -->
+<para>
+A #GtkJustification for the text. This is only used when the tag is
+applied to the first character in a paragraph.
+</para>
+
+
 <!-- ##### USER_FUNCTION GtkSignalMarshal ##### -->
 <para>
 This is currently a hack left in for a scheme wrapper library.
@@ -744,6 +751,15 @@ Deprecated.
 @func_data: 
 @args: 
 
+<!-- ##### FUNCTION gtk_tree_store_getv ##### -->
+<para>
+
+</para>
+
+@tree_store: 
+@iter: 
+@var_args: 
+
 <!-- ##### FUNCTION gtk_text_buffer_cut ##### -->
 <para>
 
@@ -854,6 +870,17 @@ the number of columns specified.
 @entries: 
 @nentries: 
 
+<!-- ##### FUNCTION gtk_tree_view_move_to ##### -->
+<para>
+
+</para>
+
+@tree_view: 
+@path: 
+@column: 
+@row_align: 
+@col_align: 
+
 <!-- ##### FUNCTION gtk_text_buffer_find_string ##### -->
 <para>
 
@@ -1326,6 +1353,14 @@ of the widget.
 
 @editable: the object which received the signal.
 
+<!-- ##### FUNCTION gtk_tree_view_column_get_size ##### -->
+<para>
+
+</para>
+
+@tree_column: 
+@Returns: 
+
 <!-- ##### STRUCT GtkMenuFactory ##### -->
 <para>
 
@@ -1689,6 +1724,14 @@ should have in their prototype (of length nparams).
 @func_data: 
 @args: 
 
+<!-- ##### FUNCTION gtk_tree_view_column_set_header_clickable ##### -->
+<para>
+
+</para>
+
+@tree_column: 
+@active: 
+
 <!-- ##### FUNCTION gtk_color_selection_set_opacity ##### -->
 <para>
 Controls whether opacity can be set with the #GtkColorSelection.
@@ -1839,6 +1882,14 @@ The first "flat" (no struct) enumerated type value.
 
 @tree_model_sort: 
 
+<!-- ##### FUNCTION gtk_tree_view_column_get_col_type ##### -->
+<para>
+
+</para>
+
+@tree_column: 
+@Returns: 
+
 <!-- ##### FUNCTION gtk_menu_factory_new ##### -->
 <para>
 
@@ -2234,6 +2285,12 @@ object.
 @pixmap: 
 @mask: 
 
+<!-- ##### ARG GtkTextTag:justify-set ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### FUNCTION gtk_marshal_NONE__C_CALLBACK_C_CALLBACK ##### -->
 <para>
 
@@ -2395,6 +2452,15 @@ destroyed.
 @window: 
 @defaultw: 
 
+<!-- ##### FUNCTION gtk_tree_store_setv ##### -->
+<para>
+
+</para>
+
+@tree_store: 
+@iter: 
+@var_args: 
+
 <!-- ##### SIGNAL GtkTextBuffer::delete-text ##### -->
 <para>
 
@@ -2703,6 +2769,14 @@ Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_CALLBACK
 @iter: 
 @Returns: 
 
+<!-- ##### FUNCTION gtk_tree_store_get_root_iter ##### -->
+<para>
+
+</para>
+
+@tree_store: 
+@iter: 
+
 <!-- ##### STRUCT GtkTextBTree ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkprogressbar.sgml b/docs/reference/gtk/tmpl/gtkprogressbar.sgml
index 4492a98be2..e7f6ada83d 100644
--- a/docs/reference/gtk/tmpl/gtkprogressbar.sgml
+++ b/docs/reference/gtk/tmpl/gtkprogressbar.sgml
@@ -269,3 +269,8 @@ when it is shown in %GTK_PROGRESS_DISCRETE style.
 
 </para>
 
+<!-- ##### ARG GtkProgressBar:text ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtktext.sgml b/docs/reference/gtk/tmpl/gtktext.sgml
index e71f07a83d..f7d4e3f18d 100644
--- a/docs/reference/gtk/tmpl/gtktext.sgml
+++ b/docs/reference/gtk/tmpl/gtktext.sgml
@@ -2,10 +2,17 @@
 GtkText
 
 <!-- ##### SECTION Short_Description ##### -->
-text widget which allows display and manipulation of arbitrary text
+deprecated text widget, use #GtkTextView instead
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>

+<warning>
+<para>
+#GtkText is deprecated and unsupported. It is known to be
+buggy. To use it, you must define the symbol %GTK_ENABLE_BROKEN
+prior to including the GTK+ header files. Use #GtkTextView instead.
+</para>
+</warning>
 A #GtkText widget allows one to display any given text and manipulate it

 by deleting from one point to another, selecting a region, and various

 other functions as outlined below.  It is inherited from #GtkEditable.

diff --git a/docs/reference/gtk/tmpl/gtktexttag.sgml b/docs/reference/gtk/tmpl/gtktexttag.sgml
index 8858fd780b..939af5d93b 100644
--- a/docs/reference/gtk/tmpl/gtktexttag.sgml
+++ b/docs/reference/gtk/tmpl/gtktexttag.sgml
@@ -41,7 +41,7 @@ types related to the text widget and how they work together.
 @stretch_set: 
 @size_set: 
 @fg_stipple_set: 
-@justify_set: 
+@justification_set: 
 @left_margin_set: 
 @indent_set: 
 @rise_set: 
@@ -82,9 +82,9 @@ types related to the text widget and how they work together.
 Describes a type of line wrapping.
 </para>
 
-@GTK_WRAPMODE_NONE: don't wrap lines; just use scrollbars
-@GTK_WRAPMODE_CHAR: allow line breaks between any two characters
-@GTK_WRAPMODE_WORD: allow line breaks only between words
+@GTK_WRAP_NONE: 
+@GTK_WRAP_CHAR: 
+@GTK_WRAP_WORD: 
 
 <!-- ##### STRUCT GtkTextAttributes ##### -->
 <para>
@@ -93,7 +93,7 @@ Describes a type of line wrapping.
 
 @refcount: 
 @appearance: 
-@justify: 
+@justification: 
 @direction: 
 @font: 
 @left_margin: 
@@ -322,10 +322,9 @@ Font as a #PangoFontDescription.
 
 </para>
 
-<!-- ##### ARG GtkTextTag:justify ##### -->
+<!-- ##### ARG GtkTextTag:justification ##### -->
 <para>
-A #GtkJustification for the text. This is only used when the tag is
-applied to the first character in a paragraph.
+
 </para>
 
 <!-- ##### ARG GtkTextTag:language ##### -->
@@ -468,7 +467,7 @@ applies to the first character in a paragraph.
 
 </para>
 
-<!-- ##### ARG GtkTextTag:justify-set ##### -->
+<!-- ##### ARG GtkTextTag:justification-set ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/gtk/tmpl/gtktextview.sgml b/docs/reference/gtk/tmpl/gtktextview.sgml
index d2621b8ed8..0f5962ed0c 100644
--- a/docs/reference/gtk/tmpl/gtktextview.sgml
+++ b/docs/reference/gtk/tmpl/gtktextview.sgml
@@ -85,8 +85,8 @@ types related to the text widget and how they work together.
 @use_align: 
 @xalign: 
 @yalign: 
-@Returns: 
 <!-- # Unused Parameters # -->
+@Returns: 
 @mark_within_margin: 
 
 
@@ -97,6 +97,7 @@ types related to the text widget and how they work together.
 
 @text_view: 
 @mark: 
+<!-- # Unused Parameters # -->
 @Returns: 
 
 
diff --git a/docs/reference/gtk/tmpl/gtktree.sgml b/docs/reference/gtk/tmpl/gtktree.sgml
index 08cfbd3b5e..c61ca2e293 100644
--- a/docs/reference/gtk/tmpl/gtktree.sgml
+++ b/docs/reference/gtk/tmpl/gtktree.sgml
@@ -2,10 +2,17 @@
 GtkTree
 
 <!-- ##### SECTION Short_Description ##### -->
-A treelist widget.
+Deprecated tree widget (use #GtkTreeView instead).
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
+<warning>
+<para>
+#GtkTree is deprecated and unsupported. It is known to be
+buggy. To use it, you must define the symbol %GTK_ENABLE_BROKEN
+prior to including the GTK+ header files. Use #GtkTreeView intead.
+</para>
+</warning>
 The #GtkTree widget is a container that shows users a list of items, in a tree format complete with branches and leafnodes. Branches can be expanded to show their child items, or collapsed to hide them.
 </para>
 
diff --git a/docs/reference/gtk/tmpl/gtktreestore.sgml b/docs/reference/gtk/tmpl/gtktreestore.sgml
index 45ce767c77..03d90183ac 100644
--- a/docs/reference/gtk/tmpl/gtktreestore.sgml
+++ b/docs/reference/gtk/tmpl/gtktreestore.sgml
@@ -84,16 +84,6 @@ GtkTreeStore
 @Varargs: 
 
 
-<!-- ##### FUNCTION gtk_tree_store_setv ##### -->
-<para>
-
-</para>
-
-@tree_store: 
-@iter: 
-@var_args: 
-
-
 <!-- ##### FUNCTION gtk_tree_store_get ##### -->
 <para>
 
@@ -104,16 +94,6 @@ GtkTreeStore
 @Varargs: 
 
 
-<!-- ##### FUNCTION gtk_tree_store_getv ##### -->
-<para>
-
-</para>
-
-@tree_store: 
-@iter: 
-@var_args: 
-
-
 <!-- ##### FUNCTION gtk_tree_store_remove ##### -->
 <para>
 
@@ -176,15 +156,6 @@ GtkTreeStore
 @parent: 
 
 
-<!-- ##### FUNCTION gtk_tree_store_get_root_iter ##### -->
-<para>
-
-</para>
-
-@tree_store: 
-@iter: 
-
-
 <!-- ##### FUNCTION gtk_tree_store_is_ancestor ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml
index 92e290fc4c..aaf95374b1 100644
--- a/docs/reference/gtk/tmpl/gtktreeview.sgml
+++ b/docs/reference/gtk/tmpl/gtktreeview.sgml
@@ -157,6 +157,8 @@ GtkTreeView
 </para>
 
 @tree_view: 
+@setting: 
+<!-- # Unused Parameters # -->
 @active: 
 
 
@@ -201,18 +203,6 @@ GtkTreeView
 @Returns: 
 
 
-<!-- ##### FUNCTION gtk_tree_view_move_to ##### -->
-<para>
-
-</para>
-
-@tree_view: 
-@path: 
-@column: 
-@row_align: 
-@col_align: 
-
-
 <!-- ##### FUNCTION gtk_tree_view_get_path_at_pos ##### -->
 <para>
 
@@ -224,6 +214,8 @@ GtkTreeView
 @y: 
 @path: 
 @column: 
+@cell_x: 
+@cell_y: 
 @Returns: 
 
 
diff --git a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
index b266434db4..ff4911e87f 100644
--- a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
+++ b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
@@ -29,6 +29,7 @@ GtkTreeViewColumn
 @parent: 
 @tree_view: 
 @button: 
+@child: 
 @window: 
 @justification: 
 @id: 
@@ -150,24 +151,6 @@ GtkTreeViewColumn
 @type: 
 
 
-<!-- ##### FUNCTION gtk_tree_view_column_get_col_type ##### -->
-<para>
-
-</para>
-
-@tree_column: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_tree_view_column_get_size ##### -->
-<para>
-
-</para>
-
-@tree_column: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gtk_tree_view_column_set_width ##### -->
 <para>
 
@@ -231,15 +214,6 @@ GtkTreeViewColumn
 @Returns: 
 
 
-<!-- ##### FUNCTION gtk_tree_view_column_set_header_clickable ##### -->
-<para>
-
-</para>
-
-@tree_column: 
-@active: 
-
-
 <!-- ##### FUNCTION gtk_tree_view_column_set_widget ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkwindow.sgml b/docs/reference/gtk/tmpl/gtkwindow.sgml
index 0793f19c8a..c3db63e8c2 100644
--- a/docs/reference/gtk/tmpl/gtkwindow.sgml
+++ b/docs/reference/gtk/tmpl/gtkwindow.sgml
@@ -245,6 +245,15 @@ it's larger
 @Returns: 
 
 
+<!-- ##### SIGNAL GtkWindow::frame-event ##### -->
+<para>
+
+</para>
+
+@window: the object which received the signal.
+@event: 
+@Returns: 
+
 <!-- ##### SIGNAL GtkWindow::set-focus ##### -->
 <para>
 
diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index e2f9f49ae5..5933396703 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -31,6 +31,7 @@
 #include "gtkmain.h"
 #include "gtkselection.h"
 #include "gtksignal.h"
+#define GTK_ENABLE_BROKEN
 #include "gtktext.h"
 #include "line-wrap.xbm"
 #include "line-arrow.xbm"
diff --git a/gtk/gtktext.h b/gtk/gtktext.h
index b51f7b56e8..bd46976e52 100644
--- a/gtk/gtktext.h
+++ b/gtk/gtktext.h
@@ -24,6 +24,8 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#ifdef GTK_ENABLE_BROKEN
+
 #ifndef __GTK_TEXT_H__
 #define __GTK_TEXT_H__
 
@@ -218,3 +220,5 @@ gint       gtk_text_forward_delete  (GtkText       *text,
 
 
 #endif /* __GTK_TEXT_H__ */
+
+#endif /* GTK_ENABLE_BROKEN */
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index cc20068967..76859fdd38 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -33,7 +33,6 @@
 #include "gtkmenu.h"
 #include "gtkmenuitem.h"
 #include "gtksignal.h"
-#include "gtktext.h"
 #include "gtktextdisplay.h"
 #include "gtktextview.h"
 #include "gtkimmulticontext.h"
diff --git a/gtk/gtktree.c b/gtk/gtktree.c
index 2c845874f9..1102a98eba 100644
--- a/gtk/gtktree.c
+++ b/gtk/gtktree.c
@@ -24,12 +24,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include "gtktree.h"
-#include "gtktreeitem.h"
 #include "gtkmain.h"
 #include "gtksignal.h"
 #include "gtklist.h"
 
+#define GTK_ENABLE_BROKEN
+#include "gtktree.h"
+#include "gtktreeitem.h"
+
 enum {
   SELECTION_CHANGED,
   SELECT_CHILD,
diff --git a/gtk/gtktree.h b/gtk/gtktree.h
index 5eed018610..d5f938e93a 100644
--- a/gtk/gtktree.h
+++ b/gtk/gtktree.h
@@ -24,6 +24,8 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#ifdef GTK_ENABLE_BROKEN
+
 #ifndef __GTK_TREE_H__
 #define __GTK_TREE_H__
 
@@ -132,3 +134,5 @@ void       gtk_tree_remove_item        (GtkTree          *tree,
 
 
 #endif /* __GTK_TREE_H__ */
+
+#endif /* GTK_ENABLE_BROKEN */
diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c
index dc4cb886e0..35484b6982 100644
--- a/gtk/gtktreeitem.c
+++ b/gtk/gtktreeitem.c
@@ -25,12 +25,13 @@
  */
 
 #include "gtklabel.h"
-#include "gtktree.h"
-#include "gtktreeitem.h"
 #include "gtkeventbox.h"
 #include "gtkpixmap.h"
 #include "gtkmain.h"
 #include "gtksignal.h"
+#define GTK_ENABLE_BROKEN
+#include "gtktree.h"
+#include "gtktreeitem.h"
 
 #include "tree_plus.xpm"
 #include "tree_minus.xpm"
diff --git a/gtk/gtktreeitem.h b/gtk/gtktreeitem.h
index 036aa7465f..beca5321e5 100644
--- a/gtk/gtktreeitem.h
+++ b/gtk/gtktreeitem.h
@@ -24,6 +24,8 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#ifdef GTK_ENABLE_BROKEN
+
 #ifndef __GTK_TREE_ITEM_H__
 #define __GTK_TREE_ITEM_H__
 
@@ -91,3 +93,5 @@ void       gtk_tree_item_collapse       (GtkTreeItem *tree_item);
 
 
 #endif /* __GTK_TREE_ITEM_H__ */
+
+#endif /* GTK_ENABLE_BROKEN */
diff --git a/gtk/gtktypeutils.c b/gtk/gtktypeutils.c
index eae0e3f185..d92b0a4d90 100644
--- a/gtk/gtktypeutils.c
+++ b/gtk/gtktypeutils.c
@@ -102,6 +102,7 @@ gtk_type_new (GtkType type)
 /* includes for various places
  * with enum definitions
  */
+#define GTK_ENABLE_BROKEN
 #include "makeenums.h"
 /* type variable declarations
  */
diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index acdaa65ed9..73a151ec5f 100644
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -38,6 +38,7 @@
 #include <unistd.h>
 #endif
 
+#define GTK_ENABLE_BROKEN
 #include "gtk.h"
 #include "gdk/gdk.h"
 #include "gdk/gdkkeysyms.h"
diff --git a/gtk/testselection.c b/gtk/testselection.c
index 4843ac6c41..4f7f6b7e0b 100644
--- a/gtk/testselection.c
+++ b/gtk/testselection.c
@@ -26,6 +26,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#define GTK_ENABLE_BROKEN
 #include "gtk.h"
 
 typedef enum {
diff --git a/tests/testgtk.c b/tests/testgtk.c
index acdaa65ed9..73a151ec5f 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -38,6 +38,7 @@
 #include <unistd.h>
 #endif
 
+#define GTK_ENABLE_BROKEN
 #include "gtk.h"
 #include "gdk/gdk.h"
 #include "gdk/gdkkeysyms.h"
diff --git a/tests/testselection.c b/tests/testselection.c
index 4843ac6c41..4f7f6b7e0b 100644
--- a/tests/testselection.c
+++ b/tests/testselection.c
@@ -26,6 +26,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#define GTK_ENABLE_BROKEN
 #include "gtk.h"
 
 typedef enum {