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.

10 files changed, 23 insertions, 5 deletions

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 {