Deprecate gdk_set/get_use_xshm, make gdk_set_use_xshm a noop. Remove

Fri Sep  7 18:17:47 2001  Owen Taylor  <otaylor@redhat.com>

	* gdk/gdk.h gdk/x11/gdkmain-x11.c: Deprecate gdk_set/get_use_xshm,
	make gdk_set_use_xshm a noop. Remove --no-xshm command line
	option. If we aren't autodetecting properly, we need
	to fix the problem, or at least make it an environment
	variable setting, to avoid problems with propagating
	to embedded children, plugins, etc.

	* gdk/gdkcolor.h: Deprecate gdk_colormap_get_system_size().

	* gdk/gdkpixbuf-render.c gdk/gdkpixbuf.h
	(gdk_pixbuf_render_pixmap_and_mask_for_colormap):
	New function to render a pixmap and mask for a particular colormap.

	* gtk/gtkwindow.c (get_pixmap_and_mask): Change to use
	gdk_pixbuf_render_pixmap_and_mask_for_colormap () instead
	of internal implementation of the same.

1 files changed, 3 insertions, 2 deletions

diff --git a/gdk/gdk.h b/gdk/gdk.h
index 701f3f6fb8..5546278349 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -75,10 +75,11 @@ void                 gdk_set_program_class (const char *program_class);
 void      gdk_error_trap_push           (void);
 gint      gdk_error_trap_pop            (void);
 
-
+#ifndef GDK_DISABLE_DEPRECATED
 void	  gdk_set_use_xshm		(gboolean	 use_xshm);
-
 gboolean  gdk_get_use_xshm		(void);
+#endif /* GDK_DISABLE_DEPRECATED */
+
 gchar*	  gdk_get_display		(void);
 
 #ifndef GDK_DISABLE_DEPRECATED