[gtkmm] Removed InputCondition and regenerated *.defs files



commit 316dce698366280438840365a4ee0afa9d6fff0a
Author: Chris Kühl <chrisk openismus com>
Date:   Mon Jun 21 15:33:25 2010 +0200

    Removed InputCondition and regenerated *.defs files
    
    * gdk/src/gdk_enums.defs: Regenerated
    * gdk/src/gdk_methods.defs: Regenerated
    * gdk/src/types.hg: Removed InputCondition

 ChangeLog                |    8 +
 gdk/src/gdk_enums.defs   |  874 +++++++++++++++++--
 gdk/src/gdk_methods.defs | 2110 +++-------------------------------------------
 gdk/src/types.hg         |    1 -
 4 files changed, 919 insertions(+), 2074 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3b23c6c..4ee3516 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-21  Chris Kühl  <chrisk openismus com>
+
+	Removed InputCondition and regenerated *.defs files
+
+	* gdk/src/gdk_enums.defs: Regenerated
+	* gdk/src/gdk_methods.defs: Regenerated
+	* gdk/src/types.hg: Removed InputCondition
+	
 2.90.3:
 
 2010-06-18  Murray Cumming  <murrayc murrayc com>
diff --git a/gdk/src/gdk_enums.defs b/gdk/src/gdk_enums.defs
index a5d1482..4fc6ca0 100644
--- a/gdk/src/gdk_enums.defs
+++ b/gdk/src/gdk_enums.defs
@@ -1,5 +1,90 @@
 ;; From gdkcursor.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   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_BLANK_CURSOR        = -2,
+;;   GDK_CURSOR_IS_PIXMAP 	  = -1
+;; } GdkCursorType;
+
 (define-enum-extended CursorType
   (in-module "Gdk")
   (c-name "GdkCursorType")
@@ -87,8 +172,124 @@
   )
 )
 
+;; From gdkdevice.h
+
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_EXTENSION_EVENTS_NONE,
+;;   GDK_EXTENSION_EVENTS_ALL,
+;;   GDK_EXTENSION_EVENTS_CURSOR
+;; } GdkExtensionMode;
+
+(define-enum-extended ExtensionMode
+  (in-module "Gdk")
+  (c-name "GdkExtensionMode")
+  (values
+    '("none" "GDK_EXTENSION_EVENTS_NONE" "0")
+    '("all" "GDK_EXTENSION_EVENTS_ALL" "1")
+    '("cursor" "GDK_EXTENSION_EVENTS_CURSOR" "2")
+  )
+)
+
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_SOURCE_MOUSE,
+;;   GDK_SOURCE_PEN,
+;;   GDK_SOURCE_ERASER,
+;;   GDK_SOURCE_CURSOR,
+;;   GDK_SOURCE_KEYBOARD
+;; } GdkInputSource;
+
+(define-enum-extended InputSource
+  (in-module "Gdk")
+  (c-name "GdkInputSource")
+  (values
+    '("mouse" "GDK_SOURCE_MOUSE" "0")
+    '("pen" "GDK_SOURCE_PEN" "1")
+    '("eraser" "GDK_SOURCE_ERASER" "2")
+    '("cursor" "GDK_SOURCE_CURSOR" "3")
+    '("keyboard" "GDK_SOURCE_KEYBOARD" "4")
+  )
+)
+
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_MODE_DISABLED,
+;;   GDK_MODE_SCREEN,
+;;   GDK_MODE_WINDOW
+;; } GdkInputMode;
+
+(define-enum-extended InputMode
+  (in-module "Gdk")
+  (c-name "GdkInputMode")
+  (values
+    '("disabled" "GDK_MODE_DISABLED" "0")
+    '("screen" "GDK_MODE_SCREEN" "1")
+    '("window" "GDK_MODE_WINDOW" "2")
+  )
+)
+
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_AXIS_IGNORE,
+;;   GDK_AXIS_X,
+;;   GDK_AXIS_Y,
+;;   GDK_AXIS_PRESSURE,
+;;   GDK_AXIS_XTILT,
+;;   GDK_AXIS_YTILT,
+;;   GDK_AXIS_WHEEL,
+;;   GDK_AXIS_LAST
+;; } GdkAxisUse;
+
+(define-enum-extended AxisUse
+  (in-module "Gdk")
+  (c-name "GdkAxisUse")
+  (values
+    '("ignore" "GDK_AXIS_IGNORE" "0")
+    '("x" "GDK_AXIS_X" "1")
+    '("y" "GDK_AXIS_Y" "2")
+    '("pressure" "GDK_AXIS_PRESSURE" "3")
+    '("xtilt" "GDK_AXIS_XTILT" "4")
+    '("ytilt" "GDK_AXIS_YTILT" "5")
+    '("wheel" "GDK_AXIS_WHEEL" "6")
+    '("last" "GDK_AXIS_LAST" "7")
+  )
+)
+
+;; Original typedef:
+;; typedef enum {
+;;   GDK_DEVICE_TYPE_MASTER,
+;;   GDK_DEVICE_TYPE_SLAVE,
+;;   GDK_DEVICE_TYPE_FLOATING
+;; } GdkDeviceType;
+
+(define-enum-extended DeviceType
+  (in-module "Gdk")
+  (c-name "GdkDeviceType")
+  (values
+    '("master" "GDK_DEVICE_TYPE_MASTER" "0")
+    '("slave" "GDK_DEVICE_TYPE_SLAVE" "1")
+    '("floating" "GDK_DEVICE_TYPE_FLOATING" "2")
+  )
+)
+
 ;; From gdkdnd.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_ACTION_DEFAULT = 1 << 0,
+;;   GDK_ACTION_COPY    = 1 << 1,
+;;   GDK_ACTION_MOVE    = 1 << 2,
+;;   GDK_ACTION_LINK    = 1 << 3,
+;;   GDK_ACTION_PRIVATE = 1 << 4,
+;;   GDK_ACTION_ASK     = 1 << 5
+;; } GdkDragAction;
+
 (define-flags-extended DragAction
   (in-module "Gdk")
   (c-name "GdkDragAction")
@@ -102,30 +303,98 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_DRAG_PROTO_MOTIF,
+;;   GDK_DRAG_PROTO_XDND,
+;;   GDK_DRAG_PROTO_ROOTWIN,	  /* A root window with nobody claiming
+;; 				   * drags */
+;;   GDK_DRAG_PROTO_NONE,		  /* Not a valid drag window */
+;;   GDK_DRAG_PROTO_WIN32_DROPFILES, /* The simple WM_DROPFILES dnd */
+;;   GDK_DRAG_PROTO_OLE2,		  /* The complex OLE2 dnd (not implemented) */
+;;   GDK_DRAG_PROTO_LOCAL            /* Intra-app */
+;; } GdkDragProtocol;
+
 (define-enum-extended DragProtocol
   (in-module "Gdk")
   (c-name "GdkDragProtocol")
   (values
     '("motif" "GDK_DRAG_PROTO_MOTIF" "0")
     '("xdnd" "GDK_DRAG_PROTO_XDND" "1")
-    '("none" "GDK_DRAG_PROTO_NONE" "2")
-    '("win32-dropfiles" "GDK_DRAG_PROTO_WIN32_DROPFILES" "3")
-    '("ole2" "GDK_DRAG_PROTO_OLE2" "4")
-    '("local" "GDK_DRAG_PROTO_LOCAL" "5")
+    '("rootwin" "GDK_DRAG_PROTO_ROOTWIN" "2")
+    '("none" "GDK_DRAG_PROTO_NONE" "3")
+    '("win32-dropfiles" "GDK_DRAG_PROTO_WIN32_DROPFILES" "4")
+    '("ole2" "GDK_DRAG_PROTO_OLE2" "5")
+    '("local" "GDK_DRAG_PROTO_LOCAL" "6")
   )
 )
 
 ;; From gdkevents.h
 
+;; Original typedef:
+;; typedef enum {
+;;   GDK_FILTER_CONTINUE,	  /* Event not handled, continue processesing */
+;;   GDK_FILTER_TRANSLATE,	  /* Native event translated into a GDK event and
+;;                              stored in the "event" structure that was
+;;                              passed in */
+;;   GDK_FILTER_REMOVE	  /* Terminate processing, removing event */
+;; } GdkFilterReturn;
+
 (define-enum-extended FilterReturn
   (in-module "Gdk")
   (c-name "GdkFilterReturn")
   (values
     '("continue" "GDK_FILTER_CONTINUE" "0")
-    '("remove" "GDK_FILTER_REMOVE" "1")
+    '("translate" "GDK_FILTER_TRANSLATE" "1")
+    '("remove" "GDK_FILTER_REMOVE" "2")
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_NOTHING		= -1,
+;;   GDK_DELETE		= 0,
+;;   GDK_DESTROY		= 1,
+;;   GDK_EXPOSE		= 2,
+;;   GDK_MOTION_NOTIFY	= 3,
+;;   GDK_BUTTON_PRESS	= 4,
+;;   GDK_2BUTTON_PRESS	= 5,
+;;   GDK_3BUTTON_PRESS	= 6,
+;;   GDK_BUTTON_RELEASE	= 7,
+;;   GDK_KEY_PRESS		= 8,
+;;   GDK_KEY_RELEASE	= 9,
+;;   GDK_ENTER_NOTIFY	= 10,
+;;   GDK_LEAVE_NOTIFY	= 11,
+;;   GDK_FOCUS_CHANGE	= 12,
+;;   GDK_CONFIGURE		= 13,
+;;   GDK_MAP		= 14,
+;;   GDK_UNMAP		= 15,
+;;   GDK_PROPERTY_NOTIFY	= 16,
+;;   GDK_SELECTION_CLEAR	= 17,
+;;   GDK_SELECTION_REQUEST = 18,
+;;   GDK_SELECTION_NOTIFY	= 19,
+;;   GDK_PROXIMITY_IN	= 20,
+;;   GDK_PROXIMITY_OUT	= 21,
+;;   GDK_DRAG_ENTER        = 22,
+;;   GDK_DRAG_LEAVE        = 23,
+;;   GDK_DRAG_MOTION       = 24,
+;;   GDK_DRAG_STATUS       = 25,
+;;   GDK_DROP_START        = 26,
+;;   GDK_DROP_FINISHED     = 27,
+;;   GDK_CLIENT_EVENT	= 28,
+;;   GDK_VISIBILITY_NOTIFY = 29,
+;;   GDK_NO_EXPOSE		= 30,
+;;   GDK_SCROLL            = 31,
+;;   GDK_WINDOW_STATE      = 32,
+;;   GDK_SETTING           = 33,
+;;   GDK_OWNER_CHANGE      = 34,
+;;   GDK_GRAB_BROKEN       = 35,
+;;   GDK_DAMAGE            = 36,
+;;   GDK_EVENT_LAST        /* helper variable for decls */
+;; } GdkEventType;
+
 (define-enum-extended EventType
   (in-module "Gdk")
   (c-name "GdkEventType")
@@ -172,34 +441,13 @@
   )
 )
 
