[ Patch from Sebastian Wilhelmi, 52790 ]

Wed Aug 22 19:15:39 2001  Owen Taylor  <otaylor@redhat.com>

	[ Patch from Sebastian Wilhelmi, 52790 ]

	* gtk/gtkversion.h.in gtk/gtk.h: New file replacing gtkcompat.h

	* gdk/gdkcompat.h gdk/gdk*.h gtk/gtkcompat.h.in gtk/gtk*.h:
	Move compatibility macros from g[dt]kcompat.h to within
	#ifndef G[DT]K_DISABLE_DEPRECATED in each file.

	* gdk/gdk-pixbuf-csource.c: Fix up include of gtkcompat.h.

	* demos/Makefile.am demos/gtk-demo/Makefile.am
          docs/reference/gdk-pixbuf/Makefile.am modules/input/Makefile.am
          tests/Makefile.am: Remove references to -G[DT]K_DISABLE_DEPRECATED.

	* demos/{pixbuf-demo.c,testpixbuf-drawable.c,testpixbuf-save.c,
                 testpixbuf.c}: Fix usages of deprecated functions.

21 files changed, 51 insertions, 18 deletions

diff --git a/gtk/.cvsignore b/gtk/.cvsignore
index 3a84e3c073..461b0f27d8 100644
--- a/gtk/.cvsignore
+++ b/gtk/.cvsignore
@@ -7,7 +7,7 @@ makefile.msc
 _libs
 .libs
 libgtk-*.la
-gtkcompat.h
+gtkversion.h
 libgtk.la
 gtkfeatures.h
 gtkmarshal.h
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 0ea53da902..b4124e6a64 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -4,7 +4,6 @@ SUBDIRS=stock-icons
 
 INCLUDES = @STRIP_BEGIN@ \
 	-DG_LOG_DOMAIN=\"Gtk\"				\
-	-DGTK_DISABLE_COMPAT_H				\
 	-DGTK_LIBDIR=\"$(libdir)\"			\
 	-DGTK_DATA_PREFIX=\"$(prefix)\"			\
 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"		\
@@ -388,7 +387,7 @@ gtk_built_sources = @STRIP_BEGIN@ \
 # that don't serve as direct make target sources, i.e. they don't have
 # their own .lo rules and don't get publically installed
 gtk_extra_sources = @STRIP_BEGIN@ \
-	gtkcompat.h.in		\
+	gtkversion.h.in		\
 	maketypes.awk		\
 	makeenums.h		\
 	gtk-boxed.defs		\
@@ -399,7 +398,7 @@ gtk_extra_sources = @STRIP_BEGIN@ \
 #
 # setup GTK+ sources and their dependancies
 #
-gtk_target_headers = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkcompat.h
+gtk_target_headers = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkversion.h
 gtk_target_sources = $(gtk_c_sources) $(gtk_plug_c_sources)
 MAINTAINERCLEANFILES += $(gtk_built_sources)
 EXTRA_HEADERS +=
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 7f7c072b08..2564d77584 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -54,7 +54,6 @@
 #include <gtk/gtkcolorsel.h>
 #include <gtk/gtkcolorseldialog.h>
 #include <gtk/gtkcombo.h>
-#include <gtk/gtkcompat.h>
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkctree.h>
 #include <gtk/gtkcurve.h>
@@ -150,6 +149,7 @@
 #include <gtk/gtktypeutils.h>
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkvbbox.h>
+#include <gtk/gtkversion.h>
 #include <gtk/gtkviewport.h>
 #include <gtk/gtkvpaned.h>
 #include <gtk/gtkvruler.h>
diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h
index 65dc533bda..5a9b779aac 100644
--- a/gtk/gtkaccellabel.h
+++ b/gtk/gtkaccellabel.h
@@ -75,6 +75,9 @@ struct _GtkAccelLabelClass
   guint		 latin1_to_char : 1;
 };
 
+#ifndef GTK_DISABLE_DEPRECATED
+#define	gtk_accel_label_accelerator_width	gtk_accel_label_get_accel_width
+#endif /* GTK_DISABLE_DEPRECATED */
 
 GtkType	   gtk_accel_label_get_type	     (void) G_GNUC_CONST;
 GtkWidget *gtk_accel_label_new		     (const gchar   *string);
diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h
index 3e3fabc979..bfa2a090b2 100644
--- a/gtk/gtkcheckmenuitem.h
+++ b/gtk/gtkcheckmenuitem.h
@@ -83,6 +83,7 @@ gboolean   gtk_check_menu_item_get_inconsistent  (GtkCheckMenuItem *check_menu_i
 #ifndef GTK_DISABLE_DEPRECATED
 void	   gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item,
 						gboolean	  always);
