first cut at no-deprecated no-experimental defines

[Havoc Pennington <hp redhat com>]

Hi,

Comments welcome, I'll commit soon... in particular I don't think I found
all the deprecated stuff. "Deprecated" should mean "not used and shouldn't
be" or "widely used but we have a superior replacement," but it does _not_
mean "sucky but no replacement available."

Havoc

? libvfs
? mychanges
? libgnomeui/mychanges
Index: libgnome/libgnome.h
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnome/libgnome.h,v
retrieving revision 1.27
diff -u -u -r1.27 libgnome.h
--- libgnome/libgnome.h	1999/03/17 00:20:09	1.27
+++ libgnome/libgnome.h	1999/08/04 20:38:53
@@ -29,7 +29,10 @@
 #include "libgnome/gnome-metadata.h"
 #include "libgnome/gnome-mime.h"
 #include "libgnome/gnome-mime-info.h"
+/* comment in this header says it's deprecated - ? */
+#ifndef GNOME_EXCLUDE_DEPRECATED
 #include "libgnome/gnome-paper.h"
+#endif
 #include "libgnome/gnome-popt.h"
 #include "libgnome/gnome-remote.h"
 #include "libgnome/gnome-score.h"
Index: libgnome/libgnomeP.h
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnome/libgnomeP.h,v
retrieving revision 1.14
diff -u -u -r1.14 libgnomeP.h
--- libgnome/libgnomeP.h	1999/03/17 00:20:10	1.14
+++ libgnome/libgnomeP.h	1999/08/04 20:38:53
@@ -28,7 +28,9 @@
 #include "libgnome/gnome-i18nP.h"
 #include "libgnome/gnome-metadata.h"
 #include "libgnome/gnome-mime.h"
+#ifndef GNOME_EXCLUDE_DEPRECATED
 #include "libgnome/gnome-paper.h"
+#endif
 #include "libgnome/gnome-popt.h"
 #include "libgnome/gnome-remote.h"
 #include "libgnome/gnome-score.h"
Index: libgnomeui/gnome-canvas.h
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnomeui/gnome-canvas.h,v
retrieving revision 1.45
diff -u -u -r1.45 gnome-canvas.h
--- libgnomeui/gnome-canvas.h	1999/07/06 16:14:40	1.45
+++ libgnomeui/gnome-canvas.h	1999/08/04 20:38:53
@@ -504,7 +504,9 @@
 /* Creates a new antialiased empty canvas.  You should push the GdkRgb colormap
  * and visual for this.
  */
+#ifndef GNOME_EXCLUDE_EXPERIMENTAL
 GtkWidget *gnome_canvas_new_aa (void);
+#endif
 
 /* Returns the root canvas item group of the canvas */
 GnomeCanvasGroup *gnome_canvas_root (GnomeCanvas *canvas);
Index: libgnomeui/gnome-dialog-util.h
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnomeui/gnome-dialog-util.h,v
retrieving revision 1.4
diff -u -u -r1.4 gnome-dialog-util.h
--- libgnomeui/gnome-dialog-util.h	1998/11/26 21:42:13	1.4
+++ libgnomeui/gnome-dialog-util.h	1999/08/04 20:38:53
@@ -79,6 +79,7 @@
 						   gpointer data,
 						   GtkWindow * parent);
 
+#ifndef GNOME_EXCLUDE_DEPRECATED
 /* This function is deprecated; use gnome_request_dialog() instead. */
 GtkWidget * gnome_request_string_dialog           (const gchar * prompt,
 						   GnomeStringCallback callback,
@@ -100,6 +101,7 @@
 						   GnomeStringCallback callback,
 						   gpointer data,
 						   GtkWindow * parent);
+#endif
 
 /* Dialog containing a prompt and a text entry field for a response */
 GtkWidget * gnome_request_dialog (gboolean password,
Index: libgnomeui/gnome-messagebox.h
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnomeui/gnome-messagebox.h,v
retrieving revision 1.9
diff -u -u -r1.9 gnome-messagebox.h
--- libgnomeui/gnome-messagebox.h	1998/12/14 19:37:44	1.9
+++ libgnomeui/gnome-messagebox.h	1999/08/04 20:38:53
@@ -56,12 +56,14 @@
 GtkWidget* gnome_message_box_newv        (const gchar           *message,
 					  const gchar           *messagebox_type,
 					  const gchar 	      **buttons);
+#ifndef GNOME_EXCLUDE_DEPRECATED
 /* Deprecated in favor of gtk_window's version. Don't use. */
 void       gnome_message_box_set_modal   (GnomeMessageBox *messagebox);
 
 /* Deprecated in favor of gnome_dialog_ variant. Don't use. */
 void       gnome_message_box_set_default (GnomeMessageBox *messagebox,
 					  gint            button);
+#endif
 
 END_GNOME_DECLS
 
Index: libgnomeui/gnome-propertybox.h
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnomeui/gnome-propertybox.h,v
retrieving revision 1.6
diff -u -u -r1.6 gnome-propertybox.h
--- libgnomeui/gnome-propertybox.h	1999/01/25 19:00:58	1.6
+++ libgnomeui/gnome-propertybox.h	1999/08/04 20:38:53
@@ -72,9 +72,11 @@
 					  GtkWidget *child,
 					  GtkWidget *tab_label);
 