-(define-flags-extended EventMask
-  (in-module "Gdk")
-  (c-name "GdkEventMask")
-  (values
-    '("exposure-mask" "GDK_EXPOSURE_MASK" "1 << 1")
-    '("pointer-motion-mask" "GDK_POINTER_MOTION_MASK" "1 << 2")
-    '("pointer-motion-hint-mask" "GDK_POINTER_MOTION_HINT_MASK" "1 << 3")
-    '("button-motion-mask" "GDK_BUTTON_MOTION_MASK" "1 << 4")
-    '("button1-motion-mask" "GDK_BUTTON1_MOTION_MASK" "1 << 5")
-    '("button2-motion-mask" "GDK_BUTTON2_MOTION_MASK" "1 << 6")
-    '("button3-motion-mask" "GDK_BUTTON3_MOTION_MASK" "1 << 7")
-    '("button-press-mask" "GDK_BUTTON_PRESS_MASK" "1 << 8")
-    '("button-release-mask" "GDK_BUTTON_RELEASE_MASK" "1 << 9")
-    '("key-press-mask" "GDK_KEY_PRESS_MASK" "1 << 10")
-    '("key-release-mask" "GDK_KEY_RELEASE_MASK" "1 << 11")
-    '("enter-notify-mask" "GDK_ENTER_NOTIFY_MASK" "1 << 12")
-    '("leave-notify-mask" "GDK_LEAVE_NOTIFY_MASK" "1 << 13")
-    '("focus-change-mask" "GDK_FOCUS_CHANGE_MASK" "1 << 14")
-    '("structure-mask" "GDK_STRUCTURE_MASK" "1 << 15")
-    '("property-change-mask" "GDK_PROPERTY_CHANGE_MASK" "1 << 16")
-    '("visibility-notify-mask" "GDK_VISIBILITY_NOTIFY_MASK" "1 << 17")
-    '("proximity-in-mask" "GDK_PROXIMITY_IN_MASK" "1 << 18")
-    '("proximity-out-mask" "GDK_PROXIMITY_OUT_MASK" "1 << 19")
-    '("substructure-mask" "GDK_SUBSTRUCTURE_MASK" "1 << 20")
-    '("scroll-mask" "GDK_SCROLL_MASK" "1 << 21")
-    '("all-events-mask" "GDK_ALL_EVENTS_MASK" "0x3FFFFE")
-  )
-)
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_VISIBILITY_UNOBSCURED,
+;;   GDK_VISIBILITY_PARTIAL,
+;;   GDK_VISIBILITY_FULLY_OBSCURED
+;; } GdkVisibilityState;
 
 (define-enum-extended VisibilityState
   (in-module "Gdk")
@@ -211,6 +459,15 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_SCROLL_UP,
+;;   GDK_SCROLL_DOWN,
+;;   GDK_SCROLL_LEFT,
+;;   GDK_SCROLL_RIGHT
+;; } GdkScrollDirection;
+
 (define-enum-extended ScrollDirection
   (in-module "Gdk")
   (c-name "GdkScrollDirection")
@@ -222,6 +479,17 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_NOTIFY_ANCESTOR		= 0,
+;;   GDK_NOTIFY_VIRTUAL		= 1,
+;;   GDK_NOTIFY_INFERIOR		= 2,
+;;   GDK_NOTIFY_NONLINEAR		= 3,
+;;   GDK_NOTIFY_NONLINEAR_VIRTUAL	= 4,
+;;   GDK_NOTIFY_UNKNOWN		= 5
+;; } GdkNotifyType;
+
 (define-enum-extended NotifyType
   (in-module "Gdk")
   (c-name "GdkNotifyType")
@@ -235,6 +503,17 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_CROSSING_NORMAL,
+;;   GDK_CROSSING_GRAB,
+;;   GDK_CROSSING_UNGRAB,
+;;   GDK_CROSSING_GTK_GRAB,
+;;   GDK_CROSSING_GTK_UNGRAB,
+;;   GDK_CROSSING_STATE_CHANGED
+;; } GdkCrossingMode;
+
 (define-enum-extended CrossingMode
   (in-module "Gdk")
   (c-name "GdkCrossingMode")
@@ -248,6 +527,13 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_PROPERTY_NEW_VALUE,
+;;   GDK_PROPERTY_DELETE
+;; } GdkPropertyState;
+
 (define-enum-extended PropertyState
   (in-module "Gdk")
   (c-name "GdkPropertyState")
@@ -257,6 +543,18 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_WINDOW_STATE_WITHDRAWN  = 1 << 0,
+;;   GDK_WINDOW_STATE_ICONIFIED  = 1 << 1,
+;;   GDK_WINDOW_STATE_MAXIMIZED  = 1 << 2,
+;;   GDK_WINDOW_STATE_STICKY     = 1 << 3,
+;;   GDK_WINDOW_STATE_FULLSCREEN = 1 << 4,
+;;   GDK_WINDOW_STATE_ABOVE      = 1 << 5,
+;;   GDK_WINDOW_STATE_BELOW      = 1 << 6
+;; } GdkWindowState;
+
 (define-flags-extended WindowState
   (in-module "Gdk")
   (c-name "GdkWindowState")
@@ -271,6 +569,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_SETTING_ACTION_NEW,
+;;   GDK_SETTING_ACTION_CHANGED,
+;;   GDK_SETTING_ACTION_DELETED
+;; } GdkSettingAction;
+
 (define-enum-extended SettingAction
   (in-module "Gdk")
   (c-name "GdkSettingAction")
@@ -281,6 +587,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_OWNER_CHANGE_NEW_OWNER,
+;;   GDK_OWNER_CHANGE_DESTROY,
+;;   GDK_OWNER_CHANGE_CLOSE
+;; } GdkOwnerChange;
+
 (define-enum-extended OwnerChange
   (in-module "Gdk")
   (c-name "GdkOwnerChange")
@@ -293,6 +607,13 @@
 
 ;; From gdkfont.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_FONT_FONT,
+;;   GDK_FONT_FONTSET
+;; } GdkFontType;
+
 (define-enum-extended FontType
   (in-module "Gdk")
   (c-name "GdkFontType")
@@ -304,6 +625,15 @@
 
 ;; From gdkgc.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_CAP_NOT_LAST,
+;;   GDK_CAP_BUTT,
+;;   GDK_CAP_ROUND,
+;;   GDK_CAP_PROJECTING
+;; } GdkCapStyle;
+
 (define-enum-extended CapStyle
   (in-module "Gdk")
   (c-name "GdkCapStyle")
@@ -315,6 +645,15 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_SOLID,
+;;   GDK_TILED,
+;;   GDK_STIPPLED,
+;;   GDK_OPAQUE_STIPPLED
+;; } GdkFill;
+
 (define-enum-extended Fill
   (in-module "Gdk")
   (c-name "GdkFill")
@@ -326,6 +665,27 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_COPY,
+;;   GDK_INVERT,
+;;   GDK_XOR,
+;;   GDK_CLEAR,
+;;   GDK_AND,
+;;   GDK_AND_REVERSE,
+;;   GDK_AND_INVERT,
+;;   GDK_NOOP,
+;;   GDK_OR,
+;;   GDK_EQUIV,
+;;   GDK_OR_REVERSE,
+;;   GDK_COPY_INVERT,
+;;   GDK_OR_INVERT,
+;;   GDK_NAND,
+;;   GDK_NOR,
+;;   GDK_SET
+;; } GdkFunction;
+
 (define-enum-extended Function
   (in-module "Gdk")
   (c-name "GdkFunction")
@@ -349,6 +709,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_JOIN_MITER,
+;;   GDK_JOIN_ROUND,
+;;   GDK_JOIN_BEVEL
+;; } GdkJoinStyle;
+
 (define-enum-extended JoinStyle
   (in-module "Gdk")
   (c-name "GdkJoinStyle")
@@ -359,6 +727,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_LINE_SOLID,
+;;   GDK_LINE_ON_OFF_DASH,
+;;   GDK_LINE_DOUBLE_DASH
+;; } GdkLineStyle;
+
 (define-enum-extended LineStyle
   (in-module "Gdk")
   (c-name "GdkLineStyle")
@@ -369,6 +745,13 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_CLIP_BY_CHILDREN	= 0,
+;;   GDK_INCLUDE_INFERIORS = 1
+;; } GdkSubwindowMode;
+
 (define-enum-extended SubwindowMode
   (in-module "Gdk")
   (c-name "GdkSubwindowMode")
@@ -378,6 +761,29 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_GC_FOREGROUND    = 1 << 0,
+;;   GDK_GC_BACKGROUND    = 1 << 1,
+;;   GDK_GC_FONT	       = 1 << 2,
+;;   GDK_GC_FUNCTION      = 1 << 3,
+;;   GDK_GC_FILL	       = 1 << 4,
+;;   GDK_GC_TILE	       = 1 << 5,
+;;   GDK_GC_STIPPLE       = 1 << 6,
+;;   GDK_GC_CLIP_MASK     = 1 << 7,
+;;   GDK_GC_SUBWINDOW     = 1 << 8,
+;;   GDK_GC_TS_X_ORIGIN   = 1 << 9,
+;;   GDK_GC_TS_Y_ORIGIN   = 1 << 10,
+;;   GDK_GC_CLIP_X_ORIGIN = 1 << 11,
+;;   GDK_GC_CLIP_Y_ORIGIN = 1 << 12,
+;;   GDK_GC_EXPOSURES     = 1 << 13,
+;;   GDK_GC_LINE_WIDTH    = 1 << 14,
+;;   GDK_GC_LINE_STYLE    = 1 << 15,
+;;   GDK_GC_CAP_STYLE     = 1 << 16,
+;;   GDK_GC_JOIN_STYLE    = 1 << 17
+;; } GdkGCValuesMask;
+
 (define-flags-extended GCValuesMask
   (in-module "Gdk")
   (c-name "GdkGCValuesMask")
@@ -405,6 +811,14 @@
 
 ;; From gdkimage.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_IMAGE_NORMAL,
+;;   GDK_IMAGE_SHARED,
+;;   GDK_IMAGE_FASTEST
+;; } GdkImageType;
+
 (define-enum-extended ImageType
   (in-module "Gdk")
   (c-name "GdkImageType")
@@ -415,64 +829,41 @@
   )
 )
 
-;; From gdkinput.h
-
-(define-enum-extended ExtensionMode
-  (in-module "Gdk")
-  (c-name "GdkExtensionMode")
-  (values
-    '("none" "GDK_EXTENSION_EVENTS_NONE" "0")
-    '("all" "GDK_EXTENSION_EVENTS_ALL" "1")
-    '("cursor" "GDK_EXTENSION_EVENTS_CURSOR" "2")
-  )
-)
-
-(define-enum-extended InputSource
-  (in-module "Gdk")
-  (c-name "GdkInputSource")
-  (values
-    '("mouse" "GDK_SOURCE_MOUSE" "0")
-    '("pen" "GDK_SOURCE_PEN" "1")
-    '("eraser" "GDK_SOURCE_ERASER" "2")
-    '("cursor" "GDK_SOURCE_CURSOR" "3")
-  )
-)
-
-(define-enum-extended InputMode
-  (in-module "Gdk")
-  (c-name "GdkInputMode")
-  (values
-    '("disabled" "GDK_MODE_DISABLED" "0")
-    '("screen" "GDK_MODE_SCREEN" "1")
-    '("window" "GDK_MODE_WINDOW" "2")
-  )
-)
-
-(define-enum-extended AxisUse
-  (in-module "Gdk")
-  (c-name "GdkAxisUse")
-  (values
-    '("ignore" "GDK_AXIS_IGNORE" "0")
-    '("x" "GDK_AXIS_X" "1")
-    '("y" "GDK_AXIS_Y" "2")
-    '("pressure" "GDK_AXIS_PRESSURE" "3")
-    '("xtilt" "GDK_AXIS_XTILT" "4")
-    '("ytilt" "GDK_AXIS_YTILT" "5")
-    '("wheel" "GDK_AXIS_WHEEL" "6")
-    '("last" "GDK_AXIS_LAST" "7")
-  )
-)
-
 ;; From gdkinternals.h
 
