Fix problem with g_return_if_fail return value.

Sun Oct 21 23:27:00 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwidget.c (gtk_widget_translate_coordinates): Fix
	problem with g_return_if_fail return value.

 	* gdk/x11/gdkproperty-x11.c docs/Changes-2.0.txt: Move over the
	virtual atom code from the gdk-multihead branch, removing the per-display
	part. Virtualizing atoms needs to be done now to prevent compat
	breakage in direct Xlib accessing code in the future. (#62208)

 	* gdk/x11/gdkx.h: gdk/gdk/x11/gdkproperty-x11.c: Export
 	gdk_x11_xatom_to_atom, gdk_x11_atom_to_xatom().

	* gdk/gdktypes.h docs/Changes-2.0.txt: Make GdkAtom
	an opaque pointer type so the compiler catches attempts
	to mingle it with X atoms.

	* gdk/x11/{gdkdnd-x11.c,gdkevents-x11.c,gdkglobals-x11.c,
	  gdkkeys-x11.c, gdkmain-x11.c, gdkprivate-x11.c,
	  gdkproperty-x11.c, gdkselection-x11.c, gdkwindow-x11.c}
	  gtk/{gtkclist.c,gtkctree.c,gtkdnd.c,gtkplug.c,gtksocket.c}
	  tests/testdnd.c,tests/testselection.c:
	Fix up for above atom changes.

	* gdk/gdkselection.h (GDK_SELECTION_CLIPBOARD): Add, since we
	now have the ability to add custom predefines.

	* gtk/{gtkentry.c,gtklabel.c,gtkoldeditable.c,gtktextview.c}:
	Use GDK_SELECTION_CLIPBOARD instead of GDK_NONE in calls
	to gtk_clipboard_get().

	* gdk/win32/gdkproperty-win32.c: Add CLIPBOARD, fix up
	for GdkAtom => pointer change.

	* gdk/linux-fb/gdkproperty-fb.c: Fix handling of predefined
	atoms, fix for GdkAtom => pointer change.

1 files changed, 27 insertions, 29 deletions

diff --git a/gdk/gdkselection.h b/gdk/gdkselection.h
index 94723d6b4d..8659f37956 100644
--- a/gdk/gdkselection.h
+++ b/gdk/gdkselection.h
@@ -7,35 +7,33 @@
 extern "C" {
 #endif /* __cplusplus */
 
-/* The next three types define enums for predefined atoms relating
-   to selections. In general, one will need to use gdk_intern_atom */
-
-typedef enum
-{
-  GDK_SELECTION_PRIMARY = 1,
-  GDK_SELECTION_SECONDARY = 2
-} GdkSelection;
-
-typedef enum
-{
-  GDK_TARGET_BITMAP = 5,
-  GDK_TARGET_COLORMAP = 7,
-  GDK_TARGET_DRAWABLE = 17,
-  GDK_TARGET_PIXMAP = 20,
-  GDK_TARGET_STRING = 31
-} GdkTarget;
-
-typedef enum
-{
-  GDK_SELECTION_TYPE_ATOM = 4,
-  GDK_SELECTION_TYPE_BITMAP = 5,
-  GDK_SELECTION_TYPE_COLORMAP = 7,
-  GDK_SELECTION_TYPE_DRAWABLE = 17,
-  GDK_SELECTION_TYPE_INTEGER = 19,
-  GDK_SELECTION_TYPE_PIXMAP = 20,
-  GDK_SELECTION_TYPE_WINDOW = 33,
-  GDK_SELECTION_TYPE_STRING = 31
-} GdkSelectionType;
+/* Predefined atoms relating to selections. In general, one will need to use
+ * gdk_intern_atom
+ */
+#define GDK_SELECTION_PRIMARY 		_GDK_MAKE_ATOM (1)
+#define GDK_SELECTION_SECONDARY 	_GDK_MAKE_ATOM (2)
+#define GDK_SELECTION_CLIPBOARD 	_GDK_MAKE_ATOM (69)
+#define GDK_TARGET_BITMAP 		_GDK_MAKE_ATOM (5)
+#define GDK_TARGET_COLORMAP 		_GDK_MAKE_ATOM (7)
+#define GDK_TARGET_DRAWABLE 		_GDK_MAKE_ATOM (17)
+#define GDK_TARGET_PIXMAP 		_GDK_MAKE_ATOM (20)
+#define GDK_TARGET_STRING 		_GDK_MAKE_ATOM (3)
+#define GDK_SELECTION_TYPE_ATOM 	_GDK_MAKE_ATOM (4)
+#define GDK_SELECTION_TYPE_BITMAP 	_GDK_MAKE_ATOM (5)
+#define GDK_SELECTION_TYPE_COLORMAP 	_GDK_MAKE_ATOM (7)
+#define GDK_SELECTION_TYPE_DRAWABLE 	_GDK_MAKE_ATOM (17)
+#define GDK_SELECTION_TYPE_INTEGER 	_GDK_MAKE_ATOM (19)
+#define GDK_SELECTION_TYPE_PIXMAP 	_GDK_MAKE_ATOM (20)
+#define GDK_SELECTION_TYPE_WINDOW 	_GDK_MAKE_ATOM (33)
+#define GDK_SELECTION_TYPE_STRING 	_GDK_MAKE_ATOM (3)
+
+#ifndef GDK_DISABLE_DEPRECATED
+
+typedef GdkAtom GdkSelection;
+typedef GdkAtom GdkTarget;
+typedef GdkAtom GdkSelectionType;
+
+#endif /* GDK_DISABLE_DEPRECATED */
 
 /* Selections
  */