Directly include the contents of gdkcursors.h in the GdkCursorType enum.

        * gdk/gdkcursor.h: Directly include the contents
        of gdkcursors.h in the GdkCursorType enum.

        * gdk/gdkcursors.h: Deleted.

        * gdk/gdkkeysyms.h: Remove XFree86-specific keysyms, add
        header boilerplate.

        * gdk/Makefile.am: Remove the X-derived-headers rule.

        * gdk/tmpl/cursors.sgml: Document GdkCursor and standard cursors.

1 files changed, 78 insertions, 2 deletions

diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index be2778c3fa..24e9c7f7d9 100644
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -13,9 +13,85 @@ extern "C" {
  */
 typedef enum
 {
-#include <gdk/gdkcursors.h>
+  GDK_X_CURSOR 		  = 0,
+  GDK_ARROW 		  = 2,
+  GDK_BASED_ARROW_DOWN    = 4,
+  GDK_BASED_ARROW_UP 	  = 6,
+  GDK_BOAT 		  = 8,
+  GDK_BOGOSITY 		  = 10,
+  GDK_BOTTOM_LEFT_CORNER  = 12,
+  GDK_BOTTOM_RIGHT_CORNER = 14,
+  GDK_BOTTOM_SIDE 	  = 16,
+  GDK_BOTTOM_TEE 	  = 18,
+  GDK_BOX_SPIRAL 	  = 20,
+  GDK_CENTER_PTR 	  = 22,
+  GDK_CIRCLE 		  = 24,
+  GDK_CLOCK	 	  = 26,
+  GDK_COFFEE_MUG 	  = 28,
+  GDK_CROSS 		  = 30,
+  GDK_CROSS_REVERSE 	  = 32,
+  GDK_CROSSHAIR 	  = 34,
+  GDK_DIAMOND_CROSS 	  = 36,
+  GDK_DOT 		  = 38,
+  GDK_DOTBOX 		  = 40,
+  GDK_DOUBLE_ARROW 	  = 42,
+  GDK_DRAFT_LARGE 	  = 44,
+  GDK_DRAFT_SMALL 	  = 46,
+  GDK_DRAPED_BOX 	  = 48,
+  GDK_EXCHANGE 		  = 50,
+  GDK_FLEUR 		  = 52,
+  GDK_GOBBLER 		  = 54,
+  GDK_GUMBY 		  = 56,
+  GDK_HAND1 		  = 58,
+  GDK_HAND2 		  = 60,
+  GDK_HEART 		  = 62,
+  GDK_ICON 		  = 64,
+  GDK_IRON_CROSS 	  = 66,
+  GDK_LEFT_PTR 		  = 68,
+  GDK_LEFT_SIDE 	  = 70,
+  GDK_LEFT_TEE 		  = 72,
+  GDK_LEFTBUTTON 	  = 74,
+  GDK_LL_ANGLE 		  = 76,
+  GDK_LR_ANGLE 	 	  = 78,
+  GDK_MAN 		  = 80,
+  GDK_MIDDLEBUTTON 	  = 82,
+  GDK_MOUSE 		  = 84,
+  GDK_PENCIL 		  = 86,
+  GDK_PIRATE 		  = 88,
+  GDK_PLUS 		  = 90,
+  GDK_QUESTION_ARROW 	  = 92,
+  GDK_RIGHT_PTR 	  = 94,
+  GDK_RIGHT_SIDE 	  = 96,
+  GDK_RIGHT_TEE 	  = 98,
+  GDK_RIGHTBUTTON 	  = 100,
+  GDK_RTL_LOGO 		  = 102,
+  GDK_SAILBOAT 		  = 104,
+  GDK_SB_DOWN_ARROW 	  = 106,
+  GDK_SB_H_DOUBLE_ARROW   = 108,
+  GDK_SB_LEFT_ARROW 	  = 110,
+  GDK_SB_RIGHT_ARROW 	  = 112,
+  GDK_SB_UP_ARROW 	  = 114,
+  GDK_SB_V_DOUBLE_ARROW   = 116,
+  GDK_SHUTTLE 		  = 118,
+  GDK_SIZING 		  = 120,
+  GDK_SPIDER		  = 122,
+  GDK_SPRAYCAN 		  = 124,
+  GDK_STAR 		  = 126,
+  GDK_TARGET 		  = 128,
+  GDK_TCROSS 		  = 130,
+  GDK_TOP_LEFT_ARROW 	  = 132,
+  GDK_TOP_LEFT_CORNER 	  = 134,
+  GDK_TOP_RIGHT_CORNER 	  = 136,
+  GDK_TOP_SIDE 		  = 138,
+  GDK_TOP_TEE 		  = 140,
+  GDK_TREK 		  = 142,
+  GDK_UL_ANGLE 		  = 144,
+  GDK_UMBRELLA 		  = 146,
+  GDK_UR_ANGLE 		  = 148,
+  GDK_WATCH 		  = 150,
+  GDK_XTERM 		  = 152,
   GDK_LAST_CURSOR,
-  GDK_CURSOR_IS_PIXMAP = -1
+  GDK_CURSOR_IS_PIXMAP 	= -1
 } GdkCursorType;
 
 struct _GdkCursor