+;; Original typedef:
+;; typedef enum {
+;;   GDK_COLOR_WRITEABLE = 1 << 0
+;; } GdkColorInfoFlags;
+
 (define-flags-extended ColorInfoFlags
   (in-module "Gdk")
   (c-name "GdkColorInfoFlags")
   (values
-    '("e" "GDK_COLOR_WRITEABLE" "1 << 0")
+    '("writeable" "GDK_COLOR_WRITEABLE" "1 << 0")
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   GDK_DEBUG_MISC          = 1 << 0,
+;;   GDK_DEBUG_EVENTS        = 1 << 1,
+;;   GDK_DEBUG_DND           = 1 << 2,
+;;   GDK_DEBUG_XIM           = 1 << 3,
+;;   GDK_DEBUG_NOGRABS       = 1 << 4,
+;;   GDK_DEBUG_COLORMAP	  = 1 << 5,
+;;   GDK_DEBUG_GDKRGB	  = 1 << 6,
+;;   GDK_DEBUG_GC		  = 1 << 7,
+;;   GDK_DEBUG_PIXMAP	  = 1 << 8,
+;;   GDK_DEBUG_IMAGE	  = 1 << 9,
+;;   GDK_DEBUG_INPUT	  = 1 <<10,
+;;   GDK_DEBUG_CURSOR	  = 1 <<11,
+;;   GDK_DEBUG_MULTIHEAD	  = 1 <<12,
+;;   GDK_DEBUG_XINERAMA	  = 1 <<13,
+;;   GDK_DEBUG_DRAW	  = 1 <<14,
+;;   GDK_DEBUG_EVENTLOOP     = 1 <<15
+;; } GdkDebugFlag;
+
 (define-flags-extended DebugFlag
   (in-module "Gdk")
   (c-name "GdkDebugFlag")
@@ -496,6 +887,16 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum 
+;; {
+;;   GDK_ARG_STRING,
+;;   GDK_ARG_INT,
+;;   GDK_ARG_BOOL,
+;;   GDK_ARG_NOBOOL,
+;;   GDK_ARG_CALLBACK
+;; } GdkArgType;
+
 (define-enum-extended ArgType
   (in-module "Gdk")
   (c-name "GdkArgType")
@@ -508,16 +909,33 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   /* Following flag is set for events on the event queue during
+;;    * translation and cleared afterwards.
+;;    */
+;;   GDK_EVENT_PENDING = 1 << 0
+;; } GdkEventFlags;
+
 (define-flags-extended EventFlags
   (in-module "Gdk")
   (c-name "GdkEventFlags")
   (values
-    '("g" "GDK_EVENT_PENDING" "1 << 0")
+    '("pending" "GDK_EVENT_PENDING" "1 << 0")
   )
 )
 
 ;; From gdkproperty.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_PROP_MODE_REPLACE,
+;;   GDK_PROP_MODE_PREPEND,
+;;   GDK_PROP_MODE_APPEND
+;; } GdkPropMode;
+
 (define-enum-extended PropMode
   (in-module "Gdk")
   (c-name "GdkPropMode")
@@ -530,6 +948,13 @@
 
 ;; From gdkregion.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_EVEN_ODD_RULE,
+;;   GDK_WINDING_RULE
+;; } GdkFillRule;
+
 (define-enum-extended FillRule
   (in-module "Gdk")
   (c-name "GdkFillRule")
@@ -539,6 +964,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_OVERLAP_RECTANGLE_IN,
+;;   GDK_OVERLAP_RECTANGLE_OUT,
+;;   GDK_OVERLAP_RECTANGLE_PART
+;; } GdkOverlapType;
+
 (define-enum-extended OverlapType
   (in-module "Gdk")
   (c-name "GdkOverlapType")
@@ -551,6 +984,14 @@
 
 ;; From gdkrgb.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_RGB_DITHER_NONE,
+;;   GDK_RGB_DITHER_NORMAL,
+;;   GDK_RGB_DITHER_MAX
+;; } GdkRgbDither;
+
 (define-enum-extended RgbDither
   (in-module "Gdk")
   (c-name "GdkRgbDither")
@@ -563,6 +1004,13 @@
 
 ;; From gdktypes.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_LSB_FIRST,
+;;   GDK_MSB_FIRST
+;; } GdkByteOrder;
+
 (define-enum-extended ByteOrder
   (in-module "Gdk")
   (c-name "GdkByteOrder")
@@ -572,6 +1020,36 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_SHIFT_MASK    = 1 << 0,
+;;   GDK_LOCK_MASK	    = 1 << 1,
+;;   GDK_CONTROL_MASK  = 1 << 2,
+;;   GDK_MOD1_MASK	    = 1 << 3,
+;;   GDK_MOD2_MASK	    = 1 << 4,
+;;   GDK_MOD3_MASK	    = 1 << 5,
+;;   GDK_MOD4_MASK	    = 1 << 6,
+;;   GDK_MOD5_MASK	    = 1 << 7,
+;;   GDK_BUTTON1_MASK  = 1 << 8,
+;;   GDK_BUTTON2_MASK  = 1 << 9,
+;;   GDK_BUTTON3_MASK  = 1 << 10,
+;;   GDK_BUTTON4_MASK  = 1 << 11,
+;;   GDK_BUTTON5_MASK  = 1 << 12,
+;; 
+;;   /* The next few modifiers are used by XKB, so we skip to the end.
+;;    * Bits 15 - 25 are currently unused. Bit 29 is used internally.
+;;    */
+;;   
+;;   GDK_SUPER_MASK    = 1 << 26,
+;;   GDK_HYPER_MASK    = 1 << 27,
+;;   GDK_META_MASK     = 1 << 28,
+;;   
+;;   GDK_RELEASE_MASK  = 1 << 30,
+;; 
+;;   GDK_MODIFIER_MASK = 0x5c001fff
+;; } GdkModifierType;
+
 (define-flags-extended ModifierType
   (in-module "Gdk")
   (c-name "GdkModifierType")
@@ -597,15 +1075,15 @@
   )
 )
 
-(define-flags-extended InputCondition
-  (in-module "Gdk")
-  (c-name "GdkInputCondition")
-  (values
-    '("read" "GDK_INPUT_READ" "1 << 0")
-    '("write" "GDK_INPUT_WRITE" "1 << 1")
-    '("exception" "GDK_INPUT_EXCEPTION" "1 << 2")
-  )
-)
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_OK	  = 0,
+;;   GDK_ERROR	  = -1,
+;;   GDK_ERROR_PARAM = -2,
+;;   GDK_ERROR_FILE  = -3,
+;;   GDK_ERROR_MEM	  = -4
+;; } GdkStatus;
 
 (define-enum-extended Status
   (in-module "Gdk")
@@ -619,6 +1097,16 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_GRAB_SUCCESS         = 0,
+;;   GDK_GRAB_ALREADY_GRABBED = 1,
+;;   GDK_GRAB_INVALID_TIME    = 2,
+;;   GDK_GRAB_NOT_VIEWABLE    = 3,
+;;   GDK_GRAB_FROZEN          = 4
+;; } GdkGrabStatus;
+
 (define-enum-extended GrabStatus
   (in-module "Gdk")
   (c-name "GdkGrabStatus")
@@ -631,8 +1119,93 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_OWNERSHIP_NONE,
+;;   GDK_OWNERSHIP_WINDOW,
+;;   GDK_OWNERSHIP_APPLICATION
+;; } GdkGrabOwnership;
+
+(define-enum-extended GrabOwnership
+  (in-module "Gdk")
+  (c-name "GdkGrabOwnership")
+  (values
+    '("none" "GDK_OWNERSHIP_NONE" "0")
+    '("window" "GDK_OWNERSHIP_WINDOW" "1")
+    '("application" "GDK_OWNERSHIP_APPLICATION" "2")
+  )
+)
+
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_EXPOSURE_MASK             = 1 << 1,
+;;   GDK_POINTER_MOTION_MASK       = 1 << 2,
+;;   GDK_POINTER_MOTION_HINT_MASK  = 1 << 3,
+;;   GDK_BUTTON_MOTION_MASK        = 1 << 4,
+;;   GDK_BUTTON1_MOTION_MASK       = 1 << 5,
+;;   GDK_BUTTON2_MOTION_MASK       = 1 << 6,
+;;   GDK_BUTTON3_MOTION_MASK       = 1 << 7,
+;;   GDK_BUTTON_PRESS_MASK         = 1 << 8,
+;;   GDK_BUTTON_RELEASE_MASK       = 1 << 9,
+;;   GDK_KEY_PRESS_MASK            = 1 << 10,
+;;   GDK_KEY_RELEASE_MASK          = 1 << 11,
+;;   GDK_ENTER_NOTIFY_MASK         = 1 << 12,
+;;   GDK_LEAVE_NOTIFY_MASK         = 1 << 13,
+;;   GDK_FOCUS_CHANGE_MASK         = 1 << 14,
+;;   GDK_STRUCTURE_MASK            = 1 << 15,
+;;   GDK_PROPERTY_CHANGE_MASK      = 1 << 16,
+;;   GDK_VISIBILITY_NOTIFY_MASK    = 1 << 17,
+;;   GDK_PROXIMITY_IN_MASK         = 1 << 18,
+;;   GDK_PROXIMITY_OUT_MASK        = 1 << 19,
+;;   GDK_SUBSTRUCTURE_MASK         = 1 << 20,
+;;   GDK_SCROLL_MASK               = 1 << 21,
+;;   GDK_ALL_EVENTS_MASK           = 0x3FFFFE
+;; } GdkEventMask;
+
+(define-flags-extended EventMask
+  (in-module "Gdk")
+  (c-name "GdkEventMask")
+  (values
+    '("exposure-mask" "GDK_EXPOSURE_MASK" "1 << 1")
+    '("pointer-motion-mask" "GDK_POINTER_MOTION_MASK" "1 << 2")
+    '("pointer-motion-hint-mask" "GDK_POINTER_MOTION_HINT_MASK" "1 << 3")
+    '("button-motion-mask" "GDK_BUTTON_MOTION_MASK" "1 << 4")
+    '("button1-motion-mask" "GDK_BUTTON1_MOTION_MASK" "1 << 5")
+    '("button2-motion-mask" "GDK_BUTTON2_MOTION_MASK" "1 << 6")
+    '("button3-motion-mask" "GDK_BUTTON3_MOTION_MASK" "1 << 7")
+    '("button-press-mask" "GDK_BUTTON_PRESS_MASK" "1 << 8")
+    '("button-release-mask" "GDK_BUTTON_RELEASE_MASK" "1 << 9")
+    '("key-press-mask" "GDK_KEY_PRESS_MASK" "1 << 10")
+    '("key-release-mask" "GDK_KEY_RELEASE_MASK" "1 << 11")
+    '("enter-notify-mask" "GDK_ENTER_NOTIFY_MASK" "1 << 12")
+    '("leave-notify-mask" "GDK_LEAVE_NOTIFY_MASK" "1 << 13")
+    '("focus-change-mask" "GDK_FOCUS_CHANGE_MASK" "1 << 14")
+    '("structure-mask" "GDK_STRUCTURE_MASK" "1 << 15")
+    '("property-change-mask" "GDK_PROPERTY_CHANGE_MASK" "1 << 16")
+    '("visibility-notify-mask" "GDK_VISIBILITY_NOTIFY_MASK" "1 << 17")
+    '("proximity-in-mask" "GDK_PROXIMITY_IN_MASK" "1 << 18")
+    '("proximity-out-mask" "GDK_PROXIMITY_OUT_MASK" "1 << 19")
+    '("substructure-mask" "GDK_SUBSTRUCTURE_MASK" "1 << 20")
+    '("scroll-mask" "GDK_SCROLL_MASK" "1 << 21")
+    '("all-events-mask" "GDK_ALL_EVENTS_MASK" "0x3FFFFE")
+  )
+)
+
 ;; From gdkvisual.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_VISUAL_STATIC_GRAY,
+;;   GDK_VISUAL_GRAYSCALE,
+;;   GDK_VISUAL_STATIC_COLOR,
+;;   GDK_VISUAL_PSEUDO_COLOR,
+;;   GDK_VISUAL_TRUE_COLOR,
+;;   GDK_VISUAL_DIRECT_COLOR
+;; } GdkVisualType;
+
 (define-enum-extended VisualType
   (in-module "Gdk")
   (c-name "GdkVisualType")
@@ -648,6 +1221,13 @@
 
 ;; From gdkwindow.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_INPUT_OUTPUT,
+;;   GDK_INPUT_ONLY
+;; } GdkWindowClass;
+
 (define-enum-extended WindowClass
   (in-module "Gdk")
   (c-name "GdkWindowClass")
@@ -657,6 +1237,18 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_WINDOW_ROOT,
+;;   GDK_WINDOW_TOPLEVEL,
+;;   GDK_WINDOW_CHILD,
+;;   GDK_WINDOW_DIALOG,
+;;   GDK_WINDOW_TEMP,
+;;   GDK_WINDOW_FOREIGN,
+;;   GDK_WINDOW_OFFSCREEN
+;; } GdkWindowType;
+
 (define-enum-extended WindowType
   (in-module "Gdk")
   (c-name "GdkWindowType")
@@ -671,6 +1263,20 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_WA_TITLE	   = 1 << 1,
+;;   GDK_WA_X	   = 1 << 2,
+;;   GDK_WA_Y	   = 1 << 3,
+;;   GDK_WA_CURSOR	   = 1 << 4,
+;;   GDK_WA_COLORMAP  = 1 << 5,
+;;   GDK_WA_VISUAL	   = 1 << 6,
+;;   GDK_WA_WMCLASS   = 1 << 7,
+;;   GDK_WA_NOREDIR   = 1 << 8,
+;;   GDK_WA_TYPE_HINT = 1 << 9
+;; } GdkWindowAttributesType;
+
 (define-flags-extended WindowAttributesType
   (in-module "Gdk")
   (c-name "GdkWindowAttributesType")
@@ -687,6 +1293,20 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_HINT_POS	       = 1 << 0,
+;;   GDK_HINT_MIN_SIZE    = 1 << 1,
+;;   GDK_HINT_MAX_SIZE    = 1 << 2,
+;;   GDK_HINT_BASE_SIZE   = 1 << 3,
+;;   GDK_HINT_ASPECT      = 1 << 4,
+;;   GDK_HINT_RESIZE_INC  = 1 << 5,
+;;   GDK_HINT_WIN_GRAVITY = 1 << 6,
+;;   GDK_HINT_USER_POS    = 1 << 7,
+;;   GDK_HINT_USER_SIZE   = 1 << 8
+;; } GdkWindowHints;
+
 (define-flags-extended WindowHints
   (in-module "Gdk")
   (c-name "GdkWindowHints")
@@ -703,6 +1323,25 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_WINDOW_TYPE_HINT_NORMAL,
+;;   GDK_WINDOW_TYPE_HINT_DIALOG,
+;;   GDK_WINDOW_TYPE_HINT_MENU,		/* Torn off menu */
+;;   GDK_WINDOW_TYPE_HINT_TOOLBAR,
+;;   GDK_WINDOW_TYPE_HINT_SPLASHSCREEN,
+;;   GDK_WINDOW_TYPE_HINT_UTILITY,
+;;   GDK_WINDOW_TYPE_HINT_DOCK,
+;;   GDK_WINDOW_TYPE_HINT_DESKTOP,
+;;   GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU,	/* A drop down menu (from a menubar) */
+;;   GDK_WINDOW_TYPE_HINT_POPUP_MENU,	/* A popup menu (from right-click) */
+;;   GDK_WINDOW_TYPE_HINT_TOOLTIP,
+;;   GDK_WINDOW_TYPE_HINT_NOTIFICATION,
+;;   GDK_WINDOW_TYPE_HINT_COMBO,
+;;   GDK_WINDOW_TYPE_HINT_DND
+;; } GdkWindowTypeHint;
+
 (define-enum-extended WindowTypeHint
   (in-module "Gdk")
   (c-name "GdkWindowTypeHint")
@@ -724,6 +1363,18 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_DECOR_ALL		= 1 << 0,
+;;   GDK_DECOR_BORDER	= 1 << 1,
+;;   GDK_DECOR_RESIZEH	= 1 << 2,
+;;   GDK_DECOR_TITLE	= 1 << 3,
+;;   GDK_DECOR_MENU	= 1 << 4,
+;;   GDK_DECOR_MINIMIZE	= 1 << 5,
+;;   GDK_DECOR_MAXIMIZE	= 1 << 6
+;; } GdkWMDecoration;
+
 (define-flags-extended WMDecoration
   (in-module "Gdk")
   (c-name "GdkWMDecoration")
@@ -738,6 +1389,17 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_FUNC_ALL		= 1 << 0,
+;;   GDK_FUNC_RESIZE	= 1 << 1,
+;;   GDK_FUNC_MOVE		= 1 << 2,
+;;   GDK_FUNC_MINIMIZE	= 1 << 3,
+;;   GDK_FUNC_MAXIMIZE	= 1 << 4,
+;;   GDK_FUNC_CLOSE	= 1 << 5
+;; } GdkWMFunction;
+
 (define-flags-extended WMFunction
   (in-module "Gdk")
   (c-name "GdkWMFunction")
@@ -751,6 +1413,21 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_GRAVITY_NORTH_WEST = 1,
+;;   GDK_GRAVITY_NORTH,
+;;   GDK_GRAVITY_NORTH_EAST,
+;;   GDK_GRAVITY_WEST,
+;;   GDK_GRAVITY_CENTER,
+;;   GDK_GRAVITY_EAST,
+;;   GDK_GRAVITY_SOUTH_WEST,
+;;   GDK_GRAVITY_SOUTH,
+;;   GDK_GRAVITY_SOUTH_EAST,
+;;   GDK_GRAVITY_STATIC
+;; } GdkGravity;
+
 (define-enum-extended Gravity
   (in-module "Gdk")
   (c-name "GdkGravity")
@@ -768,6 +1445,19 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GDK_WINDOW_EDGE_NORTH_WEST,
+;;   GDK_WINDOW_EDGE_NORTH,
+;;   GDK_WINDOW_EDGE_NORTH_EAST,
+;;   GDK_WINDOW_EDGE_WEST,
+;;   GDK_WINDOW_EDGE_EAST,
+;;   GDK_WINDOW_EDGE_SOUTH_WEST,
+;;   GDK_WINDOW_EDGE_SOUTH,
+;;   GDK_WINDOW_EDGE_SOUTH_EAST  
+;; } GdkWindowEdge;
+
 (define-enum-extended WindowEdge
   (in-module "Gdk")
   (c-name "GdkWindowEdge")
diff --git a/gdk/src/gdk_methods.defs b/gdk/src/gdk_methods.defs
index e8cc5fd..9e99563 100644
--- a/gdk/src/gdk_methods.defs
+++ b/gdk/src/gdk_methods.defs
@@ -56,6 +56,12 @@
   (gtype-id "GDK_TYPE_KEYMAP")
 )
 