+#define	gtk_check_menu_item_set_state		gtk_check_menu_item_set_active
 #endif
 
 #ifdef __cplusplus
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index 34f0b07f83..a4651c0aa7 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -206,6 +206,10 @@ gchar*	gtk_container_child_composite_name   (GtkContainer *container,
 					      GtkWidget	   *child);
 void   _gtk_container_dequeue_resize_handler (GtkContainer *container);
 
+#ifndef GTK_DISABLE_DEPRECATED
+#define	gtk_container_border_width		gtk_container_set_border_width
+#endif /* GTK_DISABLE_DEPRECATED */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/gtk/gtkctree.h b/gtk/gtkctree.h
index 5276bf2d89..6763ea9f1e 100644
--- a/gtk/gtkctree.h
+++ b/gtk/gtkctree.h
@@ -430,6 +430,7 @@ void gtk_ctree_sort_recursive                    (GtkCTree     *ctree,
 						  GtkCTreeNode *node);
 
 
+#define gtk_ctree_set_reorderable(t,r)                    gtk_clist_set_reorderable((GtkCList*) (t),(r))
 
 #ifdef __cplusplus
 }
diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index 5ba51e54fe..03524a3b28 100644
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -133,12 +133,9 @@ void         gtk_label_get_layout_offsets (GtkLabel *label,
                                            gint     *y);
 
 
-#ifndef	GTK_DISABLE_COMPAT_H
-#  define gtk_label_set				gtk_label_set_text
-#endif	/* GTK_DISABLE_COMPAT_H */
-
 #ifndef GTK_DISABLE_DEPRECATED
-/* Deprecated */
+
+#define  gtk_label_set           gtk_label_set_text
 void       gtk_label_get           (GtkLabel          *label,
                                     char             **str);
 
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 7cbb69974d..c4b40b0951 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -40,7 +40,7 @@
 #include <unistd.h>
 #endif
 #include "gtkdnd.h"
-#include "gtkcompat.h"
+#include "gtkversion.h"
 #include "gtkmain.h"
 #include "gtkrc.h"
 #include "gtkselection.h"
diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index 75f51c2a8c..9acfb410b0 100644
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.h
@@ -178,6 +178,12 @@ void       gtk_menu_reorder_child         (GtkMenu             *menu,
                                            GtkWidget           *child,
                                            gint                position);
 
+#ifndef GTK_DISABLE_DEPRECATED
+#define gtk_menu_append				gtk_menu_shell_append
+#define gtk_menu_prepend			gtk_menu_shell_prepend
+#define gtk_menu_insert				gtk_menu_shell_insert
+#endif /* GTK_DISABLE_DEPRECATED */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h
index 651db4534b..cead604b3b 100644
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -222,6 +222,10 @@ void gtk_notebook_reorder_child           (GtkNotebook *notebook,
 					   GtkWidget   *child,
 					   gint         position);
 
+#ifndef GTK_DISABLE_DEPRECATED
+#define	gtk_notebook_current_page               gtk_notebook_get_current_page
+#endif /* GTK_DISABLE_DEPRECATED */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/gtk/gtkpacker.h b/gtk/gtkpacker.h
index bceefef690..4c30a934d2 100644
--- a/gtk/gtkpacker.h
+++ b/gtk/gtkpacker.h
@@ -123,6 +123,7 @@ void       gtk_packer_set_child_packing	       (GtkPacker	*packer,
 						guint		 pad_y,
 						guint		 i_pad_x,
 						guint		 i_pad_y);
+#define	   gtk_packer_configure                gtk_packer_set_child_packing
 void	   gtk_packer_reorder_child	       (GtkPacker	*packer,
 						GtkWidget	*child,
 						gint             position);
diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h
index a52db32589..673c5b69d6 100644
--- a/gtk/gtkpaned.h
+++ b/gtk/gtkpaned.h
@@ -105,6 +105,13 @@ void    gtk_paned_compute_position (GtkPaned  *paned,
 				    gint       allocation,
 				    gint       child1_req,
 				    gint       child2_req);
+
+#ifndef GTK_DISABLE_DEPRECATED
+#define	gtk_paned_gutter_size(p,s)		(void) 0
+#define	gtk_paned_set_gutter_size(p,s)		(void) 0
+#define	gtk_paned_handle_size			gtk_paned_set_handle_size
+#endif /* GTK_DISABLE_DEPRECATED */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index b454d2051c..eaed57f151 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -47,7 +47,7 @@
 #include <glib.h>
 #include "gdkconfig.h"
 
-#include "gtkcompat.h"
+#include "gtkversion.h"
 #include "gtkrc.h"
 #include "gtkbindings.h"
 #include "gtkthemes.h"
diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h
index bfb099ef1b..b6a8e212cc 100644
--- a/gtk/gtkscale.h
+++ b/gtk/gtkscale.h
@@ -86,6 +86,10 @@ void    _gtk_scale_get_value_size  (GtkScale        *scale,
 gchar  *_gtk_scale_format_value   (GtkScale        *scale,
                                    gdouble          value);
 
+#ifndef GTK_DISABLE_DEPRECATED
+#define	gtk_scale_value_width                   gtk_scale_get_value_width
+#endif /* GTK_DISABLE_DEPRECATED */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h
index 291dfdc392..4335e0bb87 100644
--- a/gtk/gtkstyle.h
+++ b/gtk/gtkstyle.h
@@ -841,6 +841,7 @@ const GValue* _gtk_style_peek_property_value (GtkStyle           *style,
 
 /* depprecated */
 #ifndef GTK_DISABLE_DEPRECATED
+#define gtk_style_apply_default_pixmap(s,gw,st,a,x,y,w,h) gtk_style_apply_default_background (s,gw,1,st,a,x,y,w,h)
 void gtk_draw_string     (GtkStyle        *style,
 			  GdkWindow       *window,
 			  GtkStateType     state_type,
diff --git a/gtk/gtktogglebutton.h b/gtk/gtktogglebutton.h
index c9f8226ada..abc4e6f1fc 100644
--- a/gtk/gtktogglebutton.h
+++ b/gtk/gtktogglebutton.h
@@ -84,6 +84,10 @@ void       gtk_toggle_button_set_inconsistent  (GtkToggleButton *toggle_button,
 gboolean   gtk_toggle_button_get_inconsistent  (GtkToggleButton *toggle_button);
 
 
+#ifndef GTK_DISABLE_DEPRECATED
+#define	gtk_toggle_button_set_state		gtk_toggle_button_set_active
+#endif /* GTK_DISABLE_DEPRECATED */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index 3f13ab9d46..4eed3dbac4 100644
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -72,10 +72,10 @@ typedef enum	/*< skip >*/
 /* outdated macros that really shouldn't e used anymore,
  * use the GLib type system instead
  */
-#ifndef	GTK_DISABLE_COMPAT_H
+#ifndef GTK_DISABLE_DEPRECATED
 #define	GTK_TYPE_FUNDAMENTAL_LAST        (G_TYPE_LAST_RESERVED_FUNDAMENTAL - 1)
 #define	GTK_TYPE_FUNDAMENTAL_MAX         (G_TYPE_FUNDAMENTAL_MAX)
-#endif /* GTK_DISABLE_COMPAT_H */
+#endif /* GTK_DISABLE_DEPRECATED */
 
 /* glib macro wrappers (compatibility) */
 #define GTK_STRUCT_OFFSET	G_STRUCT_OFFSET
diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 7753d02dd6..457fbdb514 100644
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -250,7 +250,8 @@ void       gtk_window_set_policy               (GtkWindow           *window,
 						gint                 allow_shrink,
 						gint                 allow_grow,
 						gint                 auto_shrink);
-#endif
+#define	gtk_window_position			gtk_window_set_position
+#endif /* GTK_DISABLE_DEPRECATED */
 
 /* Set initial default size of the window (does not constrain user
  * resize operations)
diff --git a/gtk/makefile.mingw.in b/gtk/makefile.mingw.in
index 85891a00de..6501bee21d 100644
--- a/gtk/makefile.mingw.in
+++ b/gtk/makefile.mingw.in
@@ -34,7 +34,7 @@ AWK = awk
 
 INCLUDES = -I . -I .. -I ../gdk -I ../gdk-pixbuf
 DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS)
-DEFINES = -DGTK_DISABLE_COMPAT_H -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" -DGTK_VERSION=\"@GTK_VERSION@\"
+DEFINES = -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" -DGTK_VERSION=\"@GTK_VERSION@\"
 
 GLIB_GENMARSHAL = $(GLIB)/gobject/glib-genmarshal.exe
 
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index cec02d5c45..80c451ec1e 100644
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -29,7 +29,7 @@ DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(A
 LDFLAGS = $(ATK_LIBS) /link /machine:ix86 $(LINKDEBUG)
 # Some files use near as an identifier
 # Don't define GTK_COMPILATION here, because it's for gtk-x.x.dll only
-DEFINES = -DG_ENABLE_DEBUG -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear -DGTK_VERSION=\"$(GTK_VER)\"
+DEFINES = -DG_ENABLE_DEBUG -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear -DGTK_VERSION=\"$(GTK_VER)\"
 
 TOUCH = copy makefile.msc+nul
 
@@ -341,7 +341,7 @@ gtk_public_h_sources =		\
 
 # these aren't use here, but listed for reference
 gtk_extra_sources = \
-	gtkcompat.h		\
+	gtkversion.h		\
 	maketypes.awk		\
 	makeenums.h		\
 	gtk-boxed.defs		\