+#ifndef GNOME_EXCLUDE_DEPRECATED
 /* Deprecated, use set_modified */
 void      gnome_property_box_set_state   (GnomePropertyBox *property_box,
 					  gboolean state);
+#endif
 
 END_GNOME_DECLS
 
Index: libgnomeui/libgnomeui.h
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnomeui/libgnomeui.h,v
retrieving revision 1.96
diff -u -u -r1.96 libgnomeui.h
--- libgnomeui/libgnomeui.h	1999/07/13 00:56:04	1.96
+++ libgnomeui/libgnomeui.h	1999/08/04 20:38:53
@@ -6,11 +6,15 @@
 #include "libgnome/gnome-defs.h"
 #include "libgnomeui/gnome-uidefs.h"
 #include "libgnomeui/gnome-about.h"
+#ifndef GNOME_EXCLUDE_EXPERIMENTAL
 #include "libgnomeui/gnome-animator.h"
+#endif
 #include "libgnomeui/gnome-app.h"
 #include "libgnomeui/gnome-appbar.h"
 #include "libgnomeui/gnome-app-helper.h"
+#ifndef GNOME_EXCLUDE_EXPERIMENTAL
 #include "libgnomeui/gnome-app-util.h"
+#endif
 #include "libgnomeui/gnome-canvas.h"
 #include "libgnomeui/gnome-canvas-image.h"
 #include "libgnomeui/gnome-canvas-line.h"
@@ -24,43 +28,64 @@
 #include "libgnomeui/gnome-dentry-edit.h"
 #include "libgnomeui/gnome-dialog.h"
 #include "libgnomeui/gnome-dialog-util.h"
+#ifndef GNOME_EXCLUDE_DEPRECATED
 #include "libgnomeui/gnome-dns.h"
+#endif
 #include "libgnomeui/gnome-dock.h"
 #include "libgnomeui/gnome-dock-band.h"
 #include "libgnomeui/gnome-dock-item.h"
 #include "libgnomeui/gnome-entry.h"
 #include "libgnomeui/gnome-file-entry.h"
 #include "libgnomeui/gnome-font-picker.h"
+#ifndef GNOME_EXCLUDE_DEPRECATED
 #include "libgnomeui/gnome-font-selector.h"
+#endif
 #include "libgnomeui/gnome-geometry.h"
+#ifndef GNOME_EXCLUDE_DEPRECATED
 #include "libgnomeui/gnome-guru.h"
+#endif
 #include "libgnomeui/gnome-icon-list.h"
 #include "libgnomeui/gnome-icon-item.h"
 #include "libgnomeui/gnome-icon-sel.h"
 #include "libgnomeui/gnome-icon-entry.h"
 #include "libgnomeui/gnome-init.h"
+#ifndef GNOME_EXCLUDE_DEPRECATED
 #include "libgnomeui/gnome-less.h"
+#endif
 #include "libgnomeui/gnome-messagebox.h"
 #include "libgnomeui/gnome-number-entry.h"
+/* Considering moving this to gnome-print, so this file 
+   is deprecated but the API isn't */
 #include "libgnomeui/gnome-paper-selector.h"
 #include "libgnomeui/gnome-popup-menu.h"
+/* deprecated? */
 #include "libgnomeui/gnome-popup-help.h"
 #include "libgnomeui/gnome-pixmap.h"
 #include "libgnomeui/gnome-pixmap-entry.h"
+#ifndef GNOME_EXCLUDE_DEPRECATED
 #include "libgnomeui/gnome-preferences.h"
+#endif
 #include "libgnomeui/gnome-propertybox.h"
+#ifndef GNOME_EXCLUDE_DEPRECATED
 #include "libgnomeui/gnome-properties.h"
 #include "libgnomeui/gnome-property-entries.h"
+#endif
 #include "libgnomeui/gnome-scores.h"
+#ifndef GNOME_EXCLUDE_DEPRECATED
 #include "libgnomeui/gnome-spell.h"
 #include "libgnomeui/gnome-startup.h"
+#endif
 #include "libgnomeui/gnome-types.h"
 #include "libgnomeui/gnome-stock.h"
 #include "libgnomeui/gnome-client.h"
+#ifndef GNOME_EXCLUDE_DEPRECATED
 #include "libgnomeui/gtkcauldron.h"
+#endif
 #include "libgnomeui/gtk-clock.h"
 #include "libgnomeui/gtkdial.h"
+#ifndef GNOME_EXCLUDE_DEPRECATED
 #include "libgnomeui/gtk-ted.h"
+#endif
 #include "libgnomeui/gtkpixmapmenuitem.h"
 #include "libgnomeui/gnome-dateedit.h"
 #include "libgnomeui/gnome-calculator.h"