+(define-object Paintable
+  (in-module "Gdk")
+  (c-name "GdkPaintable")
+  (gtype-id "GDK_TYPE_PAINTABLE")
+)
+
 (define-object PangoRenderer
   (in-module "Gdk")
   (parent "PangoRenderer")
@@ -63,27 +69,6 @@
   (gtype-id "GDK_TYPE_PANGO_RENDERER")
 )
 
-(define-object PixbufAnimation
-  (in-module "Gdk")
-  (parent "GObject")
-  (c-name "GdkPixbufAnimation")
-  (gtype-id "GDK_TYPE_PIXBUF_ANIMATION")
-)
-
-(define-object PixbufAnimationIter
-  (in-module "Gdk")
-  (parent "GObject")
-  (c-name "GdkPixbufAnimationIter")
-  (gtype-id "GDK_TYPE_PIXBUF_ANIMATION_ITER")
-)
-
-(define-object PixbufLoader
-  (in-module "Gdk")
-  (parent "GObject")
-  (c-name "GdkPixbufLoader")
-  (gtype-id "GDK_TYPE_PIXBUF_LOADER")
-)
-
 (define-object PixmapObject
   (in-module "Gdk")
   (parent "GdkDrawable")
@@ -98,6 +83,12 @@
   (gtype-id "GDK_TYPE_SCREEN")
 )
 
+(define-object WindowImpl
+  (in-module "Gdk")
+  (c-name "GdkWindowImpl")
+  (gtype-id "GDK_TYPE_WINDOW_IMPL")
+)
+
 (define-object WindowObject
   (in-module "Gdk")
   (parent "GdkDrawable")
@@ -481,6 +472,61 @@
   )
 )
 
+(define-flags ColorInfoFlags
+  (in-module "Gdk")
+  (c-name "GdkColorInfoFlags")
+  (gtype-id "GDK_TYPE_COLOR_INFO_FLAGS")
+  (values
+    '("writeable" "GDK_COLOR_WRITEABLE")
+  )
+)
+
+(define-flags DebugFlag
+  (in-module "Gdk")
+  (c-name "GdkDebugFlag")
+  (gtype-id "GDK_TYPE_DEBUG_FLAG")
+  (values
+    '("misc" "GDK_DEBUG_MISC")
+    '("events" "GDK_DEBUG_EVENTS")
+    '("dnd" "GDK_DEBUG_DND")
+    '("xim" "GDK_DEBUG_XIM")
+    '("nograbs" "GDK_DEBUG_NOGRABS")
+    '("colormap" "GDK_DEBUG_COLORMAP")
+    '("gdkrgb" "GDK_DEBUG_GDKRGB")
+    '("gc" "GDK_DEBUG_GC")
+    '("pixmap" "GDK_DEBUG_PIXMAP")
+    '("image" "GDK_DEBUG_IMAGE")
+    '("input" "GDK_DEBUG_INPUT")
+    '("cursor" "GDK_DEBUG_CURSOR")
+    '("multihead" "GDK_DEBUG_MULTIHEAD")
+    '("xinerama" "GDK_DEBUG_XINERAMA")
+    '("draw" "GDK_DEBUG_DRAW")
+    '("eventloop" "GDK_DEBUG_EVENTLOOP")
+  )
+)
+
+(define-enum ArgType
+  (in-module "Gdk")
+  (c-name "GdkArgType")
+  (gtype-id "GDK_TYPE_ARG_TYPE")
+  (values
+    '("string" "GDK_ARG_STRING")
+    '("int" "GDK_ARG_INT")
+    '("bool" "GDK_ARG_BOOL")
+    '("nobool" "GDK_ARG_NOBOOL")
+    '("callback" "GDK_ARG_CALLBACK")
+  )
+)
+
+(define-flags EventFlags
+  (in-module "Gdk")
+  (c-name "GdkEventFlags")
+  (gtype-id "GDK_TYPE_EVENT_FLAGS")
+  (values
+    '("pending" "GDK_EVENT_PENDING")
+  )
+)
+
 (define-enum PropMode
   (in-module "Gdk")
   (c-name "GdkPropMode")
@@ -560,17 +606,6 @@
   )
 )
 
-(define-flags InputCondition
-  (in-module "Gdk")
-  (c-name "GdkInputCondition")
-  (gtype-id "GDK_TYPE_INPUT_CONDITION")
-  (values
-    '("read" "GDK_INPUT_READ")
-    '("write" "GDK_INPUT_WRITE")
-    '("exception" "GDK_INPUT_EXCEPTION")
-  )
-)
-
 (define-enum Status
   (in-module "Gdk")
   (c-name "GdkStatus")
@@ -796,116 +831,9 @@
   )
 )
 
-(define-enum PixbufAlphaMode
-  (in-module "Gdk")
-  (c-name "GdkPixbufAlphaMode")
-  (gtype-id "GDK_TYPE_PIXBUF_ALPHA_MODE")
-  (values
-    '("bilevel" "GDK_PIXBUF_ALPHA_BILEVEL")
-    '("full" "GDK_PIXBUF_ALPHA_FULL")
-  )
-)
-
-(define-enum Colorspace
-  (in-module "Gdk")
-  (c-name "GdkColorspace")
-  (gtype-id "GDK_TYPE_COLORSPACE")
-  (values
-    '("rgb" "GDK_COLORSPACE_RGB")
-  )
-)
-
-(define-enum PixbufError
-  (in-module "Gdk")
-  (c-name "GdkPixbufError")
-  (gtype-id "GDK_TYPE_PIXBUF_ERROR")
-  (values
-    '("corrupt-image" "GDK_PIXBUF_ERROR_CORRUPT_IMAGE")
-    '("insufficient-memory" "GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY")
-    '("bad-option" "GDK_PIXBUF_ERROR_BAD_OPTION")
-    '("unknown-type" "GDK_PIXBUF_ERROR_UNKNOWN_TYPE")
-    '("unsupported-operation" "GDK_PIXBUF_ERROR_UNSUPPORTED_OPERATION")
-    '("failed" "GDK_PIXBUF_ERROR_FAILED")
-  )
-)
-
-(define-flags PixbufFormatFlags
-  (in-module "Gdk")
-  (c-name "GdkPixbufFormatFlags")
-  (gtype-id "GDK_TYPE_PIXBUF_FORMAT_FLAGS")
-  (values
-    '("writable" "GDK_PIXBUF_FORMAT_WRITABLE")
-    '("scalable" "GDK_PIXBUF_FORMAT_SCALABLE")
-    '("threadsafe" "GDK_PIXBUF_FORMAT_THREADSAFE")
-  )
-)
-
-(define-enum InterpType
-  (in-module "Gdk")
-  (c-name "GdkInterpType")
-  (gtype-id "GDK_TYPE_INTERP_TYPE")
-  (values
-    '("nearest" "GDK_INTERP_NEAREST")
-    '("tiles" "GDK_INTERP_TILES")
-    '("bilinear" "GDK_INTERP_BILINEAR")
-    '("hyper" "GDK_INTERP_HYPER")
-  )
-)
-
-(define-enum PixbufRotation
-  (in-module "Gdk")
-  (c-name "GdkPixbufRotation")
-  (gtype-id "GDK_TYPE_PIXBUF_ROTATION")
-  (values
-    '("none" "GDK_PIXBUF_ROTATE_NONE")
-    '("counterclockwise" "GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE")
-    '("upsidedown" "GDK_PIXBUF_ROTATE_UPSIDEDOWN")
-    '("clockwise" "GDK_PIXBUF_ROTATE_CLOCKWISE")
-  )
-)
-
-(define-flags PixdataType
-  (in-module "Gdk")
-  (c-name "GdkPixdataType")
-  (gtype-id "GDK_TYPE_PIXDATA_TYPE")
-  (values
-    '("color-type-rgb" "GDK_PIXDATA_COLOR_TYPE_RGB")
-    '("color-type-rgba" "GDK_PIXDATA_COLOR_TYPE_RGBA")
-    '("color-type-mask" "GDK_PIXDATA_COLOR_TYPE_MASK")
-    '("sample-width-8" "GDK_PIXDATA_SAMPLE_WIDTH_8")
-    '("sample-width-mask" "GDK_PIXDATA_SAMPLE_WIDTH_MASK")
-    '("encoding-raw" "GDK_PIXDATA_ENCODING_RAW")
-    '("encoding-rle" "GDK_PIXDATA_ENCODING_RLE")
-    '("encoding-mask" "GDK_PIXDATA_ENCODING_MASK")
-  )
-)
 
-(define-flags PixdataDumpType
-  (in-module "Gdk")
-  (c-name "GdkPixdataDumpType")
-  (gtype-id "GDK_TYPE_PIXDATA_DUMP_TYPE")
-  (values
-    '("pixdata-stream" "GDK_PIXDATA_DUMP_PIXDATA_STREAM")
-    '("pixdata-struct" "GDK_PIXDATA_DUMP_PIXDATA_STRUCT")
-    '("macros" "GDK_PIXDATA_DUMP_MACROS")
-    '("gtypes" "GDK_PIXDATA_DUMP_GTYPES")
-    '("ctypes" "GDK_PIXDATA_DUMP_CTYPES")
-    '("static" "GDK_PIXDATA_DUMP_STATIC")
-    '("const" "GDK_PIXDATA_DUMP_CONST")
-    '("rle-decoder" "GDK_PIXDATA_DUMP_RLE_DECODER")
-  )
-)
+;; From gdkalias.h
 
-(define-enum RgbDither
-  (in-module "Xlib")
-  (c-name "XlibRgbDither")
-  (gtype-id "XLIB_TYPE_RGB_DITHER")
-  (values
-    '("none" "XLIB_RGB_DITHER_NONE")
-    '("normal" "XLIB_RGB_DITHER_NORMAL")
-    '("max" "XLIB_RGB_DITHER_MAX")
-  )
-)
 
 
 ;; From gdkapplaunchcontext.h
@@ -1174,6 +1102,10 @@
 
 
 
+;; From gdkconfig.h
+
+
+
 ;; From gdkcursor.h
 
 (define-function gdk_cursor_get_type
@@ -1493,6 +1425,10 @@
 
 
 
+;; From gdkdeviceprivate.h
+
+
+
 ;; From gdkdisplay.h
 
 (define-function gdk_display_get_type
@@ -1931,6 +1867,12 @@
   (return-type "GdkDragAction")
 )
 
+(define-method get_source_window
+  (of-object "GdkDragContext")
+  (c-name "gdk_drag_context_get_source_window")
+  (return-type "GdkWindow*")
+)
+
 (define-function gdk_drag_status
   (c-name "gdk_drag_status")
   (return-type "none")
@@ -2074,26 +2016,6 @@
   (return-type "GType")
 )
 
-(define-method set_data
-  (of-object "GdkDrawable")
-  (c-name "gdk_drawable_set_data")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "key")
-    '("gpointer" "data")
-    '("GDestroyNotify" "destroy_func")
-  )
-)
-
-(define-method get_data
-  (of-object "GdkDrawable")
-  (c-name "gdk_drawable_get_data")
-  (return-type "gpointer")
-  (parameters
-    '("const-gchar*" "key")
-  )
-)
-
 (define-method get_size
   (of-object "GdkDrawable")
   (c-name "gdk_drawable_get_size")
@@ -2143,18 +2065,6 @@
   (return-type "GdkDisplay*")
 )
 
-(define-method ref
-  (of-object "GdkDrawable")
-  (c-name "gdk_drawable_ref")
-  (return-type "GdkDrawable*")
-)
-
-(define-method unref
-  (of-object "GdkDrawable")
-  (c-name "gdk_drawable_unref")
-  (return-type "none")
-)
-
 (define-function gdk_draw_point
   (c-name "gdk_draw_point")
   (return-type "none")
@@ -2221,47 +2131,6 @@
   )
 )
 
-(define-function gdk_draw_string
-  (c-name "gdk_draw_string")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkFont*" "font")
-    '("GdkGC*" "gc")
-    '("gint" "x")
-    '("gint" "y")
-    '("const-gchar*" "string")
-  )
-)
-
-(define-function gdk_draw_text
-  (c-name "gdk_draw_text")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkFont*" "font")
-    '("GdkGC*" "gc")
-    '("gint" "x")
-    '("gint" "y")
-    '("const-gchar*" "text")
-    '("gint" "text_length")
-  )
-)
-
-(define-function gdk_draw_text_wc
-  (c-name "gdk_draw_text_wc")
-  (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkFont*" "font")
-    '("GdkGC*" "gc")
-    '("gint" "x")
-    '("gint" "y")
-    '("const-GdkWChar*" "text")
-    '("gint" "text_length")
-  )
-)
-
 (define-function gdk_draw_drawable
   (c-name "gdk_draw_drawable")
   (return-type "none")
@@ -2644,11 +2513,6 @@
   (return-type "GType")
 )
 
-(define-function gdk_input_condition_get_type
-  (c-name "gdk_input_condition_get_type")
-  (return-type "GType")
-)
-
 (define-function gdk_status_get_type
   (c-name "gdk_status_get_type")
   (return-type "GType")
@@ -3013,153 +2877,6 @@
   )
 )
 
-(define-function gdk_string_width
-  (c-name "gdk_string_width")
-  (return-type "gint")
-  (parameters
-    '("GdkFont*" "font")
-    '("const-gchar*" "string")
-  )
-)
-
-(define-function gdk_text_width
-  (c-name "gdk_text_width")
-  (return-type "gint")
-  (parameters
-    '("GdkFont*" "font")
-    '("const-gchar*" "text")
-    '("gint" "text_length")
-  )
-)
-
-(define-function gdk_text_width_wc
-  (c-name "gdk_text_width_wc")
-  (return-type "gint")
-  (parameters
-    '("GdkFont*" "font")
-    '("const-GdkWChar*" "text")
-    '("gint" "text_length")
-  )
-)
-
-(define-function gdk_char_width
-  (c-name "gdk_char_width")
-  (return-type "gint")
-  (parameters
-    '("GdkFont*" "font")
-    '("gchar" "character")
-  )
-)
-
-(define-function gdk_char_width_wc
-  (c-name "gdk_char_width_wc")
-  (return-type "gint")
-  (parameters
-    '("GdkFont*" "font")
-    '("GdkWChar" "character")
-  )
-)
-
-(define-function gdk_string_measure
-  (c-name "gdk_string_measure")
-  (return-type "gint")
-  (parameters
-    '("GdkFont*" "font")
-    '("const-gchar*" "string")
-  )
-)
-
-(define-function gdk_text_measure
-  (c-name "gdk_text_measure")
-  (return-type "gint")
-  (parameters
-    '("GdkFont*" "font")
-    '("const-gchar*" "text")
-    '("gint" "text_length")
-  )
-)
-
-(define-function gdk_char_measure
-  (c-name "gdk_char_measure")
-  (return-type "gint")
-  (parameters
-    '("GdkFont*" "font")
-    '("gchar" "character")
-  )
-)
-
-(define-function gdk_string_height
-  (c-name "gdk_string_height")
-  (return-type "gint")
-  (parameters
-    '("GdkFont*" "font")
-    '("const-gchar*" "string")
-  )
-)
-
-(define-function gdk_text_height
-  (c-name "gdk_text_height")
-  (return-type "gint")
-  (parameters
-    '("GdkFont*" "font")
-    '("const-gchar*" "text")
-    '("gint" "text_length")
-  )
-)
-
-(define-function gdk_char_height
-  (c-name "gdk_char_height")
-  (return-type "gint")
-  (parameters
-    '("GdkFont*" "font")
-    '("gchar" "character")
-  )
-)
-
-(define-function gdk_text_extents
-  (c-name "gdk_text_extents")
-  (return-type "none")
-  (parameters
-    '("GdkFont*" "font")
-    '("const-gchar*" "text")
-    '("gint" "text_length")
-    '("gint*" "lbearing")
-    '("gint*" "rbearing")
-    '("gint*" "width")
-    '("gint*" "ascent")
-    '("gint*" "descent")
-  )
-)
-
-(define-function gdk_text_extents_wc
-  (c-name "gdk_text_extents_wc")
-  (return-type "none")
-  (parameters
-    '("GdkFont*" "font")
-    '("const-GdkWChar*" "text")
-    '("gint" "text_length")
-    '("gint*" "lbearing")
-    '("gint*" "rbearing")
-    '("gint*" "width")
-    '("gint*" "ascent")
-    '("gint*" "descent")
-  )
-)
-
-(define-function gdk_string_extents
-  (c-name "gdk_string_extents")
-  (return-type "none")
-  (parameters
-    '("GdkFont*" "font")
-    '("const-gchar*" "string")
-    '("gint*" "lbearing")
-    '("gint*" "rbearing")
-    '("gint*" "width")
-    '("gint*" "ascent")
-    '("gint*" "descent")
-  )
-)
-
 (define-method get_display
   (of-object "GdkFont")
   (c-name "gdk_font_get_display")
@@ -3500,37 +3217,6 @@
   (return-type "const-gchar*")
 )
 
-(define-function gdk_input_add_full
-  (c-name "gdk_input_add_full")
-  (return-type "gint")
-  (parameters
-    '("gint" "source")
-    '("GdkInputCondition" "condition")
-    '("GdkInputFunction" "function")
-    '("gpointer" "data")
-    '("GDestroyNotify" "destroy")
-  )
-)
-
-(define-function gdk_input_add
-  (c-name "gdk_input_add")
-  (return-type "gint")
-  (parameters
-    '("gint" "source")
-    '("GdkInputCondition" "condition")
-    '("GdkInputFunction" "function")
-    '("gpointer" "data")
-  )
-)
-
-(define-function gdk_input_remove
-  (c-name "gdk_input_remove")
-  (return-type "none")
-  (parameters
-    '("gint" "tag")
-  )
-)
-
 (define-function gdk_pointer_grab
   (c-name "gdk_pointer_grab")
   (return-type "GdkGrabStatus")
@@ -3638,24 +3324,6 @@
   (return-type "GType")
 )
 
-(define-function gdk_wcstombs
-  (c-name "gdk_wcstombs")
-  (return-type "gchar*")
-  (parameters
-    '("const-GdkWChar*" "src")
-  )
-)
-
-(define-function gdk_mbstowcs
-  (c-name "gdk_mbstowcs")
-  (return-type "gint")
-  (parameters
-    '("GdkWChar*" "dest")
-    '("const-gchar*" "src")
-    '("gint" "dest_max")
-  )
-)
-
 (define-method send_client_message
   (of-object "GdkEvent")
   (c-name "gdk_event_send_client_message")
@@ -3919,6 +3587,29 @@
 
 
 
+;; From gdkinternals.h
+
+(define-function gdk_synthesize_window_state
+  (c-name "gdk_synthesize_window_state")
+  (return-type "none")
+  (parameters
+    '("GdkWindow*" "window")
+    '("GdkWindowState" "unset_flags")
+    '("GdkWindowState" "set_flags")
+  )
+)
+
+(define-function gdk_offscreen_window_get_type
+  (c-name "gdk_offscreen_window_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From gdkintl.h
+
+
+
 ;; From gdkkeys.h
 
 (define-function gdk_keymap_get_type
@@ -4102,6 +3793,14 @@
 
 
 
+;; From gdkmarshalers.h
+
+
+
+;; From gdkmedialib.h
+
+
+
 ;; From gdkpango.h
 
 (define-function gdk_pango_renderer_get_type
@@ -4444,6 +4143,10 @@
 
 
 
+;; From gdkpoly-generic.h
+
+
+
 ;; From gdkprivate.h
 
 (define-method destroy_notify
@@ -4655,6 +4358,10 @@
 
 
 
+;; From gdkregion-generic.h
+
+
+
 ;; From gdkregion.h
 
 (define-function gdk_region_new
@@ -5376,7 +5083,7 @@
     '("GSpawnFlags" "flags")
     '("GSpawnChildSetupFunc" "child_setup")
     '("gpointer" "user_data")
-    '("gint*" "child_pid")
+    '("GPid*" "child_pid")
     '("GError**" "error")
   )
 )
@@ -5392,7 +5099,7 @@
     '("GSpawnFlags" "flags")
     '("GSpawnChildSetupFunc" "child_setup")
     '("gpointer" "user_data")
-    '("gint*" "child_pid")
+    '("GPid*" "child_pid")
     '("gint*" "standard_input")
     '("gint*" "standard_output")
     '("gint*" "standard_error")
@@ -6646,7 +6353,7 @@
   (return-type "none")
   (parameters
     '("const-GdkRegion*" "region")
-    '("somefunc" "child_func")
+    '("gboolean-(*" "child_func")
   )
 )
 
@@ -6820,1578 +6527,19 @@
 
 
 
-;; From gdkx.h
-
-(define-function gdk_x11_drawable_get_xdisplay
-  (c-name "gdk_x11_drawable_get_xdisplay")
-  (return-type "Display*")
-  (parameters
-    '("GdkDrawable*" "drawable")
-  )
-)
-
-(define-function gdk_x11_drawable_get_xid
-  (c-name "gdk_x11_drawable_get_xid")
-  (return-type "XID")
-  (parameters
-    '("GdkDrawable*" "drawable")
-  )
-)
-
-(define-function gdk_x11_window_get_drawable_impl
-  (c-name "gdk_x11_window_get_drawable_impl")
-  (return-type "GdkDrawable*")
-  (parameters
-    '("GdkWindow*" "window")
-  )
-)
-
-(define-function gdk_x11_pixmap_get_drawable_impl
-  (c-name "gdk_x11_pixmap_get_drawable_impl")
-  (return-type "GdkDrawable*")
-  (parameters
-    '("GdkPixmap*" "pixmap")
-  )
-)
-
-(define-function gdk_x11_image_get_xdisplay
-  (c-name "gdk_x11_image_get_xdisplay")
-  (return-type "Display*")
-  (parameters
-    '("GdkImage*" "image")
-  )
-)
-
-(define-function gdk_x11_image_get_ximage
-  (c-name "gdk_x11_image_get_ximage")
-  (return-type "XImage*")
-  (parameters
-    '("GdkImage*" "image")
-  )
-)
-
-(define-function gdk_x11_colormap_get_xdisplay
-  (c-name "gdk_x11_colormap_get_xdisplay")
-  (return-type "Display*")
-  (parameters
-    '("GdkColormap*" "colormap")
-  )
-)
-
-(define-function gdk_x11_colormap_get_xcolormap
-  (c-name "gdk_x11_colormap_get_xcolormap")
-  (return-type "Colormap")
-  (parameters
-    '("GdkColormap*" "colormap")
-  )
-)
-
-(define-function gdk_x11_cursor_get_xdisplay
-  (c-name "gdk_x11_cursor_get_xdisplay")
-  (return-type "Display*")
-  (parameters
-    '("GdkCursor*" "cursor")
-  )
-)
-
-(define-function gdk_x11_cursor_get_xcursor
-  (c-name "gdk_x11_cursor_get_xcursor")
-  (return-type "Cursor")
-  (parameters
-    '("GdkCursor*" "cursor")
-  )
-)
-
-(define-function gdk_x11_display_get_xdisplay
-  (c-name "gdk_x11_display_get_xdisplay")
-  (return-type "Display*")
-  (parameters
-    '("GdkDisplay*" "display")
-  )
-)
-
-(define-function gdk_x11_visual_get_xvisual
-  (c-name "gdk_x11_visual_get_xvisual")
-  (return-type "Visual*")
-  (parameters
-    '("GdkVisual*" "visual")
-  )
-)
-
-(define-function gdk_x11_gc_get_xdisplay
-  (c-name "gdk_x11_gc_get_xdisplay")
-  (return-type "Display*")
-  (parameters
-    '("GdkGC*" "gc")
-  )
-)
-
-(define-function gdk_x11_gc_get_xgc
-  (c-name "gdk_x11_gc_get_xgc")
-  (return-type "GC")
-  (parameters
-    '("GdkGC*" "gc")
-  )
-)
-
-(define-function gdk_x11_screen_get_xscreen
-  (c-name "gdk_x11_screen_get_xscreen")
-  (return-type "Screen*")
-  (parameters
-    '("GdkScreen*" "screen")
-  )
-)
-
-(define-function gdk_x11_screen_get_screen_number
-  (c-name "gdk_x11_screen_get_screen_number")
-  (return-type "int")
-  (parameters
-    '("GdkScreen*" "screen")
-  )
-)
-
-(define-function gdk_x11_window_set_user_time
-  (c-name "gdk_x11_window_set_user_time")
-  (return-type "none")
-  (parameters
-    '("GdkWindow*" "window")
-    '("guint32" "timestamp")
-  )
-)
-
-(define-function gdk_x11_window_move_to_current_desktop
-  (c-name "gdk_x11_window_move_to_current_desktop")
-  (return-type "none")
-  (parameters
-    '("GdkWindow*" "window")
-  )
-)
-
-(define-function gdk_x11_screen_get_window_manager_name
-  (c-name "gdk_x11_screen_get_window_manager_name")
-  (return-type "const-char*")
-  (parameters
-    '("GdkScreen*" "screen")
-  )
-)
-
-(define-function gdk_x11_get_default_root_xwindow
-  (c-name "gdk_x11_get_default_root_xwindow")
-  (return-type "Window")
-)
-
-(define-function gdk_x11_get_default_xdisplay
-  (c-name "gdk_x11_get_default_xdisplay")
-  (return-type "Display*")
-)
-
-(define-function gdk_x11_get_default_screen
-  (c-name "gdk_x11_get_default_screen")
-  (return-type "gint")
-)
-
-(define-function gdk_x11_screen_lookup_visual
-  (c-name "gdk_x11_screen_lookup_visual")
-  (return-type "GdkVisual*")
-  (parameters
-    '("GdkScreen*" "screen")
-    '("VisualID" "xvisualid")
-  )
-)
-
-(define-function gdkx_visual_get
-  (c-name "gdkx_visual_get")
-  (return-type "GdkVisual*")
-  (parameters
-    '("VisualID" "xvisualid")
-  )
-)
-
-(define-function gdk_x11_colormap_foreign_new
-  (c-name "gdk_x11_colormap_foreign_new")
-  (is-constructor-of "GdkX11ColormapForeign")
-  (return-type "GdkColormap*")
-  (parameters
-    '("GdkVisual*" "visual")
-    '("Colormap" "xcolormap")
-  )
-)
-
-(define-function gdk_xid_table_lookup_for_display
-  (c-name "gdk_xid_table_lookup_for_display")
-  (return-type "gpointer")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("XID" "xid")
-  )
-)
-
-(define-function gdk_x11_get_server_time
-  (c-name "gdk_x11_get_server_time")
-  (return-type "guint32")
-  (parameters
-    '("GdkWindow*" "window")
-  )
-)
-
-(define-function gdk_x11_display_get_user_time
-  (c-name "gdk_x11_display_get_user_time")
-  (return-type "guint32")
-  (parameters
-    '("GdkDisplay*" "display")
-  )
-)
-
-(define-function gdk_x11_display_get_startup_notification_id
-  (c-name "gdk_x11_display_get_startup_notification_id")
-  (return-type "const-gchar*")
-  (parameters
-    '("GdkDisplay*" "display")
-  )
-)
-
-(define-function gdk_x11_display_set_cursor_theme
-  (c-name "gdk_x11_display_set_cursor_theme")
-  (return-type "none")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("const-gchar*" "theme")
-    '("const-gint" "size")
-  )
-)
-
-(define-function gdk_x11_display_broadcast_startup_message
-  (c-name "gdk_x11_display_broadcast_startup_message")
-  (return-type "none")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("const-char*" "message_type")
-  )
-  (varargs #t)
-)
-
-(define-function gdk_x11_screen_supports_net_wm_hint
-  (c-name "gdk_x11_screen_supports_net_wm_hint")
-  (return-type "gboolean")
-  (parameters
-    '("GdkScreen*" "screen")
-    '("GdkAtom" "property")
-  )
-)
-
-(define-function gdk_x11_screen_get_monitor_output
-  (c-name "gdk_x11_screen_get_monitor_output")
-  (return-type "XID")
-  (parameters
-    '("GdkScreen*" "screen")
-    '("gint" "monitor_num")
-  )
-)
-
-(define-function gdk_xid_table_lookup
-  (c-name "gdk_xid_table_lookup")
-  (return-type "gpointer")
-  (parameters
-    '("XID" "xid")
-  )
-)
-
-(define-function gdk_net_wm_supports
-  (c-name "gdk_net_wm_supports")
-  (return-type "gboolean")
-  (parameters
-    '("GdkAtom" "property")
-  )
-)
-
-(define-function gdk_x11_grab_server
-  (c-name "gdk_x11_grab_server")
-  (return-type "none")
-)
-
-(define-function gdk_x11_ungrab_server
-  (c-name "gdk_x11_ungrab_server")
-  (return-type "none")
-)
-
-(define-function gdk_x11_lookup_xdisplay
-  (c-name "gdk_x11_lookup_xdisplay")
-  (return-type "GdkDisplay*")
-  (parameters
-    '("Display*" "xdisplay")
-  )
-)
-
-(define-function gdk_x11_atom_to_xatom_for_display
-  (c-name "gdk_x11_atom_to_xatom_for_display")
-  (return-type "Atom")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("GdkAtom" "atom")
-  )
-)
-
-(define-function gdk_x11_xatom_to_atom_for_display
-  (c-name "gdk_x11_xatom_to_atom_for_display")
-  (return-type "GdkAtom")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("Atom" "xatom")
-  )
-)
-
-(define-function gdk_x11_get_xatom_by_name_for_display
-  (c-name "gdk_x11_get_xatom_by_name_for_display")
-  (return-type "Atom")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("const-gchar*" "atom_name")
-  )
-)
-
-(define-function gdk_x11_get_xatom_name_for_display
-  (c-name "gdk_x11_get_xatom_name_for_display")
-  (return-type "const-gchar*")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("Atom" "xatom")
-  )
-)
-
-(define-function gdk_x11_atom_to_xatom
-  (c-name "gdk_x11_atom_to_xatom")
-  (return-type "Atom")
-  (parameters
-    '("GdkAtom" "atom")
-  )
-)
-
-(define-function gdk_x11_xatom_to_atom
-  (c-name "gdk_x11_xatom_to_atom")
-  (return-type "GdkAtom")
-  (parameters
-    '("Atom" "xatom")
-  )
-)
-
-(define-function gdk_x11_get_xatom_by_name
-  (c-name "gdk_x11_get_xatom_by_name")
-  (return-type "Atom")
-  (parameters
-    '("const-gchar*" "atom_name")
-  )
-)
-
-(define-function gdk_x11_get_xatom_name
-  (c-name "gdk_x11_get_xatom_name")
-  (return-type "const-gchar*")
-  (parameters
-    '("Atom" "xatom")
-  )
-)
-
-(define-function gdk_x11_display_grab
-  (c-name "gdk_x11_display_grab")
-  (return-type "none")
-  (parameters
-    '("GdkDisplay*" "display")
-  )
-)
-
-(define-function gdk_x11_display_ungrab
-  (c-name "gdk_x11_display_ungrab")
-  (return-type "none")
-  (parameters
-    '("GdkDisplay*" "display")
-  )
-)
-
-(define-function gdk_x11_register_standard_event_type
-  (c-name "gdk_x11_register_standard_event_type")
-  (return-type "none")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("gint" "event_base")
-    '("gint" "n_events")
-  )
-)
-
-(define-function gdk_x11_font_get_xfont
-  (c-name "gdk_x11_font_get_xfont")
-  (return-type "gpointer")
-  (parameters
-    '("GdkFont*" "font")
-  )
-)
-
-(define-function gdk_x11_font_get_xdisplay
-  (c-name "gdk_x11_font_get_xdisplay")
-  (return-type "Display*")
-  (parameters
-    '("GdkFont*" "font")
-  )
-)
-
-(define-function gdk_x11_font_get_name
-  (c-name "gdk_x11_font_get_name")
-  (return-type "const-char*")
-  (parameters
-    '("GdkFont*" "font")
-  )
-)
-
-
-
-;; From gdk-pixbuf-animation.h
-
-(define-function gdk_pixbuf_animation_get_type
-  (c-name "gdk_pixbuf_animation_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_pixbuf_animation_new_from_file
-  (c-name "gdk_pixbuf_animation_new_from_file")
-  (return-type "GdkPixbufAnimation*")
-  (parameters
-    '("const-char*" "filename")
-    '("GError**" "error")
-  )
-)
-
-(define-method get_width
-  (of-object "GdkPixbufAnimation")
-  (c-name "gdk_pixbuf_animation_get_width")
-  (return-type "int")
-)
-
-(define-method get_height
-  (of-object "GdkPixbufAnimation")
-  (c-name "gdk_pixbuf_animation_get_height")
-  (return-type "int")
-)
-
-(define-method is_static_image
-  (of-object "GdkPixbufAnimation")
-  (c-name "gdk_pixbuf_animation_is_static_image")
-  (return-type "gboolean")
-)
-
-(define-method get_static_image
-  (of-object "GdkPixbufAnimation")
-  (c-name "gdk_pixbuf_animation_get_static_image")
-  (return-type "GdkPixbuf*")
-)
-
-(define-method get_iter
-  (of-object "GdkPixbufAnimation")
-  (c-name "gdk_pixbuf_animation_get_iter")
-  (return-type "GdkPixbufAnimationIter*")
-  (parameters
-    '("const-GTimeVal*" "start_time")
-  )
-)
-
-(define-function gdk_pixbuf_animation_iter_get_type
-  (c-name "gdk_pixbuf_animation_iter_get_type")
-  (return-type "GType")
-)
-
-(define-method get_delay_time
-  (of-object "GdkPixbufAnimationIter")
-  (c-name "gdk_pixbuf_animation_iter_get_delay_time")
-  (return-type "int")
-)
-
-(define-method get_pixbuf
-  (of-object "GdkPixbufAnimationIter")
-  (c-name "gdk_pixbuf_animation_iter_get_pixbuf")
-  (return-type "GdkPixbuf*")
-)
-
-(define-method on_currently_loading_frame
-  (of-object "GdkPixbufAnimationIter")
-  (c-name "gdk_pixbuf_animation_iter_on_currently_loading_frame")
-  (return-type "gboolean")
-)
-
-(define-method advance
-  (of-object "GdkPixbufAnimationIter")
-  (c-name "gdk_pixbuf_animation_iter_advance")
-  (return-type "gboolean")
-  (parameters
-    '("const-GTimeVal*" "current_time")
-  )
-)
-
-(define-function gdk_pixbuf_non_anim_get_type
-  (c-name "gdk_pixbuf_non_anim_get_type")
-  (return-type "GType")
-)
-
-(define-method non_anim_new
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_non_anim_new")
-  (return-type "GdkPixbufAnimation*")
-)
-
-
-
-;; From gdk-pixbuf-core.h
-
-(define-function gdk_pixbuf_error_quark
-  (c-name "gdk_pixbuf_error_quark")
-  (return-type "GQuark")
-)
-
-(define-function gdk_pixbuf_get_type
-  (c-name "gdk_pixbuf_get_type")
-  (return-type "GType")
-)
-
-(define-method get_colorspace
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_colorspace")
-  (return-type "GdkColorspace")
-)
-
-(define-method get_n_channels
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_n_channels")
-  (return-type "int")
-)
-
-(define-method get_has_alpha
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_has_alpha")
-  (return-type "gboolean")
-)
-
-(define-method get_bits_per_sample
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_bits_per_sample")
-  (return-type "int")
-)
-
-(define-method get_pixels
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_pixels")
-  (return-type "guchar*")
-)
-
-(define-method get_width
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_width")
-  (return-type "int")
-)
-
-(define-method get_height
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_height")
-  (return-type "int")
-)
-
-(define-method get_rowstride
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_rowstride")
-  (return-type "int")
-)
-
-(define-function gdk_pixbuf_new
-  (c-name "gdk_pixbuf_new")
-  (is-constructor-of "GdkPixbuf")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("GdkColorspace" "colorspace")
-    '("gboolean" "has_alpha")
-    '("int" "bits_per_sample")
-    '("int" "width")
-    '("int" "height")
-  )
-)
-
-(define-method copy
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_copy")
-  (return-type "GdkPixbuf*")
-)
-
-(define-method new_subpixbuf
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_new_subpixbuf")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("int" "src_x")
-    '("int" "src_y")
-    '("int" "width")
-    '("int" "height")
-  )
-)
-
-(define-function gdk_pixbuf_new_from_file
-  (c-name "gdk_pixbuf_new_from_file")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("const-char*" "filename")
-    '("GError**" "error")
-  )
-)
-
-(define-function gdk_pixbuf_new_from_file_at_size
-  (c-name "gdk_pixbuf_new_from_file_at_size")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("const-char*" "filename")
-    '("int" "width")
-    '("int" "height")
-    '("GError**" "error")
-  )
-)
-
-(define-function gdk_pixbuf_new_from_file_at_scale
-  (c-name "gdk_pixbuf_new_from_file_at_scale")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("const-char*" "filename")
-    '("int" "width")
-    '("int" "height")
-    '("gboolean" "preserve_aspect_ratio")
-    '("GError**" "error")
-  )
-)
-
-(define-function gdk_pixbuf_new_from_data
-  (c-name "gdk_pixbuf_new_from_data")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("const-guchar*" "data")
-    '("GdkColorspace" "colorspace")
-    '("gboolean" "has_alpha")
-    '("int" "bits_per_sample")
-    '("int" "width")
-    '("int" "height")
-    '("int" "rowstride")
-    '("GdkPixbufDestroyNotify" "destroy_fn")
-    '("gpointer" "destroy_fn_data")
-  )
-)
-
-(define-function gdk_pixbuf_new_from_xpm_data
-  (c-name "gdk_pixbuf_new_from_xpm_data")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("const-char**" "data")
-  )
-)
-
-(define-function gdk_pixbuf_new_from_inline
-  (c-name "gdk_pixbuf_new_from_inline")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("gint" "data_length")
-    '("const-guint8*" "data")
-    '("gboolean" "copy_pixels")
-    '("GError**" "error")
-  )
-)
-
-(define-method fill
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_fill")
-  (return-type "none")
-  (parameters
-    '("guint32" "pixel")
-  )
-)
-
-(define-method save
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_save")
-  (return-type "gboolean")
-  (parameters
-    '("const-char*" "filename")
-    '("const-char*" "type")
-    '("GError**" "error")
-  )
-  (varargs #t)
-)
-
-(define-method savev
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_savev")
-  (return-type "gboolean")
-  (parameters
-    '("const-char*" "filename")
-    '("const-char*" "type")
-    '("char**" "option_keys")
-    '("char**" "option_values")
-    '("GError**" "error")
-  )
-)
-
-(define-method save_to_callback
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_save_to_callback")
-  (return-type "gboolean")
-  (parameters
-    '("GdkPixbufSaveFunc" "save_func")
-    '("gpointer" "user_data")
-    '("const-char*" "type")
-    '("GError**" "error")
-  )
-  (varargs #t)
-)
-
-(define-method save_to_callbackv
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_save_to_callbackv")
-  (return-type "gboolean")
-  (parameters
-    '("GdkPixbufSaveFunc" "save_func")
-    '("gpointer" "user_data")
-    '("const-char*" "type")
-    '("char**" "option_keys")
-    '("char**" "option_values")
-    '("GError**" "error")
-  )
-)
-
-(define-method save_to_buffer
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_save_to_buffer")
-  (return-type "gboolean")
-  (parameters
-    '("gchar**" "buffer")
-    '("gsize*" "buffer_size")
-    '("const-char*" "type")
-    '("GError**" "error")
-  )
-  (varargs #t)
-)
-
-(define-method save_to_bufferv
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_save_to_bufferv")
-  (return-type "gboolean")
-  (parameters
-    '("gchar**" "buffer")
-    '("gsize*" "buffer_size")
-    '("const-char*" "type")
-    '("char**" "option_keys")
-    '("char**" "option_values")
-    '("GError**" "error")
-  )
-)
-
-(define-function gdk_pixbuf_new_from_stream
-  (c-name "gdk_pixbuf_new_from_stream")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("GInputStream*" "stream")
-    '("GCancellable*" "cancellable")
-    '("GError**" "error")
-  )
-)
-
-(define-function gdk_pixbuf_new_from_stream_at_scale
-  (c-name "gdk_pixbuf_new_from_stream_at_scale")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("GInputStream*" "stream")
-    '("gint" "width")
-    '("gint" "height")
-    '("gboolean" "preserve_aspect_ratio")
-    '("GCancellable*" "cancellable")
-    '("GError**" "error")
-  )
-)
-
-(define-method save_to_stream
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_save_to_stream")
-  (return-type "gboolean")
-  (parameters
-    '("GOutputStream*" "stream")
-    '("const-char*" "type")
-    '("GCancellable*" "cancellable")
-    '("GError**" "error")
-  )
-  (varargs #t)
-)
-
-(define-method add_alpha
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_add_alpha")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("gboolean" "substitute_color")
-    '("guchar" "r")
-    '("guchar" "g")
-    '("guchar" "b")
-  )
-)
-
-(define-method copy_area
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_copy_area")
-  (return-type "none")
-  (parameters
-    '("int" "src_x")
-    '("int" "src_y")
-    '("int" "width")
-    '("int" "height")
-    '("GdkPixbuf*" "dest_pixbuf")
-    '("int" "dest_x")
-    '("int" "dest_y")
-  )
-)
-
-(define-method saturate_and_pixelate
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_saturate_and_pixelate")
-  (return-type "none")
-  (parameters
-    '("GdkPixbuf*" "dest")
-    '("gfloat" "saturation")
-    '("gboolean" "pixelate")
-  )
-)
-
-(define-method apply_embedded_orientation
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_apply_embedded_orientation")
-  (return-type "GdkPixbuf*")
-)
-
-(define-method get_option
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_option")
-  (return-type "const-gchar*")
-  (parameters
-    '("const-gchar*" "key")
-  )
-)
-
-
-
-;; From gdk-pixbuf-enum-types.h
-
-(define-function gdk_pixbuf_alpha_mode_get_type
-  (c-name "gdk_pixbuf_alpha_mode_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_colorspace_get_type
-  (c-name "gdk_colorspace_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_pixbuf_error_get_type
-  (c-name "gdk_pixbuf_error_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_interp_type_get_type
-  (c-name "gdk_interp_type_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_pixbuf_rotation_get_type
-  (c-name "gdk_pixbuf_rotation_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From gdk-pixbuf-features.h
-
-
-
-;; From gdk-pixbuf.h
-
-
-
-;; From gdk-pixbuf-io.h
-
-(define-function gdk_pixbuf_get_formats
-  (c-name "gdk_pixbuf_get_formats")
-  (return-type "GSList*")
-)
-
-(define-method get_name
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_get_name")
-  (return-type "gchar*")
-)
-
-(define-method get_description
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_get_description")
-  (return-type "gchar*")
-)
-
-(define-method get_mime_types
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_get_mime_types")
-  (return-type "gchar**")
-)
-
-(define-method get_extensions
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_get_extensions")
-  (return-type "gchar**")
-)
-
-(define-method is_writable
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_is_writable")
-  (return-type "gboolean")
-)
-
-(define-method is_scalable
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_is_scalable")
-  (return-type "gboolean")
-)
-
-(define-method is_disabled
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_is_disabled")
-  (return-type "gboolean")
-)
-
-(define-method set_disabled
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_set_disabled")
-  (return-type "none")
-  (parameters
-    '("gboolean" "disabled")
-  )
-)
-
-(define-method get_license
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_get_license")
-  (return-type "gchar*")
-)
-
-(define-function gdk_pixbuf_get_file_info
-  (c-name "gdk_pixbuf_get_file_info")
-  (return-type "GdkPixbufFormat*")
-  (parameters
-    '("const-gchar*" "filename")
-    '("gint*" "width")
-    '("gint*" "height")
-  )
-)
-
-(define-method set_option
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_set_option")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "key")
-    '("const-gchar*" "value")
-  )
-)
-
-
-
-;; From gdk-pixbuf-loader.h
-
-(define-function gdk_pixbuf_loader_get_type
-  (c-name "gdk_pixbuf_loader_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_pixbuf_loader_new
-  (c-name "gdk_pixbuf_loader_new")
-  (is-constructor-of "GdkPixbufLoader")
-  (return-type "GdkPixbufLoader*")
-)
-
-(define-function gdk_pixbuf_loader_new_with_type
-  (c-name "gdk_pixbuf_loader_new_with_type")
-  (return-type "GdkPixbufLoader*")
-  (parameters
-    '("const-char*" "image_type")
-    '("GError**" "error")
-  )
-)
-
-(define-function gdk_pixbuf_loader_new_with_mime_type
-  (c-name "gdk_pixbuf_loader_new_with_mime_type")
-  (return-type "GdkPixbufLoader*")
-  (parameters
-    '("const-char*" "mime_type")
-    '("GError**" "error")
-  )
-)
-
-(define-method set_size
-  (of-object "GdkPixbufLoader")
-  (c-name "gdk_pixbuf_loader_set_size")
-  (return-type "none")
-  (parameters
-    '("int" "width")
-    '("int" "height")
-  )
-)
-
-(define-method write
-  (of-object "GdkPixbufLoader")
-  (c-name "gdk_pixbuf_loader_write")
-  (return-type "gboolean")
-  (parameters
-    '("const-guchar*" "buf")
-    '("gsize" "count")
-    '("GError**" "error")
-  )
-)
-
-(define-method get_pixbuf
-  (of-object "GdkPixbufLoader")
-  (c-name "gdk_pixbuf_loader_get_pixbuf")
-  (return-type "GdkPixbuf*")
-)
-
-(define-method get_animation
-  (of-object "GdkPixbufLoader")
-  (c-name "gdk_pixbuf_loader_get_animation")
-  (return-type "GdkPixbufAnimation*")
-)
-
-(define-method close
-  (of-object "GdkPixbufLoader")
-  (c-name "gdk_pixbuf_loader_close")
-  (return-type "gboolean")
-  (parameters
-    '("GError**" "error")
-  )
-)
-
-(define-method get_format
-  (of-object "GdkPixbufLoader")
-  (c-name "gdk_pixbuf_loader_get_format")
-  (return-type "GdkPixbufFormat*")
-)
-
-
-
-;; From gdk-pixbuf-marshal.h
-
-
-
-;; From gdk-pixbuf-simple-anim.h
+;; From gdkwindowimpl.h
 
-(define-function gdk_pixbuf_simple_anim_get_type
-  (c-name "gdk_pixbuf_simple_anim_get_type")
+(define-function gdk_window_impl_get_type
+  (c-name "gdk_window_impl_get_type")
   (return-type "GType")
 )
 
-(define-function gdk_pixbuf_simple_anim_iter_get_type
-  (c-name "gdk_pixbuf_simple_anim_iter_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_pixbuf_simple_anim_new
-  (c-name "gdk_pixbuf_simple_anim_new")
-  (is-constructor-of "GdkPixbufSimpleAnim")
-  (return-type "GdkPixbufSimpleAnim*")
-  (parameters
-    '("gint" "width")
-    '("gint" "height")
-    '("gfloat" "rate")
-  )
-)
-
-(define-method add_frame
-  (of-object "GdkPixbufSimpleAnim")
-  (c-name "gdk_pixbuf_simple_anim_add_frame")
-  (return-type "none")
-  (parameters
-    '("GdkPixbuf*" "pixbuf")
-  )
-)
-
-(define-method set_loop
-  (of-object "GdkPixbufSimpleAnim")
-  (c-name "gdk_pixbuf_simple_anim_set_loop")
-  (return-type "none")
-  (parameters
-    '("gboolean" "loop")
-  )
-)
-
-(define-method get_loop
-  (of-object "GdkPixbufSimpleAnim")
-  (c-name "gdk_pixbuf_simple_anim_get_loop")
-  (return-type "gboolean")
-)
-
-
-
-;; From gdk-pixbuf-transform.h
-
-(define-method scale
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_scale")
-  (return-type "none")
-  (parameters
-    '("GdkPixbuf*" "dest")
-    '("int" "dest_x")
-    '("int" "dest_y")
-    '("int" "dest_width")
-    '("int" "dest_height")
-    '("double" "offset_x")
-    '("double" "offset_y")
-    '("double" "scale_x")
-    '("double" "scale_y")
-    '("GdkInterpType" "interp_type")
-  )
-)
-
-(define-method composite
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_composite")
-  (return-type "none")
-  (parameters
-    '("GdkPixbuf*" "dest")
-    '("int" "dest_x")
-    '("int" "dest_y")
-    '("int" "dest_width")
-    '("int" "dest_height")
-    '("double" "offset_x")
-    '("double" "offset_y")
-    '("double" "scale_x")
-    '("double" "scale_y")
-    '("GdkInterpType" "interp_type")
-    '("int" "overall_alpha")
-  )
-)
-
-(define-method composite_color
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_composite_color")
-  (return-type "none")
-  (parameters
-    '("GdkPixbuf*" "dest")
-    '("int" "dest_x")
-    '("int" "dest_y")
-    '("int" "dest_width")
-    '("int" "dest_height")
-    '("double" "offset_x")
-    '("double" "offset_y")
-    '("double" "scale_x")
-    '("double" "scale_y")
-    '("GdkInterpType" "interp_type")
-    '("int" "overall_alpha")
-    '("int" "check_x")
-    '("int" "check_y")
-    '("int" "check_size")
-    '("guint32" "color1")
-    '("guint32" "color2")
-  )
-)
-
-(define-method scale_simple
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_scale_simple")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("int" "dest_width")
-    '("int" "dest_height")
-    '("GdkInterpType" "interp_type")
-  )
-)
-
-(define-method composite_color_simple
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_composite_color_simple")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("int" "dest_width")
-    '("int" "dest_height")
-    '("GdkInterpType" "interp_type")
-    '("int" "overall_alpha")
-    '("int" "check_size")
-    '("guint32" "color1")
-    '("guint32" "color2")
-  )
-)
-
-(define-method rotate_simple
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_rotate_simple")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("GdkPixbufRotation" "angle")
-  )
-)
-
-(define-method flip
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_flip")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("gboolean" "horizontal")
-  )
-)
-
-
-
-;; From gdk-pixdata.h
-
-(define-method serialize
-  (of-object "GdkPixdata")
-  (c-name "gdk_pixdata_serialize")
-  (return-type "guint8*")
-  (parameters
-    '("guint*" "stream_length_p")
-  )
-)
-
-(define-method deserialize
-  (of-object "GdkPixdata")
-  (c-name "gdk_pixdata_deserialize")
-  (return-type "gboolean")
-  (parameters
-    '("guint" "stream_length")
-    '("const-guint8*" "stream")
-    '("GError**" "error")
-  )
-)
-
-(define-method from_pixbuf
-  (of-object "GdkPixdata")
-  (c-name "gdk_pixdata_from_pixbuf")
-  (return-type "gpointer")
-  (parameters
-    '("const-GdkPixbuf*" "pixbuf")
-    '("gboolean" "use_rle")
-  )
-)
-
-(define-function gdk_pixbuf_from_pixdata
-  (c-name "gdk_pixbuf_from_pixdata")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("const-GdkPixdata*" "pixdata")
-    '("gboolean" "copy_pixels")
-    '("GError**" "error")
-  )
-)
-
-(define-method to_csource
-  (of-object "GdkPixdata")
-  (c-name "gdk_pixdata_to_csource")
-  (return-type "GString*")
-  (parameters
-    '("const-gchar*" "name")
-    '("GdkPixdataDumpType" "dump_type")
-  )
-)
-
-
-
-;; From gdk-pixbuf-xlib.h
-
-(define-function gdk_pixbuf_xlib_init
-  (c-name "gdk_pixbuf_xlib_init")
-  (return-type "none")
-  (parameters
-    '("Display*" "display")
-    '("int" "screen_num")
-  )
-)
-
-(define-function gdk_pixbuf_xlib_init_with_depth
-  (c-name "gdk_pixbuf_xlib_init_with_depth")
-  (return-type "none")
-  (parameters
-    '("Display*" "display")
-    '("int" "screen_num")
-    '("int" "prefDepth")
-  )
-)
-
-(define-method xlib_render_threshold_alpha
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_xlib_render_threshold_alpha")
-  (return-type "none")
-  (parameters
-    '("Pixmap" "bitmap")
-    '("int" "src_x")
-    '("int" "src_y")
-    '("int" "dest_x")
-    '("int" "dest_y")
-    '("int" "width")
-    '("int" "height")
-    '("int" "alpha_threshold")
-  )
-)
-
-(define-method xlib_render_to_drawable
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_xlib_render_to_drawable")
-  (return-type "none")
-  (parameters
-    '("Drawable" "drawable")
-    '("GC" "gc")
-    '("int" "src_x")
-    '("int" "src_y")
-    '("int" "dest_x")
-    '("int" "dest_y")
-    '("int" "width")
-    '("int" "height")
-    '("XlibRgbDither" "dither")
-    '("int" "x_dither")
-    '("int" "y_dither")
-  )
-)
-
-(define-method xlib_render_to_drawable_alpha
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_xlib_render_to_drawable_alpha")
-  (return-type "none")
-  (parameters
-    '("Drawable" "drawable")
-    '("int" "src_x")
-    '("int" "src_y")
-    '("int" "dest_x")
-    '("int" "dest_y")
-    '("int" "width")
-    '("int" "height")
-    '("GdkPixbufAlphaMode" "alpha_mode")
-    '("int" "alpha_threshold")
-    '("XlibRgbDither" "dither")
-    '("int" "x_dither")
-    '("int" "y_dither")
-  )
-)
-
-(define-method xlib_render_pixmap_and_mask
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_xlib_render_pixmap_and_mask")
-  (return-type "none")
-  (parameters
-    '("Pixmap*" "pixmap_return")
-    '("Pixmap*" "mask_return")
-    '("int" "alpha_threshold")
-  )
-)
-
-(define-method xlib_get_from_drawable
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_xlib_get_from_drawable")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("Drawable" "src")
-    '("Colormap" "cmap")
-    '("Visual*" "visual")
-    '("int" "src_x")
-    '("int" "src_y")
-    '("int" "dest_x")
-    '("int" "dest_y")
-    '("int" "width")
-    '("int" "height")
-  )
-)
-
-
-
-;; From gdk-pixbuf-xlibrgb.h
-
-(define-function xlib_rgb_init
-  (c-name "xlib_rgb_init")
-  (return-type "none")
-  (parameters
-    '("Display*" "display")
-    '("Screen*" "screen")
-  )
-)
-
-(define-function xlib_rgb_init_with_depth
-  (c-name "xlib_rgb_init_with_depth")
-  (return-type "none")
-  (parameters
-    '("Display*" "display")
-    '("Screen*" "screen")
-    '("int" "prefDepth")
-  )
-)
-
-(define-function xlib_rgb_gc_set_foreground
-  (c-name "xlib_rgb_gc_set_foreground")
-  (return-type "none")
-  (parameters
-    '("GC" "gc")
-    '("guint32" "rgb")
-  )
-)
-
-(define-function xlib_rgb_gc_set_background
-  (c-name "xlib_rgb_gc_set_background")
-  (return-type "none")
-  (parameters
-    '("GC" "gc")
-    '("guint32" "rgb")
-  )
-)
-
-(define-function xlib_draw_rgb_image
-  (c-name "xlib_draw_rgb_image")
-  (return-type "none")
-  (parameters
-    '("Drawable" "drawable")
-    '("GC" "gc")
-    '("int" "x")
-    '("int" "y")
-    '("int" "width")
-    '("int" "height")
-    '("XlibRgbDither" "dith")
-    '("unsigned-char*" "rgb_buf")
-    '("int" "rowstride")
-  )
-)
-
-(define-function xlib_draw_rgb_image_dithalign
-  (c-name "xlib_draw_rgb_image_dithalign")
-  (return-type "none")
-  (parameters
-    '("Drawable" "drawable")
-    '("GC" "gc")
-    '("int" "x")
-    '("int" "y")
-    '("int" "width")
-    '("int" "height")
-    '("XlibRgbDither" "dith")
-    '("unsigned-char*" "rgb_buf")
-    '("int" "rowstride")
-    '("int" "xdith")
-    '("int" "ydith")
-  )
-)
-
-(define-function xlib_draw_rgb_32_image
-  (c-name "xlib_draw_rgb_32_image")
-  (return-type "none")
-  (parameters
-    '("Drawable" "drawable")
-    '("GC" "gc")
-    '("int" "x")
-    '("int" "y")
-    '("int" "width")
-    '("int" "height")
-    '("XlibRgbDither" "dith")
-    '("unsigned-char*" "buf")
-    '("int" "rowstride")
-  )
-)
-
-(define-function xlib_draw_gray_image
-  (c-name "xlib_draw_gray_image")
-  (return-type "none")
-  (parameters
-    '("Drawable" "drawable")
-    '("GC" "gc")
-    '("int" "x")
-    '("int" "y")
-    '("int" "width")
-    '("int" "height")
-    '("XlibRgbDither" "dith")
-    '("unsigned-char*" "buf")
-    '("int" "rowstride")
-  )
-)
-
-(define-function xlib_rgb_cmap_new
-  (c-name "xlib_rgb_cmap_new")
-  (is-constructor-of "XlibRgbCmap")
-  (return-type "XlibRgbCmap*")
-  (parameters
-    '("guint32*" "colors")
-    '("int" "n_colors")
-  )
-)
-
-(define-method free
-  (of-object "XlibRgbCmap")
-  (c-name "xlib_rgb_cmap_free")
-  (return-type "none")
-)
 
-(define-function xlib_draw_indexed_image
-  (c-name "xlib_draw_indexed_image")
-  (return-type "none")
-  (parameters
-    '("Drawable" "drawable")
-    '("GC" "gc")
-    '("int" "x")
-    '("int" "y")
-    '("int" "width")
-    '("int" "height")
-    '("XlibRgbDither" "dith")
-    '("unsigned-char*" "buf")
-    '("int" "rowstride")
-    '("XlibRgbCmap*" "cmap")
-  )
-)
 
-(define-function xlib_rgb_ditherable
-  (c-name "xlib_rgb_ditherable")
-  (return-type "Bool")
-)
+;; From keyname-table.h
 
-(define-function xlib_rgb_set_verbose
-  (c-name "xlib_rgb_set_verbose")
-  (return-type "none")
-  (parameters
-    '("Bool" "verbose")
-  )
-)
 
-(define-function xlib_rgb_set_install
-  (c-name "xlib_rgb_set_install")
-  (return-type "none")
-  (parameters
-    '("Bool" "install")
-  )
-)
-
-(define-function xlib_rgb_set_min_colors
-  (c-name "xlib_rgb_set_min_colors")
-  (return-type "none")
-  (parameters
-    '("int" "min_colors")
-  )
-)
 
-(define-function xlib_rgb_get_cmap
-  (c-name "xlib_rgb_get_cmap")
-  (return-type "Colormap")
-)
+;; From stamp-gdkenumtypes.h
 
-(define-function xlib_rgb_get_visual
-  (c-name "xlib_rgb_get_visual")
-  (return-type "Visual*")
-)
 
-(define-function xlib_rgb_get_visual_info
-  (c-name "xlib_rgb_get_visual_info")
-  (return-type "XVisualInfo*")
-)
-
-(define-function xlib_rgb_get_depth
-  (c-name "xlib_rgb_get_depth")
-  (return-type "int")
-)
-
-(define-function xlib_rgb_get_display
-  (c-name "xlib_rgb_get_display")
-  (return-type "Display*")
-)
-
-(define-function xlib_rgb_get_screen
-  (c-name "xlib_rgb_get_screen")
-  (return-type "Screen*")
-)
diff --git a/gdk/src/types.hg b/gdk/src/types.hg
index fd644b8..2a41d6d 100644
--- a/gdk/src/types.hg
+++ b/gdk/src/types.hg
@@ -65,7 +65,6 @@ class Image;
 _WRAP_ENUM(ByteOrder, GdkByteOrder)
 _WRAP_ENUM(ModifierType, GdkModifierType)
 _WRAP_ENUM(Status, GdkStatus)
-_WRAP_ENUM(InputCondition, GdkInputCondition)
 
 typedef GdkGeometry Geometry; //It's not used enough to justify having a wrapper.
 typedef GdkNativeWindow NativeWindow;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]