[gtkmm/mkolny/use-mmgirgenerator: 1/2] mmgirgenerator: add gen script, update enums definitions



commit 78ca0107a1f37113a2a2116cb602158d6736881e
Author: Marcin Kolny <marcin kolny gmail com>
Date:   Sun Nov 6 19:07:12 2016 +0100

    mmgirgenerator: add gen script, update enums definitions

 gdk/src/gdk_enums.defs                   | 1637 +++++----------
 gtk/src/gtk_enums.defs                   | 3387 ++++++++----------------------
 tools/gen_scripts/gtkmm_generate_defs.sh |   34 +
 3 files changed, 1351 insertions(+), 3707 deletions(-)
---
diff --git a/gdk/src/gdk_enums.defs b/gdk/src/gdk_enums.defs
index 983bdf8..52cfc8c 100644
--- a/gdk/src/gdk_enums.defs
+++ b/gdk/src/gdk_enums.defs
@@ -1,119 +1,107 @@
-;; From gdkcursor.h
+(define-flags-extended AnchorHints
+  (in-module "Gdk")
+  (c-name "GdkAnchorHints")
+  (values
+    '("flip_x" "GDK_ANCHOR_FLIP_X" "1")
+    '("flip_y" "GDK_ANCHOR_FLIP_Y" "2")
+    '("slide_x" "GDK_ANCHOR_SLIDE_X" "4")
+    '("slide_y" "GDK_ANCHOR_SLIDE_Y" "8")
+    '("resize_x" "GDK_ANCHOR_RESIZE_X" "16")
+    '("resize_y" "GDK_ANCHOR_RESIZE_Y" "32")
+    '("flip" "GDK_ANCHOR_FLIP" "3")
+    '("slide" "GDK_ANCHOR_SLIDE" "12")
+    '("resize" "GDK_ANCHOR_RESIZE" "48")
+  )
+)
 
-;; 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-flags-extended AxisFlags
+  (in-module "Gdk")
+  (c-name "GdkAxisFlags")
+  (values
+    '("x" "GDK_AXIS_FLAG_X" "2")
+    '("y" "GDK_AXIS_FLAG_Y" "4")
+    '("pressure" "GDK_AXIS_FLAG_PRESSURE" "8")
+    '("xtilt" "GDK_AXIS_FLAG_XTILT" "16")
+    '("ytilt" "GDK_AXIS_FLAG_YTILT" "32")
+    '("wheel" "GDK_AXIS_FLAG_WHEEL" "64")
+    '("distance" "GDK_AXIS_FLAG_DISTANCE" "128")
+    '("rotation" "GDK_AXIS_FLAG_ROTATION" "256")
+    '("slider" "GDK_AXIS_FLAG_SLIDER" "512")
+  )
+)
+
+(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")
+    '("distance" "GDK_AXIS_DISTANCE" "7")
+    '("rotation" "GDK_AXIS_ROTATION" "8")
+    '("slider" "GDK_AXIS_SLIDER" "9")
+    '("last" "GDK_AXIS_LAST" "10")
+  )
+)
+
+(define-enum-extended ByteOrder
+  (in-module "Gdk")
+  (c-name "GdkByteOrder")
+  (values
+    '("lsb_first" "GDK_LSB_FIRST" "0")
+    '("msb_first" "GDK_MSB_FIRST" "1")
+  )
+)
+
+(define-enum-extended CrossingMode
+  (in-module "Gdk")
+  (c-name "GdkCrossingMode")
+  (values
+    '("normal" "GDK_CROSSING_NORMAL" "0")
+    '("grab" "GDK_CROSSING_GRAB" "1")
+    '("ungrab" "GDK_CROSSING_UNGRAB" "2")
+    '("gtk_grab" "GDK_CROSSING_GTK_GRAB" "3")
+    '("gtk_ungrab" "GDK_CROSSING_GTK_UNGRAB" "4")
+    '("state_changed" "GDK_CROSSING_STATE_CHANGED" "5")
+    '("touch_begin" "GDK_CROSSING_TOUCH_BEGIN" "6")
+    '("touch_end" "GDK_CROSSING_TOUCH_END" "7")
+    '("device_switch" "GDK_CROSSING_DEVICE_SWITCH" "8")
+  )
+)
 
 (define-enum-extended CursorType
   (in-module "Gdk")
   (c-name "GdkCursorType")
   (values
-    '("x-cursor" "GDK_X_CURSOR" "0")
+    '("x_cursor" "GDK_X_CURSOR" "0")
     '("arrow" "GDK_ARROW" "2")
-    '("based-arrow-down" "GDK_BASED_ARROW_DOWN" "4")
-    '("based-arrow-up" "GDK_BASED_ARROW_UP" "6")
+    '("based_arrow_down" "GDK_BASED_ARROW_DOWN" "4")
+    '("based_arrow_up" "GDK_BASED_ARROW_UP" "6")
     '("boat" "GDK_BOAT" "8")
     '("bogosity" "GDK_BOGOSITY" "10")
-    '("bottom-left-corner" "GDK_BOTTOM_LEFT_CORNER" "12")
-    '("bottom-right-corner" "GDK_BOTTOM_RIGHT_CORNER" "14")
-    '("bottom-side" "GDK_BOTTOM_SIDE" "16")
-    '("bottom-tee" "GDK_BOTTOM_TEE" "18")
-    '("box-spiral" "GDK_BOX_SPIRAL" "20")
-    '("center-ptr" "GDK_CENTER_PTR" "22")
+    '("bottom_left_corner" "GDK_BOTTOM_LEFT_CORNER" "12")
+    '("bottom_right_corner" "GDK_BOTTOM_RIGHT_CORNER" "14")
+    '("bottom_side" "GDK_BOTTOM_SIDE" "16")
+    '("bottom_tee" "GDK_BOTTOM_TEE" "18")
+    '("box_spiral" "GDK_BOX_SPIRAL" "20")
+    '("center_ptr" "GDK_CENTER_PTR" "22")
     '("circle" "GDK_CIRCLE" "24")
     '("clock" "GDK_CLOCK" "26")
-    '("coffee-mug" "GDK_COFFEE_MUG" "28")
+    '("coffee_mug" "GDK_COFFEE_MUG" "28")
     '("cross" "GDK_CROSS" "30")
-    '("cross-reverse" "GDK_CROSS_REVERSE" "32")
+    '("cross_reverse" "GDK_CROSS_REVERSE" "32")
     '("crosshair" "GDK_CROSSHAIR" "34")
-    '("diamond-cross" "GDK_DIAMOND_CROSS" "36")
+    '("diamond_cross" "GDK_DIAMOND_CROSS" "36")
     '("dot" "GDK_DOT" "38")
     '("dotbox" "GDK_DOTBOX" "40")
-    '("double-arrow" "GDK_DOUBLE_ARROW" "42")
-    '("draft-large" "GDK_DRAFT_LARGE" "44")
-    '("draft-small" "GDK_DRAFT_SMALL" "46")
-    '("draped-box" "GDK_DRAPED_BOX" "48")
+    '("double_arrow" "GDK_DOUBLE_ARROW" "42")
+    '("draft_large" "GDK_DRAFT_LARGE" "44")
+    '("draft_small" "GDK_DRAFT_SMALL" "46")
+    '("draped_box" "GDK_DRAPED_BOX" "48")
     '("exchange" "GDK_EXCHANGE" "50")
     '("fleur" "GDK_FLEUR" "52")
     '("gobbler" "GDK_GOBBLER" "54")
@@ -122,32 +110,32 @@
     '("hand2" "GDK_HAND2" "60")
     '("heart" "GDK_HEART" "62")
     '("icon" "GDK_ICON" "64")
-    '("iron-cross" "GDK_IRON_CROSS" "66")
-    '("left-ptr" "GDK_LEFT_PTR" "68")
-    '("left-side" "GDK_LEFT_SIDE" "70")
-    '("left-tee" "GDK_LEFT_TEE" "72")
+    '("iron_cross" "GDK_IRON_CROSS" "66")
+    '("left_ptr" "GDK_LEFT_PTR" "68")
+    '("left_side" "GDK_LEFT_SIDE" "70")
+    '("left_tee" "GDK_LEFT_TEE" "72")
     '("leftbutton" "GDK_LEFTBUTTON" "74")
-    '("ll-angle" "GDK_LL_ANGLE" "76")
-    '("lr-angle" "GDK_LR_ANGLE" "78")
+    '("ll_angle" "GDK_LL_ANGLE" "76")
+    '("lr_angle" "GDK_LR_ANGLE" "78")
     '("man" "GDK_MAN" "80")
     '("middlebutton" "GDK_MIDDLEBUTTON" "82")
     '("mouse" "GDK_MOUSE" "84")
     '("pencil" "GDK_PENCIL" "86")
     '("pirate" "GDK_PIRATE" "88")
     '("plus" "GDK_PLUS" "90")
-    '("question-arrow" "GDK_QUESTION_ARROW" "92")
-    '("right-ptr" "GDK_RIGHT_PTR" "94")
-    '("right-side" "GDK_RIGHT_SIDE" "96")
-    '("right-tee" "GDK_RIGHT_TEE" "98")
+    '("question_arrow" "GDK_QUESTION_ARROW" "92")
+    '("right_ptr" "GDK_RIGHT_PTR" "94")
+    '("right_side" "GDK_RIGHT_SIDE" "96")
+    '("right_tee" "GDK_RIGHT_TEE" "98")
     '("rightbutton" "GDK_RIGHTBUTTON" "100")
-    '("rtl-logo" "GDK_RTL_LOGO" "102")
+    '("rtl_logo" "GDK_RTL_LOGO" "102")
     '("sailboat" "GDK_SAILBOAT" "104")
-    '("sb-down-arrow" "GDK_SB_DOWN_ARROW" "106")
-    '("sb-h-double-arrow" "GDK_SB_H_DOUBLE_ARROW" "108")
-    '("sb-left-arrow" "GDK_SB_LEFT_ARROW" "110")
-    '("sb-right-arrow" "GDK_SB_RIGHT_ARROW" "112")
-    '("sb-up-arrow" "GDK_SB_UP_ARROW" "114")
-    '("sb-v-double-arrow" "GDK_SB_V_DOUBLE_ARROW" "116")
+    '("sb_down_arrow" "GDK_SB_DOWN_ARROW" "106")
+    '("sb_h_double_arrow" "GDK_SB_H_DOUBLE_ARROW" "108")
+    '("sb_left_arrow" "GDK_SB_LEFT_ARROW" "110")
+    '("sb_right_arrow" "GDK_SB_RIGHT_ARROW" "112")
+    '("sb_up_arrow" "GDK_SB_UP_ARROW" "114")
+    '("sb_v_double_arrow" "GDK_SB_V_DOUBLE_ARROW" "116")
     '("shuttle" "GDK_SHUTTLE" "118")
     '("sizing" "GDK_SIZING" "120")
     '("spider" "GDK_SPIDER" "122")
@@ -155,99 +143,23 @@
     '("star" "GDK_STAR" "126")
     '("target" "GDK_TARGET" "128")
     '("tcross" "GDK_TCROSS" "130")
-    '("top-left-arrow" "GDK_TOP_LEFT_ARROW" "132")
-    '("top-left-corner" "GDK_TOP_LEFT_CORNER" "134")
-    '("top-right-corner" "GDK_TOP_RIGHT_CORNER" "136")
-    '("top-side" "GDK_TOP_SIDE" "138")
-    '("top-tee" "GDK_TOP_TEE" "140")
+    '("top_left_arrow" "GDK_TOP_LEFT_ARROW" "132")
+    '("top_left_corner" "GDK_TOP_LEFT_CORNER" "134")
+    '("top_right_corner" "GDK_TOP_RIGHT_CORNER" "136")
+    '("top_side" "GDK_TOP_SIDE" "138")
+    '("top_tee" "GDK_TOP_TEE" "140")
     '("trek" "GDK_TREK" "142")
-    '("ul-angle" "GDK_UL_ANGLE" "144")
+    '("ul_angle" "GDK_UL_ANGLE" "144")
     '("umbrella" "GDK_UMBRELLA" "146")
-    '("ur-angle" "GDK_UR_ANGLE" "148")
+    '("ur_angle" "GDK_UR_ANGLE" "148")
     '("watch" "GDK_WATCH" "150")
     '("xterm" "GDK_XTERM" "152")
-    '("last-cursor" "GDK_LAST_CURSOR" "153")
-    '("blank-cursor" "GDK_BLANK_CURSOR" "-2")
-    '("cursor-is-pixmap" "GDK_CURSOR_IS_PIXMAP" "-1")
+    '("last_cursor" "GDK_LAST_CURSOR" "153")
+    '("blank_cursor" "GDK_BLANK_CURSOR" "-2")
+    '("cursor_is_pixmap" "GDK_CURSOR_IS_PIXMAP" "-1")
   )
 )
 
-;; From gdkdevice.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GDK_SOURCE_MOUSE,
-;;   GDK_SOURCE_PEN,
-;;   GDK_SOURCE_ERASER,
-;;   GDK_SOURCE_CURSOR,
-;;   GDK_SOURCE_KEYBOARD,
-;;   GDK_SOURCE_TOUCHSCREEN,
-;;   GDK_SOURCE_TOUCHPAD,
-;;   GDK_SOURCE_TRACKPOINT,
-;;   GDK_SOURCE_TABLET_PAD
-;; } 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")
-    '("touchscreen" "GDK_SOURCE_TOUCHSCREEN" "5")
-    '("touchpad" "GDK_SOURCE_TOUCHPAD" "6")
-    '("trackpoint" "GDK_SOURCE_TRACKPOINT" "7")
-    '("tablet-pad" "GDK_SOURCE_TABLET_PAD" "8")
-  )
-)
-
-;; 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_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 gdkdevicepad.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GDK_DEVICE_PAD_FEATURE_BUTTON,
-;;   GDK_DEVICE_PAD_FEATURE_RING,
-;;   GDK_DEVICE_PAD_FEATURE_STRIP
-;; } GdkDevicePadFeature;
-
 (define-enum-extended DevicePadFeature
   (in-module "Gdk")
   (c-name "GdkDevicePadFeature")
@@ -258,20 +170,6 @@
   )
 )
 
-;; From gdkdevicetool.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GDK_DEVICE_TOOL_TYPE_UNKNOWN,
-;;   GDK_DEVICE_TOOL_TYPE_PEN,
-;;   GDK_DEVICE_TOOL_TYPE_ERASER,
-;;   GDK_DEVICE_TOOL_TYPE_BRUSH,
-;;   GDK_DEVICE_TOOL_TYPE_PENCIL,
-;;   GDK_DEVICE_TOOL_TYPE_AIRBRUSH,
-;;   GDK_DEVICE_TOOL_TYPE_MOUSE,
-;;   GDK_DEVICE_TOOL_TYPE_LENS,
-;; } GdkDeviceToolType;
-
 (define-enum-extended DeviceToolType
   (in-module "Gdk")
   (c-name "GdkDeviceToolType")
@@ -287,62 +185,39 @@
   )
 )
 
-;; 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-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")
+  )
+)
 
 (define-flags-extended DragAction
   (in-module "Gdk")
   (c-name "GdkDragAction")
   (values
-    '("default" "GDK_ACTION_DEFAULT" "1 << 0")
-    '("copy" "GDK_ACTION_COPY" "1 << 1")
-    '("move" "GDK_ACTION_MOVE" "1 << 2")
-    '("link" "GDK_ACTION_LINK" "1 << 3")
-    '("private" "GDK_ACTION_PRIVATE" "1 << 4")
-    '("ask" "GDK_ACTION_ASK" "1 << 5")
+    '("default" "GDK_ACTION_DEFAULT" "1")
+    '("copy" "GDK_ACTION_COPY" "2")
+    '("move" "GDK_ACTION_MOVE" "4")
+    '("link" "GDK_ACTION_LINK" "8")
+    '("private" "GDK_ACTION_PRIVATE" "16")
+    '("ask" "GDK_ACTION_ASK" "32")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   GDK_DRAG_CANCEL_NO_TARGET,
-;;   GDK_DRAG_CANCEL_USER_CANCELLED,
-;;   GDK_DRAG_CANCEL_ERROR
-;; } GdkDragCancelReason;
-
 (define-enum-extended DragCancelReason
   (in-module "Gdk")
   (c-name "GdkDragCancelReason")
   (values
-    '("no-target" "GDK_DRAG_CANCEL_NO_TARGET" "0")
-    '("user-cancelled" "GDK_DRAG_CANCEL_USER_CANCELLED" "1")
+    '("no_target" "GDK_DRAG_CANCEL_NO_TARGET" "0")
+    '("user_cancelled" "GDK_DRAG_CANCEL_USER_CANCELLED" "1")
     '("error" "GDK_DRAG_CANCEL_ERROR" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GDK_DRAG_PROTO_NONE = 0,
-;;   GDK_DRAG_PROTO_MOTIF,
-;;   GDK_DRAG_PROTO_XDND,
-;;   GDK_DRAG_PROTO_ROOTWIN,
-;;   GDK_DRAG_PROTO_WIN32_DROPFILES,
-;;   GDK_DRAG_PROTO_OLE2,
-;;   GDK_DRAG_PROTO_LOCAL,
-;;   GDK_DRAG_PROTO_WAYLAND
-;; } GdkDragProtocol;
-
 (define-enum-extended DragProtocol
   (in-module "Gdk")
   (c-name "GdkDragProtocol")
@@ -351,90 +226,46 @@
     '("motif" "GDK_DRAG_PROTO_MOTIF" "1")
     '("xdnd" "GDK_DRAG_PROTO_XDND" "2")
     '("rootwin" "GDK_DRAG_PROTO_ROOTWIN" "3")
-    '("win32-dropfiles" "GDK_DRAG_PROTO_WIN32_DROPFILES" "4")
+    '("win32_dropfiles" "GDK_DRAG_PROTO_WIN32_DROPFILES" "4")
     '("ole2" "GDK_DRAG_PROTO_OLE2" "5")
     '("local" "GDK_DRAG_PROTO_LOCAL" "6")
     '("wayland" "GDK_DRAG_PROTO_WAYLAND" "7")
   )
 )
 
-;; 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
+(define-flags-extended EventMask
   (in-module "Gdk")
-  (c-name "GdkFilterReturn")
+  (c-name "GdkEventMask")
   (values
-    '("continue" "GDK_FILTER_CONTINUE" "0")
-    '("translate" "GDK_FILTER_TRANSLATE" "1")
-    '("remove" "GDK_FILTER_REMOVE" "2")
+    '("exposure_mask" "GDK_EXPOSURE_MASK" "2")
+    '("pointer_motion_mask" "GDK_POINTER_MOTION_MASK" "4")
+    '("pointer_motion_hint_mask" "GDK_POINTER_MOTION_HINT_MASK" "8")
+    '("button_motion_mask" "GDK_BUTTON_MOTION_MASK" "16")
+    '("button1_motion_mask" "GDK_BUTTON1_MOTION_MASK" "32")
+    '("button2_motion_mask" "GDK_BUTTON2_MOTION_MASK" "64")
+    '("button3_motion_mask" "GDK_BUTTON3_MOTION_MASK" "128")
+    '("button_press_mask" "GDK_BUTTON_PRESS_MASK" "256")
+    '("button_release_mask" "GDK_BUTTON_RELEASE_MASK" "512")
+    '("key_press_mask" "GDK_KEY_PRESS_MASK" "1024")
+    '("key_release_mask" "GDK_KEY_RELEASE_MASK" "2048")
+    '("enter_notify_mask" "GDK_ENTER_NOTIFY_MASK" "4096")
+    '("leave_notify_mask" "GDK_LEAVE_NOTIFY_MASK" "8192")
+    '("focus_change_mask" "GDK_FOCUS_CHANGE_MASK" "16384")
+    '("structure_mask" "GDK_STRUCTURE_MASK" "32768")
+    '("property_change_mask" "GDK_PROPERTY_CHANGE_MASK" "65536")
+    '("visibility_notify_mask" "GDK_VISIBILITY_NOTIFY_MASK" "131072")
+    '("proximity_in_mask" "GDK_PROXIMITY_IN_MASK" "262144")
+    '("proximity_out_mask" "GDK_PROXIMITY_OUT_MASK" "524288")
+    '("substructure_mask" "GDK_SUBSTRUCTURE_MASK" "1048576")
+    '("scroll_mask" "GDK_SCROLL_MASK" "2097152")
+    '("touch_mask" "GDK_TOUCH_MASK" "4194304")
+    '("smooth_scroll_mask" "GDK_SMOOTH_SCROLL_MASK" "8388608")
+    '("touchpad_gesture_mask" "GDK_TOUCHPAD_GESTURE_MASK" "16777216")
+    '("tablet_pad_mask" "GDK_TABLET_PAD_MASK" "33554432")
+    '("all_events_mask" "GDK_ALL_EVENTS_MASK" "16777214")
   )
 )
 
-;; 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_DOUBLE_BUTTON_PRESS = GDK_2BUTTON_PRESS,
-;;   GDK_3BUTTON_PRESS = 6,
-;;   GDK_TRIPLE_BUTTON_PRESS = GDK_3BUTTON_PRESS,
-;;   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_SCROLL            = 31,
-;;   GDK_WINDOW_STATE      = 32,
-;;   GDK_SETTING           = 33,
-;;   GDK_OWNER_CHANGE      = 34,
-;;   GDK_GRAB_BROKEN       = 35,
-;;   GDK_DAMAGE            = 36,
-;;   GDK_TOUCH_BEGIN       = 37,
-;;   GDK_TOUCH_UPDATE      = 38,
-;;   GDK_TOUCH_END         = 39,
-;;   GDK_TOUCH_CANCEL      = 40,
-;;   GDK_TOUCHPAD_SWIPE    = 41,
-;;   GDK_TOUCHPAD_PINCH    = 42,
-;;   GDK_PAD_BUTTON_PRESS  = 43,
-;;   GDK_PAD_BUTTON_RELEASE = 44,
-;;   GDK_PAD_RING          = 45,
-;;   GDK_PAD_STRIP         = 46,
-;;   GDK_PAD_GROUP_MODE    = 47,
-;;   GDK_EVENT_LAST        /* helper variable for decls */
-;; } GdkEventType;
-
 (define-enum-extended EventType
   (in-module "Gdk")
   (c-name "GdkEventType")
@@ -443,315 +274,241 @@
     '("delete" "GDK_DELETE" "0")
     '("destroy" "GDK_DESTROY" "1")
     '("expose" "GDK_EXPOSE" "2")
-    '("motion-notify" "GDK_MOTION_NOTIFY" "3")
-    '("button-press" "GDK_BUTTON_PRESS" "4")
-    '("2button-press" "GDK_2BUTTON_PRESS" "5")
-    '("double-button-press" "GDK_DOUBLE_BUTTON_PRESS" "5")
-    '("3button-press" "GDK_3BUTTON_PRESS" "6")
-    '("triple-button-press" "GDK_TRIPLE_BUTTON_PRESS" "6")
-    '("button-release" "GDK_BUTTON_RELEASE" "7")
-    '("key-press" "GDK_KEY_PRESS" "8")
-    '("key-release" "GDK_KEY_RELEASE" "9")
-    '("enter-notify" "GDK_ENTER_NOTIFY" "10")
-    '("leave-notify" "GDK_LEAVE_NOTIFY" "11")
-    '("focus-change" "GDK_FOCUS_CHANGE" "12")
+    '("motion_notify" "GDK_MOTION_NOTIFY" "3")
+    '("button_press" "GDK_BUTTON_PRESS" "4")
+    '("2button_press" "GDK_2BUTTON_PRESS" "5")
+    '("double_button_press" "GDK_DOUBLE_BUTTON_PRESS" "5")
+    '("3button_press" "GDK_3BUTTON_PRESS" "6")
+    '("triple_button_press" "GDK_TRIPLE_BUTTON_PRESS" "6")
+    '("button_release" "GDK_BUTTON_RELEASE" "7")
+    '("key_press" "GDK_KEY_PRESS" "8")
+    '("key_release" "GDK_KEY_RELEASE" "9")
+    '("enter_notify" "GDK_ENTER_NOTIFY" "10")
+    '("leave_notify" "GDK_LEAVE_NOTIFY" "11")
+    '("focus_change" "GDK_FOCUS_CHANGE" "12")
     '("configure" "GDK_CONFIGURE" "13")
     '("map" "GDK_MAP" "14")
     '("unmap" "GDK_UNMAP" "15")
-    '("property-notify" "GDK_PROPERTY_NOTIFY" "16")
-    '("selection-clear" "GDK_SELECTION_CLEAR" "17")
-    '("selection-request" "GDK_SELECTION_REQUEST" "18")
-    '("selection-notify" "GDK_SELECTION_NOTIFY" "19")
-    '("proximity-in" "GDK_PROXIMITY_IN" "20")
-    '("proximity-out" "GDK_PROXIMITY_OUT" "21")
-    '("drag-enter" "GDK_DRAG_ENTER" "22")
-    '("drag-leave" "GDK_DRAG_LEAVE" "23")
-    '("drag-motion" "GDK_DRAG_MOTION" "24")
-    '("drag-status" "GDK_DRAG_STATUS" "25")
-    '("drop-start" "GDK_DROP_START" "26")
-    '("drop-finished" "GDK_DROP_FINISHED" "27")
-    '("client-event" "GDK_CLIENT_EVENT" "28")
-    '("visibility-notify" "GDK_VISIBILITY_NOTIFY" "29")
+    '("property_notify" "GDK_PROPERTY_NOTIFY" "16")
+    '("selection_clear" "GDK_SELECTION_CLEAR" "17")
+    '("selection_request" "GDK_SELECTION_REQUEST" "18")
+    '("selection_notify" "GDK_SELECTION_NOTIFY" "19")
+    '("proximity_in" "GDK_PROXIMITY_IN" "20")
+    '("proximity_out" "GDK_PROXIMITY_OUT" "21")
+    '("drag_enter" "GDK_DRAG_ENTER" "22")
+    '("drag_leave" "GDK_DRAG_LEAVE" "23")
+    '("drag_motion" "GDK_DRAG_MOTION" "24")
+    '("drag_status" "GDK_DRAG_STATUS" "25")
+    '("drop_start" "GDK_DROP_START" "26")
+    '("drop_finished" "GDK_DROP_FINISHED" "27")
+    '("client_event" "GDK_CLIENT_EVENT" "28")
+    '("visibility_notify" "GDK_VISIBILITY_NOTIFY" "29")
     '("scroll" "GDK_SCROLL" "31")
-    '("window-state" "GDK_WINDOW_STATE" "32")
+    '("window_state" "GDK_WINDOW_STATE" "32")
     '("setting" "GDK_SETTING" "33")
-    '("owner-change" "GDK_OWNER_CHANGE" "34")
-    '("grab-broken" "GDK_GRAB_BROKEN" "35")
+    '("owner_change" "GDK_OWNER_CHANGE" "34")
+    '("grab_broken" "GDK_GRAB_BROKEN" "35")
     '("damage" "GDK_DAMAGE" "36")
-    '("touch-begin" "GDK_TOUCH_BEGIN" "37")
-    '("touch-update" "GDK_TOUCH_UPDATE" "38")
-    '("touch-end" "GDK_TOUCH_END" "39")
-    '("touch-cancel" "GDK_TOUCH_CANCEL" "40")
-    '("touchpad-swipe" "GDK_TOUCHPAD_SWIPE" "41")
-    '("touchpad-pinch" "GDK_TOUCHPAD_PINCH" "42")
-    '("pad-button-press" "GDK_PAD_BUTTON_PRESS" "43")
-    '("pad-button-release" "GDK_PAD_BUTTON_RELEASE" "44")
-    '("pad-ring" "GDK_PAD_RING" "45")
-    '("pad-strip" "GDK_PAD_STRIP" "46")
-    '("pad-group-mode" "GDK_PAD_GROUP_MODE" "47")
-    '("event-last" "GDK_EVENT_LAST" "48")
+    '("touch_begin" "GDK_TOUCH_BEGIN" "37")
+    '("touch_update" "GDK_TOUCH_UPDATE" "38")
+    '("touch_end" "GDK_TOUCH_END" "39")
+    '("touch_cancel" "GDK_TOUCH_CANCEL" "40")
+    '("touchpad_swipe" "GDK_TOUCHPAD_SWIPE" "41")
+    '("touchpad_pinch" "GDK_TOUCHPAD_PINCH" "42")
+    '("pad_button_press" "GDK_PAD_BUTTON_PRESS" "43")
+    '("pad_button_release" "GDK_PAD_BUTTON_RELEASE" "44")
+    '("pad_ring" "GDK_PAD_RING" "45")
+    '("pad_strip" "GDK_PAD_STRIP" "46")
+    '("pad_group_mode" "GDK_PAD_GROUP_MODE" "47")
+    '("event_last" "GDK_EVENT_LAST" "48")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GDK_VISIBILITY_UNOBSCURED,
-;;   GDK_VISIBILITY_PARTIAL,
-;;   GDK_VISIBILITY_FULLY_OBSCURED
-;; } GdkVisibilityState;
-
-(define-enum-extended VisibilityState
+(define-enum-extended FilterReturn
   (in-module "Gdk")
-  (c-name "GdkVisibilityState")
+  (c-name "GdkFilterReturn")
   (values
-    '("unobscured" "GDK_VISIBILITY_UNOBSCURED" "0")
-    '("partial" "GDK_VISIBILITY_PARTIAL" "1")
-    '("fully-obscured" "GDK_VISIBILITY_FULLY_OBSCURED" "2")
+    '("continue" "GDK_FILTER_CONTINUE" "0")
+    '("translate" "GDK_FILTER_TRANSLATE" "1")
+    '("remove" "GDK_FILTER_REMOVE" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GDK_TOUCHPAD_GESTURE_PHASE_BEGIN,
-;;   GDK_TOUCHPAD_GESTURE_PHASE_UPDATE,
-;;   GDK_TOUCHPAD_GESTURE_PHASE_END,
-;;   GDK_TOUCHPAD_GESTURE_PHASE_CANCEL
-;; } GdkTouchpadGesturePhase;
-
-(define-enum-extended TouchpadGesturePhase
+(define-flags-extended FrameClockPhase
   (in-module "Gdk")
-  (c-name "GdkTouchpadGesturePhase")
+  (c-name "GdkFrameClockPhase")
   (values
-    '("begin" "GDK_TOUCHPAD_GESTURE_PHASE_BEGIN" "0")
-    '("update" "GDK_TOUCHPAD_GESTURE_PHASE_UPDATE" "1")
-    '("end" "GDK_TOUCHPAD_GESTURE_PHASE_END" "2")
-    '("cancel" "GDK_TOUCHPAD_GESTURE_PHASE_CANCEL" "3")
+    '("none" "GDK_FRAME_CLOCK_PHASE_NONE" "0")
+    '("flush_events" "GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS" "1")
+    '("before_paint" "GDK_FRAME_CLOCK_PHASE_BEFORE_PAINT" "2")
+    '("update" "GDK_FRAME_CLOCK_PHASE_UPDATE" "4")
+    '("layout" "GDK_FRAME_CLOCK_PHASE_LAYOUT" "8")
+    '("paint" "GDK_FRAME_CLOCK_PHASE_PAINT" "16")
+    '("resume_events" "GDK_FRAME_CLOCK_PHASE_RESUME_EVENTS" "32")
+    '("after_paint" "GDK_FRAME_CLOCK_PHASE_AFTER_PAINT" "64")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GDK_SCROLL_UP,
-;;   GDK_SCROLL_DOWN,
-;;   GDK_SCROLL_LEFT,
-;;   GDK_SCROLL_RIGHT,
-;;   GDK_SCROLL_SMOOTH
-;; } GdkScrollDirection;
-
-(define-enum-extended ScrollDirection
+(define-enum-extended FullscreenMode
   (in-module "Gdk")
-  (c-name "GdkScrollDirection")
+  (c-name "GdkFullscreenMode")
   (values
-    '("up" "GDK_SCROLL_UP" "0")
-    '("down" "GDK_SCROLL_DOWN" "1")
-    '("left" "GDK_SCROLL_LEFT" "2")
-    '("right" "GDK_SCROLL_RIGHT" "3")
-    '("smooth" "GDK_SCROLL_SMOOTH" "4")
+    '("current_monitor" "GDK_FULLSCREEN_ON_CURRENT_MONITOR" "0")
+    '("all_monitors" "GDK_FULLSCREEN_ON_ALL_MONITORS" "1")
   )
 )
 
-;; 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
+(define-enum-extended GLError
   (in-module "Gdk")
-  (c-name "GdkNotifyType")
+  (c-name "GdkGLError")
   (values
-    '("ancestor" "GDK_NOTIFY_ANCESTOR" "0")
-    '("virtual" "GDK_NOTIFY_VIRTUAL" "1")
-    '("inferior" "GDK_NOTIFY_INFERIOR" "2")
-    '("nonlinear" "GDK_NOTIFY_NONLINEAR" "3")
-    '("nonlinear-virtual" "GDK_NOTIFY_NONLINEAR_VIRTUAL" "4")
-    '("unknown" "GDK_NOTIFY_UNKNOWN" "5")
+    '("not_available" "GDK_GL_ERROR_NOT_AVAILABLE" "0")
+    '("unsupported_format" "GDK_GL_ERROR_UNSUPPORTED_FORMAT" "1")
+    '("unsupported_profile" "GDK_GL_ERROR_UNSUPPORTED_PROFILE" "2")
   )
 )
 
-;; 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,
-;;   GDK_CROSSING_TOUCH_BEGIN,
-;;   GDK_CROSSING_TOUCH_END,
-;;   GDK_CROSSING_DEVICE_SWITCH
-;; } GdkCrossingMode;
-
-(define-enum-extended CrossingMode
+(define-enum-extended GrabOwnership
   (in-module "Gdk")
-  (c-name "GdkCrossingMode")
+  (c-name "GdkGrabOwnership")
   (values
-    '("normal" "GDK_CROSSING_NORMAL" "0")
-    '("grab" "GDK_CROSSING_GRAB" "1")
-    '("ungrab" "GDK_CROSSING_UNGRAB" "2")
-    '("gtk-grab" "GDK_CROSSING_GTK_GRAB" "3")
-    '("gtk-ungrab" "GDK_CROSSING_GTK_UNGRAB" "4")
-    '("state-changed" "GDK_CROSSING_STATE_CHANGED" "5")
-    '("touch-begin" "GDK_CROSSING_TOUCH_BEGIN" "6")
-    '("touch-end" "GDK_CROSSING_TOUCH_END" "7")
-    '("device-switch" "GDK_CROSSING_DEVICE_SWITCH" "8")
+    '("none" "GDK_OWNERSHIP_NONE" "0")
+    '("window" "GDK_OWNERSHIP_WINDOW" "1")
+    '("application" "GDK_OWNERSHIP_APPLICATION" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GDK_PROPERTY_NEW_VALUE,
-;;   GDK_PROPERTY_DELETE
-;; } GdkPropertyState;
-
-(define-enum-extended PropertyState
+(define-enum-extended GrabStatus
   (in-module "Gdk")
-  (c-name "GdkPropertyState")
+  (c-name "GdkGrabStatus")
   (values
-    '("new-value" "GDK_PROPERTY_NEW_VALUE" "0")
-    '("delete" "GDK_PROPERTY_DELETE" "1")
+    '("success" "GDK_GRAB_SUCCESS" "0")
+    '("already_grabbed" "GDK_GRAB_ALREADY_GRABBED" "1")
+    '("invalid_time" "GDK_GRAB_INVALID_TIME" "2")
+    '("not_viewable" "GDK_GRAB_NOT_VIEWABLE" "3")
+    '("frozen" "GDK_GRAB_FROZEN" "4")
+    '("failed" "GDK_GRAB_FAILED" "5")
   )
 )
 
-;; 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,
-;;   GDK_WINDOW_STATE_FOCUSED    = 1 << 7,
-;;   GDK_WINDOW_STATE_TILED      = 1 << 8
-;; } GdkWindowState;
-
-(define-flags-extended WindowState
+(define-enum-extended Gravity
   (in-module "Gdk")
-  (c-name "GdkWindowState")
+  (c-name "GdkGravity")
   (values
-    '("withdrawn" "GDK_WINDOW_STATE_WITHDRAWN" "1 << 0")
-    '("iconified" "GDK_WINDOW_STATE_ICONIFIED" "1 << 1")
-    '("maximized" "GDK_WINDOW_STATE_MAXIMIZED" "1 << 2")
-    '("sticky" "GDK_WINDOW_STATE_STICKY" "1 << 3")
-    '("fullscreen" "GDK_WINDOW_STATE_FULLSCREEN" "1 << 4")
-    '("above" "GDK_WINDOW_STATE_ABOVE" "1 << 5")
-    '("below" "GDK_WINDOW_STATE_BELOW" "1 << 6")
-    '("focused" "GDK_WINDOW_STATE_FOCUSED" "1 << 7")
-    '("tiled" "GDK_WINDOW_STATE_TILED" "1 << 8")
+    '("north_west" "GDK_GRAVITY_NORTH_WEST" "1")
+    '("north" "GDK_GRAVITY_NORTH" "2")
+    '("north_east" "GDK_GRAVITY_NORTH_EAST" "3")
+    '("west" "GDK_GRAVITY_WEST" "4")
+    '("center" "GDK_GRAVITY_CENTER" "5")
+    '("east" "GDK_GRAVITY_EAST" "6")
+    '("south_west" "GDK_GRAVITY_SOUTH_WEST" "7")
+    '("south" "GDK_GRAVITY_SOUTH" "8")
+    '("south_east" "GDK_GRAVITY_SOUTH_EAST" "9")
+    '("static" "GDK_GRAVITY_STATIC" "10")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GDK_SETTING_ACTION_NEW,
-;;   GDK_SETTING_ACTION_CHANGED,
-;;   GDK_SETTING_ACTION_DELETED
-;; } GdkSettingAction;
-
-(define-enum-extended SettingAction
+(define-enum-extended InputMode
   (in-module "Gdk")
-  (c-name "GdkSettingAction")
+  (c-name "GdkInputMode")
   (values
-    '("new" "GDK_SETTING_ACTION_NEW" "0")
-    '("changed" "GDK_SETTING_ACTION_CHANGED" "1")
-    '("deleted" "GDK_SETTING_ACTION_DELETED" "2")
+    '("disabled" "GDK_MODE_DISABLED" "0")
+    '("screen" "GDK_MODE_SCREEN" "1")
+    '("window" "GDK_MODE_WINDOW" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GDK_OWNER_CHANGE_NEW_OWNER,
-;;   GDK_OWNER_CHANGE_DESTROY,
-;;   GDK_OWNER_CHANGE_CLOSE
-;; } GdkOwnerChange;
-
-(define-enum-extended OwnerChange
+(define-enum-extended InputSource
   (in-module "Gdk")
-  (c-name "GdkOwnerChange")
+  (c-name "GdkInputSource")
   (values
-    '("new-owner" "GDK_OWNER_CHANGE_NEW_OWNER" "0")
-    '("destroy" "GDK_OWNER_CHANGE_DESTROY" "1")
-    '("close" "GDK_OWNER_CHANGE_CLOSE" "2")
+    '("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")
+    '("touchscreen" "GDK_SOURCE_TOUCHSCREEN" "5")
+    '("touchpad" "GDK_SOURCE_TOUCHPAD" "6")
+    '("trackpoint" "GDK_SOURCE_TRACKPOINT" "7")
+    '("tablet_pad" "GDK_SOURCE_TABLET_PAD" "8")
   )
 )
 
-;; From gdkframeclock.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GDK_FRAME_CLOCK_PHASE_NONE          = 0,
-;;   GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS  = 1 << 0,
-;;   GDK_FRAME_CLOCK_PHASE_BEFORE_PAINT  = 1 << 1,
-;;   GDK_FRAME_CLOCK_PHASE_UPDATE        = 1 << 2,
-;;   GDK_FRAME_CLOCK_PHASE_LAYOUT        = 1 << 3,
-;;   GDK_FRAME_CLOCK_PHASE_PAINT         = 1 << 4,
-;;   GDK_FRAME_CLOCK_PHASE_RESUME_EVENTS = 1 << 5,
-;;   GDK_FRAME_CLOCK_PHASE_AFTER_PAINT   = 1 << 6
-;; } GdkFrameClockPhase;
-
-(define-flags-extended FrameClockPhase
+(define-enum-extended ModifierIntent
   (in-module "Gdk")
-  (c-name "GdkFrameClockPhase")
+  (c-name "GdkModifierIntent")
   (values
-    '("none" "GDK_FRAME_CLOCK_PHASE_NONE" "0x0")
-    '("flush-events" "GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS" "1 << 0")
-    '("before-paint" "GDK_FRAME_CLOCK_PHASE_BEFORE_PAINT" "1 << 1")
-    '("update" "GDK_FRAME_CLOCK_PHASE_UPDATE" "1 << 2")
-    '("layout" "GDK_FRAME_CLOCK_PHASE_LAYOUT" "1 << 3")
-    '("paint" "GDK_FRAME_CLOCK_PHASE_PAINT" "1 << 4")
-    '("resume-events" "GDK_FRAME_CLOCK_PHASE_RESUME_EVENTS" "1 << 5")
-    '("after-paint" "GDK_FRAME_CLOCK_PHASE_AFTER_PAINT" "1 << 6")
+    '("primary_accelerator" "GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR" "0")
+    '("context_menu" "GDK_MODIFIER_INTENT_CONTEXT_MENU" "1")
+    '("extend_selection" "GDK_MODIFIER_INTENT_EXTEND_SELECTION" "2")
+    '("modify_selection" "GDK_MODIFIER_INTENT_MODIFY_SELECTION" "3")
+    '("no_text_input" "GDK_MODIFIER_INTENT_NO_TEXT_INPUT" "4")
+    '("shift_group" "GDK_MODIFIER_INTENT_SHIFT_GROUP" "5")
+    '("default_mod_mask" "GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK" "6")
   )
 )
 
-;; From gdkmonitor.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GDK_SUBPIXEL_LAYOUT_UNKNOWN,
-;;   GDK_SUBPIXEL_LAYOUT_NONE,
-;;   GDK_SUBPIXEL_LAYOUT_HORIZONTAL_RGB,
-;;   GDK_SUBPIXEL_LAYOUT_HORIZONTAL_BGR,
-;;   GDK_SUBPIXEL_LAYOUT_VERTICAL_RGB,
-;;   GDK_SUBPIXEL_LAYOUT_VERTICAL_BGR
-;; } GdkSubpixelLayout;
-
-(define-enum-extended SubpixelLayout
+(define-flags-extended ModifierType
   (in-module "Gdk")
-  (c-name "GdkSubpixelLayout")
+  (c-name "GdkModifierType")
   (values
-    '("unknown" "GDK_SUBPIXEL_LAYOUT_UNKNOWN" "0")
-    '("none" "GDK_SUBPIXEL_LAYOUT_NONE" "1")
-    '("horizontal-rgb" "GDK_SUBPIXEL_LAYOUT_HORIZONTAL_RGB" "2")
-    '("horizontal-bgr" "GDK_SUBPIXEL_LAYOUT_HORIZONTAL_BGR" "3")
-    '("vertical-rgb" "GDK_SUBPIXEL_LAYOUT_VERTICAL_RGB" "4")
-    '("vertical-bgr" "GDK_SUBPIXEL_LAYOUT_VERTICAL_BGR" "5")
+    '("shift_mask" "GDK_SHIFT_MASK" "1")
+    '("lock_mask" "GDK_LOCK_MASK" "2")
+    '("control_mask" "GDK_CONTROL_MASK" "4")
+    '("mod1_mask" "GDK_MOD1_MASK" "8")
+    '("mod2_mask" "GDK_MOD2_MASK" "16")
+    '("mod3_mask" "GDK_MOD3_MASK" "32")
+    '("mod4_mask" "GDK_MOD4_MASK" "64")
+    '("mod5_mask" "GDK_MOD5_MASK" "128")
+    '("button1_mask" "GDK_BUTTON1_MASK" "256")
+    '("button2_mask" "GDK_BUTTON2_MASK" "512")
+    '("button3_mask" "GDK_BUTTON3_MASK" "1024")
+    '("button4_mask" "GDK_BUTTON4_MASK" "2048")
+    '("button5_mask" "GDK_BUTTON5_MASK" "4096")
+    '("modifier_reserved_13_mask" "GDK_MODIFIER_RESERVED_13_MASK" "8192")
+    '("modifier_reserved_14_mask" "GDK_MODIFIER_RESERVED_14_MASK" "16384")
+    '("modifier_reserved_15_mask" "GDK_MODIFIER_RESERVED_15_MASK" "32768")
+    '("modifier_reserved_16_mask" "GDK_MODIFIER_RESERVED_16_MASK" "65536")
+    '("modifier_reserved_17_mask" "GDK_MODIFIER_RESERVED_17_MASK" "131072")
+    '("modifier_reserved_18_mask" "GDK_MODIFIER_RESERVED_18_MASK" "262144")
+    '("modifier_reserved_19_mask" "GDK_MODIFIER_RESERVED_19_MASK" "524288")
+    '("modifier_reserved_20_mask" "GDK_MODIFIER_RESERVED_20_MASK" "1048576")
+    '("modifier_reserved_21_mask" "GDK_MODIFIER_RESERVED_21_MASK" "2097152")
+    '("modifier_reserved_22_mask" "GDK_MODIFIER_RESERVED_22_MASK" "4194304")
+    '("modifier_reserved_23_mask" "GDK_MODIFIER_RESERVED_23_MASK" "8388608")
+    '("modifier_reserved_24_mask" "GDK_MODIFIER_RESERVED_24_MASK" "16777216")
+    '("modifier_reserved_25_mask" "GDK_MODIFIER_RESERVED_25_MASK" "33554432")
+    '("super_mask" "GDK_SUPER_MASK" "67108864")
+    '("hyper_mask" "GDK_HYPER_MASK" "134217728")
+    '("meta_mask" "GDK_META_MASK" "268435456")
+    '("modifier_reserved_29_mask" "GDK_MODIFIER_RESERVED_29_MASK" "536870912")
+    '("release_mask" "GDK_RELEASE_MASK" "1073741824")
+    '("modifier_mask" "GDK_MODIFIER_MASK" "1543512063")
   )
 )
 
-;; From gdkproperty.h
+(define-enum-extended NotifyType
+  (in-module "Gdk")
+  (c-name "GdkNotifyType")
+  (values
+    '("ancestor" "GDK_NOTIFY_ANCESTOR" "0")
+    '("virtual" "GDK_NOTIFY_VIRTUAL" "1")
+    '("inferior" "GDK_NOTIFY_INFERIOR" "2")
+    '("nonlinear" "GDK_NOTIFY_NONLINEAR" "3")
+    '("nonlinear_virtual" "GDK_NOTIFY_NONLINEAR_VIRTUAL" "4")
+    '("unknown" "GDK_NOTIFY_UNKNOWN" "5")
+  )
+)
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GDK_PROP_MODE_REPLACE,
-;;   GDK_PROP_MODE_PREPEND,
-;;   GDK_PROP_MODE_APPEND
-;; } GdkPropMode;
+(define-enum-extended OwnerChange
+  (in-module "Gdk")
+  (c-name "GdkOwnerChange")
+  (values
+    '("new_owner" "GDK_OWNER_CHANGE_NEW_OWNER" "0")
+    '("destroy" "GDK_OWNER_CHANGE_DESTROY" "1")
+    '("close" "GDK_OWNER_CHANGE_CLOSE" "2")
+  )
+)
 
 (define-enum-extended PropMode
   (in-module "Gdk")
@@ -763,694 +520,240 @@
   )
 )
 
-;; From gdkseat.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GDK_SEAT_CAPABILITY_NONE          = 0,
-;;   GDK_SEAT_CAPABILITY_POINTER       = 1 << 0,
-;;   GDK_SEAT_CAPABILITY_TOUCH         = 1 << 1,
-;;   GDK_SEAT_CAPABILITY_TABLET_STYLUS = 1 << 2,
-;;   GDK_SEAT_CAPABILITY_KEYBOARD      = 1 << 3,
-;;   GDK_SEAT_CAPABILITY_ALL_POINTING  = (GDK_SEAT_CAPABILITY_POINTER | GDK_SEAT_CAPABILITY_TOUCH | 
GDK_SEAT_CAPABILITY_TABLET_STYLUS),
-;;   GDK_SEAT_CAPABILITY_ALL           = (GDK_SEAT_CAPABILITY_ALL_POINTING | GDK_SEAT_CAPABILITY_KEYBOARD)
-;; } GdkSeatCapabilities;
-
-(define-flags-extended SeatCapabilities
+(define-enum-extended PropertyState
   (in-module "Gdk")
-  (c-name "GdkSeatCapabilities")
+  (c-name "GdkPropertyState")
   (values
-    '("none" "GDK_SEAT_CAPABILITY_NONE" "0x0")
-    '("pointer" "GDK_SEAT_CAPABILITY_POINTER" "1 << 0")
-    '("touch" "GDK_SEAT_CAPABILITY_TOUCH" "1 << 1")
-    '("tablet-stylus" "GDK_SEAT_CAPABILITY_TABLET_STYLUS" "1 << 2")
-    '("keyboard" "GDK_SEAT_CAPABILITY_KEYBOARD" "1 << 3")
-    '("all-pointing" "GDK_SEAT_CAPABILITY_ALL_POINTING" "0x7")
-    '("all" "GDK_SEAT_CAPABILITY_ALL" "0xF")
+    '("new_value" "GDK_PROPERTY_NEW_VALUE" "0")
+    '("delete" "GDK_PROPERTY_DELETE" "1")
   )
 )
 
-;; From gdktypes.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GDK_LSB_FIRST,
-;;   GDK_MSB_FIRST
-;; } GdkByteOrder;
-
-(define-enum-extended ByteOrder
+(define-enum-extended ScrollDirection
   (in-module "Gdk")
-  (c-name "GdkByteOrder")
+  (c-name "GdkScrollDirection")
   (values
-    '("lsb-first" "GDK_LSB_FIRST" "0")
-    '("msb-first" "GDK_MSB_FIRST" "1")
+    '("up" "GDK_SCROLL_UP" "0")
+    '("down" "GDK_SCROLL_DOWN" "1")
+    '("left" "GDK_SCROLL_LEFT" "2")
+    '("right" "GDK_SCROLL_RIGHT" "3")
+    '("smooth" "GDK_SCROLL_SMOOTH" "4")
   )
 )
 
-;; 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,
-;; 
-;;   GDK_MODIFIER_RESERVED_13_MASK  = 1 << 13,
-;;   GDK_MODIFIER_RESERVED_14_MASK  = 1 << 14,
-;;   GDK_MODIFIER_RESERVED_15_MASK  = 1 << 15,
-;;   GDK_MODIFIER_RESERVED_16_MASK  = 1 << 16,
-;;   GDK_MODIFIER_RESERVED_17_MASK  = 1 << 17,
-;;   GDK_MODIFIER_RESERVED_18_MASK  = 1 << 18,
-;;   GDK_MODIFIER_RESERVED_19_MASK  = 1 << 19,
-;;   GDK_MODIFIER_RESERVED_20_MASK  = 1 << 20,
-;;   GDK_MODIFIER_RESERVED_21_MASK  = 1 << 21,
-;;   GDK_MODIFIER_RESERVED_22_MASK  = 1 << 22,
-;;   GDK_MODIFIER_RESERVED_23_MASK  = 1 << 23,
-;;   GDK_MODIFIER_RESERVED_24_MASK  = 1 << 24,
-;;   GDK_MODIFIER_RESERVED_25_MASK  = 1 << 25,
-;; 
-;;   /* 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_MODIFIER_RESERVED_29_MASK  = 1 << 29,
-;; 
-;;   GDK_RELEASE_MASK  = 1 << 30,
-;; 
-;;   /* Combination of GDK_SHIFT_MASK..GDK_BUTTON5_MASK + GDK_SUPER_MASK
-;;      + GDK_HYPER_MASK + GDK_META_MASK + GDK_RELEASE_MASK */
-;;   GDK_MODIFIER_MASK = 0x5c001fff
-;; } GdkModifierType;
-
-(define-flags-extended ModifierType
+(define-flags-extended SeatCapabilities
   (in-module "Gdk")
-  (c-name "GdkModifierType")
+  (c-name "GdkSeatCapabilities")
   (values
-    '("shift-mask" "GDK_SHIFT_MASK" "1 << 0")
-    '("lock-mask" "GDK_LOCK_MASK" "1 << 1")
-    '("control-mask" "GDK_CONTROL_MASK" "1 << 2")
-    '("mod1-mask" "GDK_MOD1_MASK" "1 << 3")
-    '("mod2-mask" "GDK_MOD2_MASK" "1 << 4")
-    '("mod3-mask" "GDK_MOD3_MASK" "1 << 5")
-    '("mod4-mask" "GDK_MOD4_MASK" "1 << 6")
-    '("mod5-mask" "GDK_MOD5_MASK" "1 << 7")
-    '("button1-mask" "GDK_BUTTON1_MASK" "1 << 8")
-    '("button2-mask" "GDK_BUTTON2_MASK" "1 << 9")
-    '("button3-mask" "GDK_BUTTON3_MASK" "1 << 10")
-    '("button4-mask" "GDK_BUTTON4_MASK" "1 << 11")
-    '("button5-mask" "GDK_BUTTON5_MASK" "1 << 12")
-    '("modifier-reserved-13-mask" "GDK_MODIFIER_RESERVED_13_MASK" "1 << 13")
-    '("modifier-reserved-14-mask" "GDK_MODIFIER_RESERVED_14_MASK" "1 << 14")
-    '("modifier-reserved-15-mask" "GDK_MODIFIER_RESERVED_15_MASK" "1 << 15")
-    '("modifier-reserved-16-mask" "GDK_MODIFIER_RESERVED_16_MASK" "1 << 16")
-    '("modifier-reserved-17-mask" "GDK_MODIFIER_RESERVED_17_MASK" "1 << 17")
-    '("modifier-reserved-18-mask" "GDK_MODIFIER_RESERVED_18_MASK" "1 << 18")
-    '("modifier-reserved-19-mask" "GDK_MODIFIER_RESERVED_19_MASK" "1 << 19")
-    '("modifier-reserved-20-mask" "GDK_MODIFIER_RESERVED_20_MASK" "1 << 20")
-    '("modifier-reserved-21-mask" "GDK_MODIFIER_RESERVED_21_MASK" "1 << 21")
-    '("modifier-reserved-22-mask" "GDK_MODIFIER_RESERVED_22_MASK" "1 << 22")
-    '("modifier-reserved-23-mask" "GDK_MODIFIER_RESERVED_23_MASK" "1 << 23")
-    '("modifier-reserved-24-mask" "GDK_MODIFIER_RESERVED_24_MASK" "1 << 24")
-    '("modifier-reserved-25-mask" "GDK_MODIFIER_RESERVED_25_MASK" "1 << 25")
-    '("super-mask" "GDK_SUPER_MASK" "1 << 26")
-    '("hyper-mask" "GDK_HYPER_MASK" "1 << 27")
-    '("meta-mask" "GDK_META_MASK" "1 << 28")
-    '("modifier-reserved-29-mask" "GDK_MODIFIER_RESERVED_29_MASK" "1 << 29")
-    '("release-mask" "GDK_RELEASE_MASK" "1 << 30")
-    '("modifier-mask" "GDK_MODIFIER_MASK" "0x5c001fff")
+    '("none" "GDK_SEAT_CAPABILITY_NONE" "0")
+    '("pointer" "GDK_SEAT_CAPABILITY_POINTER" "1")
+    '("touch" "GDK_SEAT_CAPABILITY_TOUCH" "2")
+    '("tablet_stylus" "GDK_SEAT_CAPABILITY_TABLET_STYLUS" "4")
+    '("keyboard" "GDK_SEAT_CAPABILITY_KEYBOARD" "8")
+    '("all_pointing" "GDK_SEAT_CAPABILITY_ALL_POINTING" "7")
+    '("all" "GDK_SEAT_CAPABILITY_ALL" "15")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR,
-;;   GDK_MODIFIER_INTENT_CONTEXT_MENU,
-;;   GDK_MODIFIER_INTENT_EXTEND_SELECTION,
-;;   GDK_MODIFIER_INTENT_MODIFY_SELECTION,
-;;   GDK_MODIFIER_INTENT_NO_TEXT_INPUT,
-;;   GDK_MODIFIER_INTENT_SHIFT_GROUP,
-;;   GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK,
-;; } GdkModifierIntent;
-
-(define-enum-extended ModifierIntent
+(define-enum-extended SettingAction
   (in-module "Gdk")
-  (c-name "GdkModifierIntent")
+  (c-name "GdkSettingAction")
   (values
-    '("primary-accelerator" "GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR" "0")
-    '("context-menu" "GDK_MODIFIER_INTENT_CONTEXT_MENU" "1")
-    '("extend-selection" "GDK_MODIFIER_INTENT_EXTEND_SELECTION" "2")
-    '("modify-selection" "GDK_MODIFIER_INTENT_MODIFY_SELECTION" "3")
-    '("no-text-input" "GDK_MODIFIER_INTENT_NO_TEXT_INPUT" "4")
-    '("shift-group" "GDK_MODIFIER_INTENT_SHIFT_GROUP" "5")
-    '("default-mod-mask" "GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK" "6")
+    '("new" "GDK_SETTING_ACTION_NEW" "0")
+    '("changed" "GDK_SETTING_ACTION_CHANGED" "1")
+    '("deleted" "GDK_SETTING_ACTION_DELETED" "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")
   (c-name "GdkStatus")
   (values
     '("ok" "GDK_OK" "0")
     '("error" "GDK_ERROR" "-1")
-    '("error-param" "GDK_ERROR_PARAM" "-2")
-    '("error-file" "GDK_ERROR_FILE" "-3")
-    '("error-mem" "GDK_ERROR_MEM" "-4")
-  )
-)
-
-;; 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,
-;;   GDK_GRAB_FAILED          = 5
-;; } GdkGrabStatus;
-
-(define-enum-extended GrabStatus
-  (in-module "Gdk")
-  (c-name "GdkGrabStatus")
-  (values
-    '("success" "GDK_GRAB_SUCCESS" "0")
-    '("already-grabbed" "GDK_GRAB_ALREADY_GRABBED" "1")
-    '("invalid-time" "GDK_GRAB_INVALID_TIME" "2")
-    '("not-viewable" "GDK_GRAB_NOT_VIEWABLE" "3")
-    '("frozen" "GDK_GRAB_FROZEN" "4")
-    '("failed" "GDK_GRAB_FAILED" "5")
-  )
-)
-
-;; 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_TOUCH_MASK                = 1 << 22,
-;;   GDK_SMOOTH_SCROLL_MASK        = 1 << 23,
-;;   GDK_TOUCHPAD_GESTURE_MASK     = 1 << 24,
-;;   GDK_TABLET_PAD_MASK           = 1 << 25,
-;;   GDK_ALL_EVENTS_MASK           = 0xFFFFFE
-;; } 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")
-    '("touch-mask" "GDK_TOUCH_MASK" "1 << 22")
-    '("smooth-scroll-mask" "GDK_SMOOTH_SCROLL_MASK" "1 << 23")
-    '("touchpad-gesture-mask" "GDK_TOUCHPAD_GESTURE_MASK" "1 << 24")
-    '("tablet-pad-mask" "GDK_TABLET_PAD_MASK" "1 << 25")
-    '("all-events-mask" "GDK_ALL_EVENTS_MASK" "0xFFFFFE")
-  )
-)
-
-;; Original typedef:
-;; typedef enum {
-;;   GDK_GL_ERROR_NOT_AVAILABLE,
-;;   GDK_GL_ERROR_UNSUPPORTED_FORMAT,
-;;   GDK_GL_ERROR_UNSUPPORTED_PROFILE
-;; } GdkGLError;
-
-(define-enum-extended GLError
-  (in-module "Gdk")
-  (c-name "GdkGLError")
-  (values
-    '("not-available" "GDK_GL_ERROR_NOT_AVAILABLE" "0")
-    '("unsupported-format" "GDK_GL_ERROR_UNSUPPORTED_FORMAT" "1")
-    '("unsupported-profile" "GDK_GL_ERROR_UNSUPPORTED_PROFILE" "2")
+    '("error_param" "GDK_ERROR_PARAM" "-2")
+    '("error_file" "GDK_ERROR_FILE" "-3")
+    '("error_mem" "GDK_ERROR_MEM" "-4")
   )
 )
 
-;; 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
+(define-enum-extended SubpixelLayout
   (in-module "Gdk")
-  (c-name "GdkWindowTypeHint")
+  (c-name "GdkSubpixelLayout")
   (values
-    '("normal" "GDK_WINDOW_TYPE_HINT_NORMAL" "0")
-    '("dialog" "GDK_WINDOW_TYPE_HINT_DIALOG" "1")
-    '("menu" "GDK_WINDOW_TYPE_HINT_MENU" "2")
-    '("toolbar" "GDK_WINDOW_TYPE_HINT_TOOLBAR" "3")
-    '("splashscreen" "GDK_WINDOW_TYPE_HINT_SPLASHSCREEN" "4")
-    '("utility" "GDK_WINDOW_TYPE_HINT_UTILITY" "5")
-    '("dock" "GDK_WINDOW_TYPE_HINT_DOCK" "6")
-    '("desktop" "GDK_WINDOW_TYPE_HINT_DESKTOP" "7")
-    '("dropdown-menu" "GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU" "8")
-    '("popup-menu" "GDK_WINDOW_TYPE_HINT_POPUP_MENU" "9")
-    '("tooltip" "GDK_WINDOW_TYPE_HINT_TOOLTIP" "10")
-    '("notification" "GDK_WINDOW_TYPE_HINT_NOTIFICATION" "11")
-    '("combo" "GDK_WINDOW_TYPE_HINT_COMBO" "12")
-    '("dnd" "GDK_WINDOW_TYPE_HINT_DND" "13")
+    '("unknown" "GDK_SUBPIXEL_LAYOUT_UNKNOWN" "0")
+    '("none" "GDK_SUBPIXEL_LAYOUT_NONE" "1")
+    '("horizontal_rgb" "GDK_SUBPIXEL_LAYOUT_HORIZONTAL_RGB" "2")
+    '("horizontal_bgr" "GDK_SUBPIXEL_LAYOUT_HORIZONTAL_BGR" "3")
+    '("vertical_rgb" "GDK_SUBPIXEL_LAYOUT_VERTICAL_RGB" "4")
+    '("vertical_bgr" "GDK_SUBPIXEL_LAYOUT_VERTICAL_BGR" "5")
   )
 )
 
-;; 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_DISTANCE,
-;;   GDK_AXIS_ROTATION,
-;;   GDK_AXIS_SLIDER,
-;;   GDK_AXIS_LAST
-;; } GdkAxisUse;
-
-(define-enum-extended AxisUse
+(define-enum-extended TouchpadGesturePhase
   (in-module "Gdk")
-  (c-name "GdkAxisUse")
+  (c-name "GdkTouchpadGesturePhase")
   (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")
-    '("distance" "GDK_AXIS_DISTANCE" "7")
-    '("rotation" "GDK_AXIS_ROTATION" "8")
-    '("slider" "GDK_AXIS_SLIDER" "9")
-    '("last" "GDK_AXIS_LAST" "10")
+    '("begin" "GDK_TOUCHPAD_GESTURE_PHASE_BEGIN" "0")
+    '("update" "GDK_TOUCHPAD_GESTURE_PHASE_UPDATE" "1")
+    '("end" "GDK_TOUCHPAD_GESTURE_PHASE_END" "2")
+    '("cancel" "GDK_TOUCHPAD_GESTURE_PHASE_CANCEL" "3")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GDK_AXIS_FLAG_X        = 1 << GDK_AXIS_X,
-;;   GDK_AXIS_FLAG_Y        = 1 << GDK_AXIS_Y,
-;;   GDK_AXIS_FLAG_PRESSURE = 1 << GDK_AXIS_PRESSURE,
-;;   GDK_AXIS_FLAG_XTILT    = 1 << GDK_AXIS_XTILT,
-;;   GDK_AXIS_FLAG_YTILT    = 1 << GDK_AXIS_YTILT,
-;;   GDK_AXIS_FLAG_WHEEL    = 1 << GDK_AXIS_WHEEL,
-;;   GDK_AXIS_FLAG_DISTANCE = 1 << GDK_AXIS_DISTANCE,
-;;   GDK_AXIS_FLAG_ROTATION = 1 << GDK_AXIS_ROTATION,
-;;   GDK_AXIS_FLAG_SLIDER   = 1 << GDK_AXIS_SLIDER,
-;; } GdkAxisFlags;
-
-(define-flags-extended AxisFlags
+(define-enum-extended VisibilityState
   (in-module "Gdk")
-  (c-name "GdkAxisFlags")
+  (c-name "GdkVisibilityState")
   (values
-    '("x" "GDK_AXIS_FLAG_X" "1 << GDK_AXIS_X")
-    '("y" "GDK_AXIS_FLAG_Y" "1 << GDK_AXIS_Y")
-    '("pressure" "GDK_AXIS_FLAG_PRESSURE" "1 << GDK_AXIS_PRESSURE")
-    '("xtilt" "GDK_AXIS_FLAG_XTILT" "1 << GDK_AXIS_XTILT")
-    '("ytilt" "GDK_AXIS_FLAG_YTILT" "1 << GDK_AXIS_YTILT")
-    '("wheel" "GDK_AXIS_FLAG_WHEEL" "1 << GDK_AXIS_WHEEL")
-    '("distance" "GDK_AXIS_FLAG_DISTANCE" "1 << GDK_AXIS_DISTANCE")
-    '("rotation" "GDK_AXIS_FLAG_ROTATION" "1 << GDK_AXIS_ROTATION")
-    '("slider" "GDK_AXIS_FLAG_SLIDER" "1 << GDK_AXIS_SLIDER")
+    '("unobscured" "GDK_VISIBILITY_UNOBSCURED" "0")
+    '("partial" "GDK_VISIBILITY_PARTIAL" "1")
+    '("fully_obscured" "GDK_VISIBILITY_FULLY_OBSCURED" "2")
   )
 )
 
-;; 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")
   (values
-    '("static-gray" "GDK_VISUAL_STATIC_GRAY" "0")
+    '("static_gray" "GDK_VISUAL_STATIC_GRAY" "0")
     '("grayscale" "GDK_VISUAL_GRAYSCALE" "1")
-    '("static-color" "GDK_VISUAL_STATIC_COLOR" "2")
-    '("pseudo-color" "GDK_VISUAL_PSEUDO_COLOR" "3")
-    '("true-color" "GDK_VISUAL_TRUE_COLOR" "4")
-    '("direct-color" "GDK_VISUAL_DIRECT_COLOR" "5")
+    '("static_color" "GDK_VISUAL_STATIC_COLOR" "2")
+    '("pseudo_color" "GDK_VISUAL_PSEUDO_COLOR" "3")
+    '("true_color" "GDK_VISUAL_TRUE_COLOR" "4")
+    '("direct_color" "GDK_VISUAL_DIRECT_COLOR" "5")
   )
 )
 
-;; From gdkwindow.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GDK_INPUT_OUTPUT, /*< nick=input-output >*/
-;;   GDK_INPUT_ONLY    /*< nick=input-only >*/
-;; } GdkWindowWindowClass;
-
-(define-enum-extended WindowWindowClass
+(define-flags-extended WMDecoration
   (in-module "Gdk")
-  (c-name "GdkWindowWindowClass")
+  (c-name "GdkWMDecoration")
   (values
-    '("output" "GDK_INPUT_OUTPUT" "0")
-    '("only" "GDK_INPUT_ONLY" "1")
+    '("all" "GDK_DECOR_ALL" "1")
+    '("border" "GDK_DECOR_BORDER" "2")
+    '("resizeh" "GDK_DECOR_RESIZEH" "4")
+    '("title" "GDK_DECOR_TITLE" "8")
+    '("menu" "GDK_DECOR_MENU" "16")
+    '("minimize" "GDK_DECOR_MINIMIZE" "32")
+    '("maximize" "GDK_DECOR_MAXIMIZE" "64")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GDK_WINDOW_ROOT,
-;;   GDK_WINDOW_TOPLEVEL,
-;;   GDK_WINDOW_CHILD,
-;;   GDK_WINDOW_TEMP,
-;;   GDK_WINDOW_FOREIGN,
-;;   GDK_WINDOW_OFFSCREEN,
-;;   GDK_WINDOW_SUBSURFACE
-;; } GdkWindowType;
-
-(define-enum-extended WindowType
+(define-flags-extended WMFunction
   (in-module "Gdk")
-  (c-name "GdkWindowType")
+  (c-name "GdkWMFunction")
   (values
-    '("root" "GDK_WINDOW_ROOT" "0")
-    '("toplevel" "GDK_WINDOW_TOPLEVEL" "1")
-    '("child" "GDK_WINDOW_CHILD" "2")
-    '("temp" "GDK_WINDOW_TEMP" "3")
-    '("foreign" "GDK_WINDOW_FOREIGN" "4")
-    '("offscreen" "GDK_WINDOW_OFFSCREEN" "5")
-    '("subsurface" "GDK_WINDOW_SUBSURFACE" "6")
+    '("all" "GDK_FUNC_ALL" "1")
+    '("resize" "GDK_FUNC_RESIZE" "2")
+    '("move" "GDK_FUNC_MOVE" "4")
+    '("minimize" "GDK_FUNC_MINIMIZE" "8")
+    '("maximize" "GDK_FUNC_MAXIMIZE" "16")
+    '("close" "GDK_FUNC_CLOSE" "32")
   )
 )
 
-;; 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_VISUAL        = 1 << 5,
-;;   GDK_WA_WMCLASS   = 1 << 6,
-;;   GDK_WA_NOREDIR   = 1 << 7,
-;;   GDK_WA_TYPE_HINT = 1 << 8
-;; } GdkWindowAttributesType;
-
 (define-flags-extended WindowAttributesType
   (in-module "Gdk")
   (c-name "GdkWindowAttributesType")
   (values
-    '("title" "GDK_WA_TITLE" "1 << 1")
-    '("x" "GDK_WA_X" "1 << 2")
-    '("y" "GDK_WA_Y" "1 << 3")
-    '("cursor" "GDK_WA_CURSOR" "1 << 4")
-    '("visual" "GDK_WA_VISUAL" "1 << 5")
-    '("wmclass" "GDK_WA_WMCLASS" "1 << 6")
-    '("noredir" "GDK_WA_NOREDIR" "1 << 7")
-    '("type-hint" "GDK_WA_TYPE_HINT" "1 << 8")
-  )
-)
-
-;; 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")
-  (values
-    '("pos" "GDK_HINT_POS" "1 << 0")
-    '("min-size" "GDK_HINT_MIN_SIZE" "1 << 1")
-    '("max-size" "GDK_HINT_MAX_SIZE" "1 << 2")
-    '("base-size" "GDK_HINT_BASE_SIZE" "1 << 3")
-    '("aspect" "GDK_HINT_ASPECT" "1 << 4")
-    '("resize-inc" "GDK_HINT_RESIZE_INC" "1 << 5")
-    '("win-gravity" "GDK_HINT_WIN_GRAVITY" "1 << 6")
-    '("user-pos" "GDK_HINT_USER_POS" "1 << 7")
-    '("user-size" "GDK_HINT_USER_SIZE" "1 << 8")
+    '("title" "GDK_WA_TITLE" "2")
+    '("x" "GDK_WA_X" "4")
+    '("y" "GDK_WA_Y" "8")
+    '("cursor" "GDK_WA_CURSOR" "16")
+    '("visual" "GDK_WA_VISUAL" "32")
+    '("wmclass" "GDK_WA_WMCLASS" "64")
+    '("noredir" "GDK_WA_NOREDIR" "128")
+    '("type_hint" "GDK_WA_TYPE_HINT" "256")
   )
 )
 
-;; 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
+(define-enum-extended WindowEdge
   (in-module "Gdk")
-  (c-name "GdkWMDecoration")
+  (c-name "GdkWindowEdge")
   (values
-    '("all" "GDK_DECOR_ALL" "1 << 0")
-    '("border" "GDK_DECOR_BORDER" "1 << 1")
-    '("resizeh" "GDK_DECOR_RESIZEH" "1 << 2")
-    '("title" "GDK_DECOR_TITLE" "1 << 3")
-    '("menu" "GDK_DECOR_MENU" "1 << 4")
-    '("minimize" "GDK_DECOR_MINIMIZE" "1 << 5")
-    '("maximize" "GDK_DECOR_MAXIMIZE" "1 << 6")
+    '("north_west" "GDK_WINDOW_EDGE_NORTH_WEST" "0")
+    '("north" "GDK_WINDOW_EDGE_NORTH" "1")
+    '("north_east" "GDK_WINDOW_EDGE_NORTH_EAST" "2")
+    '("west" "GDK_WINDOW_EDGE_WEST" "3")
+    '("east" "GDK_WINDOW_EDGE_EAST" "4")
+    '("south_west" "GDK_WINDOW_EDGE_SOUTH_WEST" "5")
+    '("south" "GDK_WINDOW_EDGE_SOUTH" "6")
+    '("south_east" "GDK_WINDOW_EDGE_SOUTH_EAST" "7")
   )
 )
 
-;; 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
+(define-flags-extended WindowHints
   (in-module "Gdk")
-  (c-name "GdkWMFunction")
+  (c-name "GdkWindowHints")
   (values
-    '("all" "GDK_FUNC_ALL" "1 << 0")
-    '("resize" "GDK_FUNC_RESIZE" "1 << 1")
-    '("move" "GDK_FUNC_MOVE" "1 << 2")
-    '("minimize" "GDK_FUNC_MINIMIZE" "1 << 3")
-    '("maximize" "GDK_FUNC_MAXIMIZE" "1 << 4")
-    '("close" "GDK_FUNC_CLOSE" "1 << 5")
+    '("pos" "GDK_HINT_POS" "1")
+    '("min_size" "GDK_HINT_MIN_SIZE" "2")
+    '("max_size" "GDK_HINT_MAX_SIZE" "4")
+    '("base_size" "GDK_HINT_BASE_SIZE" "8")
+    '("aspect" "GDK_HINT_ASPECT" "16")
+    '("resize_inc" "GDK_HINT_RESIZE_INC" "32")
+    '("win_gravity" "GDK_HINT_WIN_GRAVITY" "64")
+    '("user_pos" "GDK_HINT_USER_POS" "128")
+    '("user_size" "GDK_HINT_USER_SIZE" "256")
   )
 )
 
-;; 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
+(define-flags-extended WindowState
   (in-module "Gdk")
-  (c-name "GdkGravity")
+  (c-name "GdkWindowState")
   (values
-    '("north-west" "GDK_GRAVITY_NORTH_WEST" "1")
-    '("north" "GDK_GRAVITY_NORTH" "2")
-    '("north-east" "GDK_GRAVITY_NORTH_EAST" "3")
-    '("west" "GDK_GRAVITY_WEST" "4")
-    '("center" "GDK_GRAVITY_CENTER" "5")
-    '("east" "GDK_GRAVITY_EAST" "6")
-    '("south-west" "GDK_GRAVITY_SOUTH_WEST" "7")
-    '("south" "GDK_GRAVITY_SOUTH" "8")
-    '("south-east" "GDK_GRAVITY_SOUTH_EAST" "9")
-    '("static" "GDK_GRAVITY_STATIC" "10")
+    '("withdrawn" "GDK_WINDOW_STATE_WITHDRAWN" "1")
+    '("iconified" "GDK_WINDOW_STATE_ICONIFIED" "2")
+    '("maximized" "GDK_WINDOW_STATE_MAXIMIZED" "4")
+    '("sticky" "GDK_WINDOW_STATE_STICKY" "8")
+    '("fullscreen" "GDK_WINDOW_STATE_FULLSCREEN" "16")
+    '("above" "GDK_WINDOW_STATE_ABOVE" "32")
+    '("below" "GDK_WINDOW_STATE_BELOW" "64")
+    '("focused" "GDK_WINDOW_STATE_FOCUSED" "128")
+    '("tiled" "GDK_WINDOW_STATE_TILED" "256")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GDK_ANCHOR_FLIP_X   = 1 << 0,
-;;   GDK_ANCHOR_FLIP_Y   = 1 << 1,
-;;   GDK_ANCHOR_SLIDE_X  = 1 << 2,
-;;   GDK_ANCHOR_SLIDE_Y  = 1 << 3,
-;;   GDK_ANCHOR_RESIZE_X = 1 << 4,
-;;   GDK_ANCHOR_RESIZE_Y = 1 << 5,
-;;   GDK_ANCHOR_FLIP     = GDK_ANCHOR_FLIP_X | GDK_ANCHOR_FLIP_Y,
-;;   GDK_ANCHOR_SLIDE    = GDK_ANCHOR_SLIDE_X | GDK_ANCHOR_SLIDE_Y,
-;;   GDK_ANCHOR_RESIZE   = GDK_ANCHOR_RESIZE_X | GDK_ANCHOR_RESIZE_Y
-;; } GdkAnchorHints;
-
-(define-flags-extended AnchorHints
+(define-enum-extended WindowType
   (in-module "Gdk")
-  (c-name "GdkAnchorHints")
+  (c-name "GdkWindowType")
   (values
-    '("flip-x" "GDK_ANCHOR_FLIP_X" "1 << 0")
-    '("flip-y" "GDK_ANCHOR_FLIP_Y" "1 << 1")
-    '("slide-x" "GDK_ANCHOR_SLIDE_X" "1 << 2")
-    '("slide-y" "GDK_ANCHOR_SLIDE_Y" "1 << 3")
-    '("resize-x" "GDK_ANCHOR_RESIZE_X" "1 << 4")
-    '("resize-y" "GDK_ANCHOR_RESIZE_Y" "1 << 5")
-    '("flip" "GDK_ANCHOR_FLIP" "0x3")
-    '("slide" "GDK_ANCHOR_SLIDE" "0xC")
-    '("resize" "GDK_ANCHOR_RESIZE" "0x30")
+    '("root" "GDK_WINDOW_ROOT" "0")
+    '("toplevel" "GDK_WINDOW_TOPLEVEL" "1")
+    '("child" "GDK_WINDOW_CHILD" "2")
+    '("temp" "GDK_WINDOW_TEMP" "3")
+    '("foreign" "GDK_WINDOW_FOREIGN" "4")
+    '("offscreen" "GDK_WINDOW_OFFSCREEN" "5")
+    '("subsurface" "GDK_WINDOW_SUBSURFACE" "6")
   )
 )
 
-;; 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
+(define-enum-extended WindowTypeHint
   (in-module "Gdk")
-  (c-name "GdkWindowEdge")
+  (c-name "GdkWindowTypeHint")
   (values
-    '("north-west" "GDK_WINDOW_EDGE_NORTH_WEST" "0")
-    '("north" "GDK_WINDOW_EDGE_NORTH" "1")
-    '("north-east" "GDK_WINDOW_EDGE_NORTH_EAST" "2")
-    '("west" "GDK_WINDOW_EDGE_WEST" "3")
-    '("east" "GDK_WINDOW_EDGE_EAST" "4")
-    '("south-west" "GDK_WINDOW_EDGE_SOUTH_WEST" "5")
-    '("south" "GDK_WINDOW_EDGE_SOUTH" "6")
-    '("south-east" "GDK_WINDOW_EDGE_SOUTH_EAST" "7")
+    '("normal" "GDK_WINDOW_TYPE_HINT_NORMAL" "0")
+    '("dialog" "GDK_WINDOW_TYPE_HINT_DIALOG" "1")
+    '("menu" "GDK_WINDOW_TYPE_HINT_MENU" "2")
+    '("toolbar" "GDK_WINDOW_TYPE_HINT_TOOLBAR" "3")
+    '("splashscreen" "GDK_WINDOW_TYPE_HINT_SPLASHSCREEN" "4")
+    '("utility" "GDK_WINDOW_TYPE_HINT_UTILITY" "5")
+    '("dock" "GDK_WINDOW_TYPE_HINT_DOCK" "6")
+    '("desktop" "GDK_WINDOW_TYPE_HINT_DESKTOP" "7")
+    '("dropdown_menu" "GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU" "8")
+    '("popup_menu" "GDK_WINDOW_TYPE_HINT_POPUP_MENU" "9")
+    '("tooltip" "GDK_WINDOW_TYPE_HINT_TOOLTIP" "10")
+    '("notification" "GDK_WINDOW_TYPE_HINT_NOTIFICATION" "11")
+    '("combo" "GDK_WINDOW_TYPE_HINT_COMBO" "12")
+    '("dnd" "GDK_WINDOW_TYPE_HINT_DND" "13")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GDK_FULLSCREEN_ON_CURRENT_MONITOR,
-;;   GDK_FULLSCREEN_ON_ALL_MONITORS
-;; } GdkFullscreenMode;
-
-(define-enum-extended FullscreenMode
+(define-enum-extended WindowWindowClass
   (in-module "Gdk")
-  (c-name "GdkFullscreenMode")
+  (c-name "GdkWindowWindowClass")
   (values
-    '("current-monitor" "GDK_FULLSCREEN_ON_CURRENT_MONITOR" "0")
-    '("all-monitors" "GDK_FULLSCREEN_ON_ALL_MONITORS" "1")
+    '("input_output" "GDK_INPUT_OUTPUT" "0")
+    '("input_only" "GDK_INPUT_ONLY" "1")
   )
 )
 
diff --git a/gtk/src/gtk_enums.defs b/gtk/src/gtk_enums.defs
index 081e71f..68378a6 100644
--- a/gtk/src/gtk_enums.defs
+++ b/gtk/src/gtk_enums.defs
@@ -1,104 +1,57 @@
-;; From gtkaboutdialog.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_LICENSE_UNKNOWN,
-;;   GTK_LICENSE_CUSTOM,
-;; 
-;;   GTK_LICENSE_GPL_2_0,
-;;   GTK_LICENSE_GPL_3_0,
-;; 
-;;   GTK_LICENSE_LGPL_2_1,
-;;   GTK_LICENSE_LGPL_3_0,
-;; 
-;;   GTK_LICENSE_BSD,
-;;   GTK_LICENSE_MIT_X11,
-;; 
-;;   GTK_LICENSE_ARTISTIC,
-;; 
-;;   GTK_LICENSE_GPL_2_0_ONLY,
-;;   GTK_LICENSE_GPL_3_0_ONLY,
-;;   GTK_LICENSE_LGPL_2_1_ONLY,
-;;   GTK_LICENSE_LGPL_3_0_ONLY,
-;; 
-;;   GTK_LICENSE_AGPL_3_0
-;; } GtkLicense;
-
-(define-enum-extended License
+(define-flags-extended AccelFlags
   (in-module "Gtk")
-  (c-name "GtkLicense")
+  (c-name "GtkAccelFlags")
   (values
-    '("unknown" "GTK_LICENSE_UNKNOWN" "0")
-    '("custom" "GTK_LICENSE_CUSTOM" "1")
-    '("gpl-2-0" "GTK_LICENSE_GPL_2_0" "2")
-    '("gpl-3-0" "GTK_LICENSE_GPL_3_0" "3")
-    '("lgpl-2-1" "GTK_LICENSE_LGPL_2_1" "4")
-    '("lgpl-3-0" "GTK_LICENSE_LGPL_3_0" "5")
-    '("bsd" "GTK_LICENSE_BSD" "6")
-    '("mit-x11" "GTK_LICENSE_MIT_X11" "7")
-    '("artistic" "GTK_LICENSE_ARTISTIC" "8")
-    '("gpl-2-0-only" "GTK_LICENSE_GPL_2_0_ONLY" "9")
-    '("gpl-3-0-only" "GTK_LICENSE_GPL_3_0_ONLY" "10")
-    '("lgpl-2-1-only" "GTK_LICENSE_LGPL_2_1_ONLY" "11")
-    '("lgpl-3-0-only" "GTK_LICENSE_LGPL_3_0_ONLY" "12")
-    '("agpl-3-0" "GTK_LICENSE_AGPL_3_0" "13")
+    '("visible" "GTK_ACCEL_VISIBLE" "1")
+    '("locked" "GTK_ACCEL_LOCKED" "2")
+    '("mask" "GTK_ACCEL_MASK" "7")
   )
 )
 
-;; From gtkaccelgroup.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_ACCEL_VISIBLE        = 1 << 0,
-;;   GTK_ACCEL_LOCKED         = 1 << 1,
-;;   GTK_ACCEL_MASK           = 0x07
-;; } GtkAccelFlags;
-
-(define-flags-extended AccelFlags
+(define-enum-extended Align
   (in-module "Gtk")
-  (c-name "GtkAccelFlags")
+  (c-name "GtkAlign")
   (values
-    '("visible" "GTK_ACCEL_VISIBLE" "1 << 0")
-    '("locked" "GTK_ACCEL_LOCKED" "1 << 1")
-    '("mask" "GTK_ACCEL_MASK" "0x07")
+    '("fill" "GTK_ALIGN_FILL" "0")
+    '("start" "GTK_ALIGN_START" "1")
+    '("end" "GTK_ALIGN_END" "2")
+    '("center" "GTK_ALIGN_CENTER" "3")
+    '("baseline" "GTK_ALIGN_BASELINE" "4")
   )
 )
 
-;; From gtkapplication.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_APPLICATION_INHIBIT_LOGOUT  = (1 << 0),
-;;   GTK_APPLICATION_INHIBIT_SWITCH  = (1 << 1),
-;;   GTK_APPLICATION_INHIBIT_SUSPEND = (1 << 2),
-;;   GTK_APPLICATION_INHIBIT_IDLE    = (1 << 3)
-;; } GtkApplicationInhibitFlags;
-
 (define-flags-extended ApplicationInhibitFlags
   (in-module "Gtk")
   (c-name "GtkApplicationInhibitFlags")
   (values
-    '("logout" "GTK_APPLICATION_INHIBIT_LOGOUT" "(1 << 0)")
-    '("switch" "GTK_APPLICATION_INHIBIT_SWITCH" "(1 << 1)")
-    '("suspend" "GTK_APPLICATION_INHIBIT_SUSPEND" "(1 << 2)")
-    '("idle" "GTK_APPLICATION_INHIBIT_IDLE" "(1 << 3)")
+    '("logout" "GTK_APPLICATION_INHIBIT_LOGOUT" "1")
+    '("switch" "GTK_APPLICATION_INHIBIT_SWITCH" "2")
+    '("suspend" "GTK_APPLICATION_INHIBIT_SUSPEND" "4")
+    '("idle" "GTK_APPLICATION_INHIBIT_IDLE" "8")
   )
 )
 
-;; From gtkassistant.h
+(define-enum-extended ArrowPlacement
+  (in-module "Gtk")
+  (c-name "GtkArrowPlacement")
+  (values
+    '("both" "GTK_ARROWS_BOTH" "0")
+    '("start" "GTK_ARROWS_START" "1")
+    '("end" "GTK_ARROWS_END" "2")
+  )
+)
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_ASSISTANT_PAGE_CONTENT,
-;;   GTK_ASSISTANT_PAGE_INTRO,
-;;   GTK_ASSISTANT_PAGE_CONFIRM,
-;;   GTK_ASSISTANT_PAGE_SUMMARY,
-;;   GTK_ASSISTANT_PAGE_PROGRESS,
-;;   GTK_ASSISTANT_PAGE_CUSTOM
-;; } GtkAssistantPageType;
+(define-enum-extended ArrowType
+  (in-module "Gtk")
+  (c-name "GtkArrowType")
+  (values
+    '("up" "GTK_ARROW_UP" "0")
+    '("down" "GTK_ARROW_DOWN" "1")
+    '("left" "GTK_ARROW_LEFT" "2")
+    '("right" "GTK_ARROW_RIGHT" "3")
+    '("none" "GTK_ARROW_NONE" "4")
+  )
+)
 
 (define-enum-extended AssistantPageType
   (in-module "Gtk")
@@ -113,18 +66,63 @@
   )
 )
 
-;; From gtkbbox.h
+(define-flags-extended AttachOptions
+  (in-module "Gtk")
+  (c-name "GtkAttachOptions")
+  (values
+    '("expand" "GTK_EXPAND" "1")
+    '("shrink" "GTK_SHRINK" "2")
+    '("fill" "GTK_FILL" "4")
+  )
+)
+
+(define-enum-extended BaselinePosition
+  (in-module "Gtk")
+  (c-name "GtkBaselinePosition")
+  (values
+    '("top" "GTK_BASELINE_POSITION_TOP" "0")
+    '("center" "GTK_BASELINE_POSITION_CENTER" "1")
+    '("bottom" "GTK_BASELINE_POSITION_BOTTOM" "2")
+  )
+)
+
+(define-enum-extended BorderStyle
+  (in-module "Gtk")
+  (c-name "GtkBorderStyle")
+  (values
+    '("none" "GTK_BORDER_STYLE_NONE" "0")
+    '("solid" "GTK_BORDER_STYLE_SOLID" "1")
+    '("inset" "GTK_BORDER_STYLE_INSET" "2")
+    '("outset" "GTK_BORDER_STYLE_OUTSET" "3")
+    '("hidden" "GTK_BORDER_STYLE_HIDDEN" "4")
+    '("dotted" "GTK_BORDER_STYLE_DOTTED" "5")
+    '("dashed" "GTK_BORDER_STYLE_DASHED" "6")
+    '("double" "GTK_BORDER_STYLE_DOUBLE" "7")
+    '("groove" "GTK_BORDER_STYLE_GROOVE" "8")
+    '("ridge" "GTK_BORDER_STYLE_RIDGE" "9")
+  )
+)
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_BUTTONBOX_SPREAD = 1,
-;;   GTK_BUTTONBOX_EDGE,
-;;   GTK_BUTTONBOX_START,
-;;   GTK_BUTTONBOX_END,
-;;   GTK_BUTTONBOX_CENTER,
-;;   GTK_BUTTONBOX_EXPAND
-;; } GtkButtonBoxStyle;
+(define-enum-extended BuilderError
+  (in-module "Gtk")
+  (c-name "GtkBuilderError")
+  (values
+    '("invalid_type_function" "GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION" "0")
+    '("unhandled_tag" "GTK_BUILDER_ERROR_UNHANDLED_TAG" "1")
+    '("missing_attribute" "GTK_BUILDER_ERROR_MISSING_ATTRIBUTE" "2")
+    '("invalid_attribute" "GTK_BUILDER_ERROR_INVALID_ATTRIBUTE" "3")
+    '("invalid_tag" "GTK_BUILDER_ERROR_INVALID_TAG" "4")
+    '("missing_property_value" "GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE" "5")
+    '("invalid_value" "GTK_BUILDER_ERROR_INVALID_VALUE" "6")
+    '("version_mismatch" "GTK_BUILDER_ERROR_VERSION_MISMATCH" "7")
+    '("duplicate_id" "GTK_BUILDER_ERROR_DUPLICATE_ID" "8")
+    '("object_type_refused" "GTK_BUILDER_ERROR_OBJECT_TYPE_REFUSED" "9")
+    '("template_mismatch" "GTK_BUILDER_ERROR_TEMPLATE_MISMATCH" "10")
+    '("invalid_property" "GTK_BUILDER_ERROR_INVALID_PROPERTY" "11")
+    '("invalid_signal" "GTK_BUILDER_ERROR_INVALID_SIGNAL" "12")
+    '("invalid_id" "GTK_BUILDER_ERROR_INVALID_ID" "13")
+  )
+)
 
 (define-enum-extended ButtonBoxStyle
   (in-module "Gtk")
@@ -139,81 +137,41 @@
   )
 )
 
-;; From gtkbuilder.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION,
-;;   GTK_BUILDER_ERROR_UNHANDLED_TAG,
-;;   GTK_BUILDER_ERROR_MISSING_ATTRIBUTE,
-;;   GTK_BUILDER_ERROR_INVALID_ATTRIBUTE,
-;;   GTK_BUILDER_ERROR_INVALID_TAG,
-;;   GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE,
-;;   GTK_BUILDER_ERROR_INVALID_VALUE,
-;;   GTK_BUILDER_ERROR_VERSION_MISMATCH,
-;;   GTK_BUILDER_ERROR_DUPLICATE_ID,
-;;   GTK_BUILDER_ERROR_OBJECT_TYPE_REFUSED,
-;;   GTK_BUILDER_ERROR_TEMPLATE_MISMATCH,
-;;   GTK_BUILDER_ERROR_INVALID_PROPERTY,
-;;   GTK_BUILDER_ERROR_INVALID_SIGNAL,
-;;   GTK_BUILDER_ERROR_INVALID_ID
-;; } GtkBuilderError;
+(define-enum-extended ButtonRole
+  (in-module "Gtk")
+  (c-name "GtkButtonRole")
+  (values
+    '("normal" "GTK_BUTTON_ROLE_NORMAL" "0")
+    '("check" "GTK_BUTTON_ROLE_CHECK" "1")
+    '("radio" "GTK_BUTTON_ROLE_RADIO" "2")
+  )
+)
 
-(define-enum-extended BuilderError
+(define-enum-extended ButtonsType
   (in-module "Gtk")
-  (c-name "GtkBuilderError")
+  (c-name "GtkButtonsType")
   (values
-    '("invalid-type-function" "GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION" "0")
-    '("unhandled-tag" "GTK_BUILDER_ERROR_UNHANDLED_TAG" "1")
-    '("missing-attribute" "GTK_BUILDER_ERROR_MISSING_ATTRIBUTE" "2")
-    '("invalid-attribute" "GTK_BUILDER_ERROR_INVALID_ATTRIBUTE" "3")
-    '("invalid-tag" "GTK_BUILDER_ERROR_INVALID_TAG" "4")
-    '("missing-property-value" "GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE" "5")
-    '("invalid-value" "GTK_BUILDER_ERROR_INVALID_VALUE" "6")
-    '("version-mismatch" "GTK_BUILDER_ERROR_VERSION_MISMATCH" "7")
-    '("duplicate-id" "GTK_BUILDER_ERROR_DUPLICATE_ID" "8")
-    '("object-type-refused" "GTK_BUILDER_ERROR_OBJECT_TYPE_REFUSED" "9")
-    '("template-mismatch" "GTK_BUILDER_ERROR_TEMPLATE_MISMATCH" "10")
-    '("invalid-property" "GTK_BUILDER_ERROR_INVALID_PROPERTY" "11")
-    '("invalid-signal" "GTK_BUILDER_ERROR_INVALID_SIGNAL" "12")
-    '("invalid-id" "GTK_BUILDER_ERROR_INVALID_ID" "13")
-  )
-)
-
-;; From gtkcalendar.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_CALENDAR_SHOW_HEADING         = 1 << 0,
-;;   GTK_CALENDAR_SHOW_DAY_NAMES               = 1 << 1,
-;;   GTK_CALENDAR_NO_MONTH_CHANGE              = 1 << 2,
-;;   GTK_CALENDAR_SHOW_WEEK_NUMBERS    = 1 << 3,
-;;   GTK_CALENDAR_SHOW_DETAILS         = 1 << 5
-;; } GtkCalendarDisplayOptions;
+    '("none" "GTK_BUTTONS_NONE" "0")
+    '("ok" "GTK_BUTTONS_OK" "1")
+    '("close" "GTK_BUTTONS_CLOSE" "2")
+    '("cancel" "GTK_BUTTONS_CANCEL" "3")
+    '("yes_no" "GTK_BUTTONS_YES_NO" "4")
+    '("ok_cancel" "GTK_BUTTONS_OK_CANCEL" "5")
+  )
+)
 
 (define-flags-extended CalendarDisplayOptions
   (in-module "Gtk")
   (c-name "GtkCalendarDisplayOptions")
   (values
-    '("show-heading" "GTK_CALENDAR_SHOW_HEADING" "1 << 0")
-    '("show-day-names" "GTK_CALENDAR_SHOW_DAY_NAMES" "1 << 1")
-    '("no-month-change" "GTK_CALENDAR_NO_MONTH_CHANGE" "1 << 2")
-    '("show-week-numbers" "GTK_CALENDAR_SHOW_WEEK_NUMBERS" "1 << 3")
-    '("show-details" "GTK_CALENDAR_SHOW_DETAILS" "1 << 5")
+    '("show_heading" "GTK_CALENDAR_SHOW_HEADING" "1")
+    '("show_day_names" "GTK_CALENDAR_SHOW_DAY_NAMES" "2")
+    '("no_month_change" "GTK_CALENDAR_NO_MONTH_CHANGE" "4")
+    '("show_week_numbers" "GTK_CALENDAR_SHOW_WEEK_NUMBERS" "8")
+    '("show_details" "GTK_CALENDAR_SHOW_DETAILS" "32")
   )
 )
 
-;; From gtkcellrendereraccel.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_CELL_RENDERER_ACCEL_MODE_GTK,
-;;   GTK_CELL_RENDERER_ACCEL_MODE_OTHER
-;; } GtkCellRendererAccelMode;
-
 (define-enum-extended CellRendererAccelMode
   (in-module "Gtk")
   (c-name "GtkCellRendererAccelMode")
@@ -223,43 +181,6 @@
   )
 )
 
-;; From gtkcellrenderer.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_CELL_RENDERER_SELECTED    = 1 << 0,
-;;   GTK_CELL_RENDERER_PRELIT      = 1 << 1,
-;;   GTK_CELL_RENDERER_INSENSITIVE = 1 << 2,
-;;   /* this flag means the cell is in the sort column/row */
-;;   GTK_CELL_RENDERER_SORTED      = 1 << 3,
-;;   GTK_CELL_RENDERER_FOCUSED     = 1 << 4,
-;;   GTK_CELL_RENDERER_EXPANDABLE  = 1 << 5,
-;;   GTK_CELL_RENDERER_EXPANDED    = 1 << 6
-;; } GtkCellRendererState;
-
-(define-flags-extended CellRendererState
-  (in-module "Gtk")
-  (c-name "GtkCellRendererState")
-  (values
-    '("selected" "GTK_CELL_RENDERER_SELECTED" "1 << 0")
-    '("prelit" "GTK_CELL_RENDERER_PRELIT" "1 << 1")
-    '("insensitive" "GTK_CELL_RENDERER_INSENSITIVE" "1 << 2")
-    '("sorted" "GTK_CELL_RENDERER_SORTED" "1 << 3")
-    '("focused" "GTK_CELL_RENDERER_FOCUSED" "1 << 4")
-    '("expandable" "GTK_CELL_RENDERER_EXPANDABLE" "1 << 5")
-    '("expanded" "GTK_CELL_RENDERER_EXPANDED" "1 << 6")
-  )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_CELL_RENDERER_MODE_INERT,
-;;   GTK_CELL_RENDERER_MODE_ACTIVATABLE,
-;;   GTK_CELL_RENDERER_MODE_EDITABLE
-;; } GtkCellRendererMode;
-
 (define-enum-extended CellRendererMode
   (in-module "Gtk")
   (c-name "GtkCellRendererMode")
@@ -270,38 +191,30 @@
   )
 )
 
-;; From gtkcontainer.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_RESIZE_PARENT,
-;;   GTK_RESIZE_QUEUE,
-;;   GTK_RESIZE_IMMEDIATE
-;; } GtkResizeMode;
-
-(define-enum-extended ResizeMode
+(define-flags-extended CellRendererState
   (in-module "Gtk")
-  (c-name "GtkResizeMode")
+  (c-name "GtkCellRendererState")
   (values
-    '("parent" "GTK_RESIZE_PARENT" "0")
-    '("queue" "GTK_RESIZE_QUEUE" "1")
-    '("immediate" "GTK_RESIZE_IMMEDIATE" "2")
+    '("selected" "GTK_CELL_RENDERER_SELECTED" "1")
+    '("prelit" "GTK_CELL_RENDERER_PRELIT" "2")
+    '("insensitive" "GTK_CELL_RENDERER_INSENSITIVE" "4")
+    '("sorted" "GTK_CELL_RENDERER_SORTED" "8")
+    '("focused" "GTK_CELL_RENDERER_FOCUSED" "16")
+    '("expandable" "GTK_CELL_RENDERER_EXPANDABLE" "32")
+    '("expanded" "GTK_CELL_RENDERER_EXPANDED" "64")
   )
 )
 
-;; From gtkcssprovider.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_CSS_PROVIDER_ERROR_FAILED,
-;;   GTK_CSS_PROVIDER_ERROR_SYNTAX,
-;;   GTK_CSS_PROVIDER_ERROR_IMPORT,
-;;   GTK_CSS_PROVIDER_ERROR_NAME,
-;;   GTK_CSS_PROVIDER_ERROR_DEPRECATED,
-;;   GTK_CSS_PROVIDER_ERROR_UNKNOWN_VALUE
-;; } GtkCssProviderError;
+(define-enum-extended CornerType
+  (in-module "Gtk")
+  (c-name "GtkCornerType")
+  (values
+    '("top_left" "GTK_CORNER_TOP_LEFT" "0")
+    '("bottom_left" "GTK_CORNER_BOTTOM_LEFT" "1")
+    '("top_right" "GTK_CORNER_TOP_RIGHT" "2")
+    '("bottom_right" "GTK_CORNER_BOTTOM_RIGHT" "3")
+  )
+)
 
 (define-enum-extended CssProviderError
   (in-module "Gtk")
@@ -312,34 +225,18 @@
     '("import" "GTK_CSS_PROVIDER_ERROR_IMPORT" "2")
     '("name" "GTK_CSS_PROVIDER_ERROR_NAME" "3")
     '("deprecated" "GTK_CSS_PROVIDER_ERROR_DEPRECATED" "4")
-    '("unknown-value" "GTK_CSS_PROVIDER_ERROR_UNKNOWN_VALUE" "5")
+    '("unknown_value" "GTK_CSS_PROVIDER_ERROR_UNKNOWN_VALUE" "5")
   )
 )
 
-;; From gtkcsssection.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_CSS_SECTION_DOCUMENT,
-;;   GTK_CSS_SECTION_IMPORT,
-;;   GTK_CSS_SECTION_COLOR_DEFINITION,
-;;   GTK_CSS_SECTION_BINDING_SET,
-;;   GTK_CSS_SECTION_RULESET,
-;;   GTK_CSS_SECTION_SELECTOR,
-;;   GTK_CSS_SECTION_DECLARATION,
-;;   GTK_CSS_SECTION_VALUE,
-;;   GTK_CSS_SECTION_KEYFRAMES
-;; } GtkCssSectionType;
-
 (define-enum-extended CssSectionType
   (in-module "Gtk")
   (c-name "GtkCssSectionType")
   (values
     '("document" "GTK_CSS_SECTION_DOCUMENT" "0")
     '("import" "GTK_CSS_SECTION_IMPORT" "1")
-    '("color-definition" "GTK_CSS_SECTION_COLOR_DEFINITION" "2")
-    '("binding-set" "GTK_CSS_SECTION_BINDING_SET" "3")
+    '("color_definition" "GTK_CSS_SECTION_COLOR_DEFINITION" "2")
+    '("binding_set" "GTK_CSS_SECTION_BINDING_SET" "3")
     '("ruleset" "GTK_CSS_SECTION_RULESET" "4")
     '("selector" "GTK_CSS_SECTION_SELECTOR" "5")
     '("declaration" "GTK_CSS_SECTION_DECLARATION" "6")
@@ -348,734 +245,420 @@
   )
 )
 
-;; From gtkdebug.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_DEBUG_MISC            = 1 << 0,
-;;   GTK_DEBUG_PLUGSOCKET      = 1 << 1,
-;;   GTK_DEBUG_TEXT            = 1 << 2,
-;;   GTK_DEBUG_TREE            = 1 << 3,
-;;   GTK_DEBUG_UPDATES         = 1 << 4,
-;;   GTK_DEBUG_KEYBINDINGS     = 1 << 5,
-;;   GTK_DEBUG_MULTIHEAD       = 1 << 6,
-;;   GTK_DEBUG_MODULES         = 1 << 7,
-;;   GTK_DEBUG_GEOMETRY        = 1 << 8,
-;;   GTK_DEBUG_ICONTHEME       = 1 << 9,
-;;   GTK_DEBUG_PRINTING        = 1 << 10,
-;;   GTK_DEBUG_BUILDER         = 1 << 11,
-;;   GTK_DEBUG_SIZE_REQUEST    = 1 << 12,
-;;   GTK_DEBUG_NO_CSS_CACHE    = 1 << 13,
-;;   GTK_DEBUG_BASELINES       = 1 << 14,
-;;   GTK_DEBUG_PIXEL_CACHE     = 1 << 15,
-;;   GTK_DEBUG_NO_PIXEL_CACHE  = 1 << 16,
-;;   GTK_DEBUG_INTERACTIVE     = 1 << 17,
-;;   GTK_DEBUG_TOUCHSCREEN     = 1 << 18,
-;;   GTK_DEBUG_ACTIONS         = 1 << 19,
-;;   GTK_DEBUG_RESIZE          = 1 << 20,
-;;   GTK_DEBUG_LAYOUT          = 1 << 21
-;; } GtkDebugFlag;
-
 (define-flags-extended DebugFlag
   (in-module "Gtk")
   (c-name "GtkDebugFlag")
   (values
-    '("misc" "GTK_DEBUG_MISC" "1 << 0")
-    '("plugsocket" "GTK_DEBUG_PLUGSOCKET" "1 << 1")
-    '("text" "GTK_DEBUG_TEXT" "1 << 2")
-    '("tree" "GTK_DEBUG_TREE" "1 << 3")
-    '("updates" "GTK_DEBUG_UPDATES" "1 << 4")
-    '("keybindings" "GTK_DEBUG_KEYBINDINGS" "1 << 5")
-    '("multihead" "GTK_DEBUG_MULTIHEAD" "1 << 6")
-    '("modules" "GTK_DEBUG_MODULES" "1 << 7")
-    '("geometry" "GTK_DEBUG_GEOMETRY" "1 << 8")
-    '("icontheme" "GTK_DEBUG_ICONTHEME" "1 << 9")
-    '("printing" "GTK_DEBUG_PRINTING" "1 << 10")
-    '("builder" "GTK_DEBUG_BUILDER" "1 << 11")
-    '("size-request" "GTK_DEBUG_SIZE_REQUEST" "1 << 12")
-    '("no-css-cache" "GTK_DEBUG_NO_CSS_CACHE" "1 << 13")
-    '("baselines" "GTK_DEBUG_BASELINES" "1 << 14")
-    '("pixel-cache" "GTK_DEBUG_PIXEL_CACHE" "1 << 15")
-    '("no-pixel-cache" "GTK_DEBUG_NO_PIXEL_CACHE" "1 << 16")
-    '("interactive" "GTK_DEBUG_INTERACTIVE" "1 << 17")
-    '("touchscreen" "GTK_DEBUG_TOUCHSCREEN" "1 << 18")
-    '("actions" "GTK_DEBUG_ACTIONS" "1 << 19")
-    '("resize" "GTK_DEBUG_RESIZE" "1 << 20")
-    '("layout" "GTK_DEBUG_LAYOUT" "1 << 21")
-  )
-)
-
-;; From gtkdialog.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_DIALOG_MODAL               = 1 << 0,
-;;   GTK_DIALOG_DESTROY_WITH_PARENT = 1 << 1,
-;;   GTK_DIALOG_USE_HEADER_BAR      = 1 << 2
-;; } GtkDialogFlags;
-
-(define-flags-extended DialogFlags
-  (in-module "Gtk")
-  (c-name "GtkDialogFlags")
-  (values
-    '("modal" "GTK_DIALOG_MODAL" "1 << 0")
-    '("destroy-with-parent" "GTK_DIALOG_DESTROY_WITH_PARENT" "1 << 1")
-    '("use-header-bar" "GTK_DIALOG_USE_HEADER_BAR" "1 << 2")
+    '("misc" "GTK_DEBUG_MISC" "1")
+    '("plugsocket" "GTK_DEBUG_PLUGSOCKET" "2")
+    '("text" "GTK_DEBUG_TEXT" "4")
+    '("tree" "GTK_DEBUG_TREE" "8")
+    '("updates" "GTK_DEBUG_UPDATES" "16")
+    '("keybindings" "GTK_DEBUG_KEYBINDINGS" "32")
+    '("multihead" "GTK_DEBUG_MULTIHEAD" "64")
+    '("modules" "GTK_DEBUG_MODULES" "128")
+    '("geometry" "GTK_DEBUG_GEOMETRY" "256")
+    '("icontheme" "GTK_DEBUG_ICONTHEME" "512")
+    '("printing" "GTK_DEBUG_PRINTING" "1024")
+    '("builder" "GTK_DEBUG_BUILDER" "2048")
+    '("size_request" "GTK_DEBUG_SIZE_REQUEST" "4096")
+    '("no_css_cache" "GTK_DEBUG_NO_CSS_CACHE" "8192")
+    '("baselines" "GTK_DEBUG_BASELINES" "16384")
+    '("pixel_cache" "GTK_DEBUG_PIXEL_CACHE" "32768")
+    '("no_pixel_cache" "GTK_DEBUG_NO_PIXEL_CACHE" "65536")
+    '("interactive" "GTK_DEBUG_INTERACTIVE" "131072")
+    '("touchscreen" "GTK_DEBUG_TOUCHSCREEN" "262144")
+    '("actions" "GTK_DEBUG_ACTIONS" "524288")
+    '("resize" "GTK_DEBUG_RESIZE" "1048576")
+    '("layout" "GTK_DEBUG_LAYOUT" "2097152")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_RESPONSE_NONE         = -1,
-;;   GTK_RESPONSE_REJECT       = -2,
-;;   GTK_RESPONSE_ACCEPT       = -3,
-;;   GTK_RESPONSE_DELETE_EVENT = -4,
-;;   GTK_RESPONSE_OK           = -5,
-;;   GTK_RESPONSE_CANCEL       = -6,
-;;   GTK_RESPONSE_CLOSE        = -7,
-;;   GTK_RESPONSE_YES          = -8,
-;;   GTK_RESPONSE_NO           = -9,
-;;   GTK_RESPONSE_APPLY        = -10,
-;;   GTK_RESPONSE_HELP         = -11
-;; } GtkResponseType;
-
-(define-enum-extended ResponseType
+(define-enum-extended DeleteType
   (in-module "Gtk")
-  (c-name "GtkResponseType")
+  (c-name "GtkDeleteType")
   (values
-    '("none" "GTK_RESPONSE_NONE" "-1")
-    '("reject" "GTK_RESPONSE_REJECT" "-2")
-    '("accept" "GTK_RESPONSE_ACCEPT" "-3")
-    '("delete-event" "GTK_RESPONSE_DELETE_EVENT" "-4")
-    '("ok" "GTK_RESPONSE_OK" "-5")
-    '("cancel" "GTK_RESPONSE_CANCEL" "-6")
-    '("close" "GTK_RESPONSE_CLOSE" "-7")
-    '("yes" "GTK_RESPONSE_YES" "-8")
-    '("no" "GTK_RESPONSE_NO" "-9")
-    '("apply" "GTK_RESPONSE_APPLY" "-10")
-    '("help" "GTK_RESPONSE_HELP" "-11")
+    '("chars" "GTK_DELETE_CHARS" "0")
+    '("word_ends" "GTK_DELETE_WORD_ENDS" "1")
+    '("words" "GTK_DELETE_WORDS" "2")
+    '("display_lines" "GTK_DELETE_DISPLAY_LINES" "3")
+    '("display_line_ends" "GTK_DELETE_DISPLAY_LINE_ENDS" "4")
+    '("paragraph_ends" "GTK_DELETE_PARAGRAPH_ENDS" "5")
+    '("paragraphs" "GTK_DELETE_PARAGRAPHS" "6")
+    '("whitespace" "GTK_DELETE_WHITESPACE" "7")
   )
 )
 
-;; From gtkdragdest.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_DEST_DEFAULT_MOTION     = 1 << 0,
-;;   GTK_DEST_DEFAULT_HIGHLIGHT  = 1 << 1,
-;;   GTK_DEST_DEFAULT_DROP       = 1 << 2,
-;;   GTK_DEST_DEFAULT_ALL        = 0x07
-;; } GtkDestDefaults;
-
 (define-flags-extended DestDefaults
   (in-module "Gtk")
   (c-name "GtkDestDefaults")
   (values
-    '("motion" "GTK_DEST_DEFAULT_MOTION" "1 << 0")
-    '("highlight" "GTK_DEST_DEFAULT_HIGHLIGHT" "1 << 1")
-    '("drop" "GTK_DEST_DEFAULT_DROP" "1 << 2")
-    '("all" "GTK_DEST_DEFAULT_ALL" "0x07")
+    '("motion" "GTK_DEST_DEFAULT_MOTION" "1")
+    '("highlight" "GTK_DEST_DEFAULT_HIGHLIGHT" "2")
+    '("drop" "GTK_DEST_DEFAULT_DROP" "4")
+    '("all" "GTK_DEST_DEFAULT_ALL" "7")
   )
 )
 
-;; From gtkentry.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_ENTRY_ICON_PRIMARY,
-;;   GTK_ENTRY_ICON_SECONDARY
-;; } GtkEntryIconPosition;
-
-(define-enum-extended EntryIconPosition
+(define-flags-extended DialogFlags
   (in-module "Gtk")
-  (c-name "GtkEntryIconPosition")
+  (c-name "GtkDialogFlags")
   (values
-    '("primary" "GTK_ENTRY_ICON_PRIMARY" "0")
-    '("secondary" "GTK_ENTRY_ICON_SECONDARY" "1")
+    '("modal" "GTK_DIALOG_MODAL" "1")
+    '("destroy_with_parent" "GTK_DIALOG_DESTROY_WITH_PARENT" "2")
+    '("use_header_bar" "GTK_DIALOG_USE_HEADER_BAR" "4")
   )
 )
 
-;; From gtkenums.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_ALIGN_FILL,
-;;   GTK_ALIGN_START,
-;;   GTK_ALIGN_END,
-;;   GTK_ALIGN_CENTER,
-;;   GTK_ALIGN_BASELINE
-;; } GtkAlign;
-
-(define-enum-extended Align
+(define-enum-extended DirectionType
   (in-module "Gtk")
-  (c-name "GtkAlign")
+  (c-name "GtkDirectionType")
   (values
-    '("fill" "GTK_ALIGN_FILL" "0")
-    '("start" "GTK_ALIGN_START" "1")
-    '("end" "GTK_ALIGN_END" "2")
-    '("center" "GTK_ALIGN_CENTER" "3")
-    '("baseline" "GTK_ALIGN_BASELINE" "4")
+    '("tab_forward" "GTK_DIR_TAB_FORWARD" "0")
+    '("tab_backward" "GTK_DIR_TAB_BACKWARD" "1")
+    '("up" "GTK_DIR_UP" "2")
+    '("down" "GTK_DIR_DOWN" "3")
+    '("left" "GTK_DIR_LEFT" "4")
+    '("right" "GTK_DIR_RIGHT" "5")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_ARROW_UP,
-;;   GTK_ARROW_DOWN,
-;;   GTK_ARROW_LEFT,
-;;   GTK_ARROW_RIGHT,
-;;   GTK_ARROW_NONE
-;; } GtkArrowType;
-
-(define-enum-extended ArrowType
+(define-enum-extended DragResult
   (in-module "Gtk")
-  (c-name "GtkArrowType")
+  (c-name "GtkDragResult")
   (values
-    '("up" "GTK_ARROW_UP" "0")
-    '("down" "GTK_ARROW_DOWN" "1")
-    '("left" "GTK_ARROW_LEFT" "2")
-    '("right" "GTK_ARROW_RIGHT" "3")
-    '("none" "GTK_ARROW_NONE" "4")
+    '("success" "GTK_DRAG_RESULT_SUCCESS" "0")
+    '("no_target" "GTK_DRAG_RESULT_NO_TARGET" "1")
+    '("user_cancelled" "GTK_DRAG_RESULT_USER_CANCELLED" "2")
+    '("timeout_expired" "GTK_DRAG_RESULT_TIMEOUT_EXPIRED" "3")
+    '("grab_broken" "GTK_DRAG_RESULT_GRAB_BROKEN" "4")
+    '("error" "GTK_DRAG_RESULT_ERROR" "5")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_BASELINE_POSITION_TOP,
-;;   GTK_BASELINE_POSITION_CENTER,
-;;   GTK_BASELINE_POSITION_BOTTOM
-;; } GtkBaselinePosition;
-
-(define-enum-extended BaselinePosition
+(define-enum-extended EntryIconPosition
   (in-module "Gtk")
-  (c-name "GtkBaselinePosition")
+  (c-name "GtkEntryIconPosition")
   (values
-    '("top" "GTK_BASELINE_POSITION_TOP" "0")
-    '("center" "GTK_BASELINE_POSITION_CENTER" "1")
-    '("bottom" "GTK_BASELINE_POSITION_BOTTOM" "2")
+    '("primary" "GTK_ENTRY_ICON_PRIMARY" "0")
+    '("secondary" "GTK_ENTRY_ICON_SECONDARY" "1")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_DELETE_CHARS,
-;;   GTK_DELETE_WORD_ENDS,
-;;   GTK_DELETE_WORDS,
-;;   GTK_DELETE_DISPLAY_LINES,
-;;   GTK_DELETE_DISPLAY_LINE_ENDS,
-;;   GTK_DELETE_PARAGRAPH_ENDS,
-;;   GTK_DELETE_PARAGRAPHS,
-;;   GTK_DELETE_WHITESPACE
-;; } GtkDeleteType;
-
-(define-enum-extended DeleteType
+(define-enum-extended EventSequenceState
   (in-module "Gtk")
-  (c-name "GtkDeleteType")
+  (c-name "GtkEventSequenceState")
   (values
-    '("chars" "GTK_DELETE_CHARS" "0")
-    '("word-ends" "GTK_DELETE_WORD_ENDS" "1")
-    '("words" "GTK_DELETE_WORDS" "2")
-    '("display-lines" "GTK_DELETE_DISPLAY_LINES" "3")
-    '("display-line-ends" "GTK_DELETE_DISPLAY_LINE_ENDS" "4")
-    '("paragraph-ends" "GTK_DELETE_PARAGRAPH_ENDS" "5")
-    '("paragraphs" "GTK_DELETE_PARAGRAPHS" "6")
-    '("whitespace" "GTK_DELETE_WHITESPACE" "7")
+    '("none" "GTK_EVENT_SEQUENCE_NONE" "0")
+    '("claimed" "GTK_EVENT_SEQUENCE_CLAIMED" "1")
+    '("denied" "GTK_EVENT_SEQUENCE_DENIED" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_DIR_TAB_FORWARD,
-;;   GTK_DIR_TAB_BACKWARD,
-;;   GTK_DIR_UP,
-;;   GTK_DIR_DOWN,
-;;   GTK_DIR_LEFT,
-;;   GTK_DIR_RIGHT
-;; } GtkDirectionType;
-
-(define-enum-extended DirectionType
+(define-enum-extended ExpanderStyle
   (in-module "Gtk")
-  (c-name "GtkDirectionType")
+  (c-name "GtkExpanderStyle")
   (values
-    '("tab-forward" "GTK_DIR_TAB_FORWARD" "0")
-    '("tab-backward" "GTK_DIR_TAB_BACKWARD" "1")
-    '("up" "GTK_DIR_UP" "2")
-    '("down" "GTK_DIR_DOWN" "3")
-    '("left" "GTK_DIR_LEFT" "4")
-    '("right" "GTK_DIR_RIGHT" "5")
+    '("collapsed" "GTK_EXPANDER_COLLAPSED" "0")
+    '("semi_collapsed" "GTK_EXPANDER_SEMI_COLLAPSED" "1")
+    '("semi_expanded" "GTK_EXPANDER_SEMI_EXPANDED" "2")
+    '("expanded" "GTK_EXPANDER_EXPANDED" "3")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_ICON_SIZE_INVALID,
-;;   GTK_ICON_SIZE_MENU,
-;;   GTK_ICON_SIZE_SMALL_TOOLBAR,
-;;   GTK_ICON_SIZE_LARGE_TOOLBAR,
-;;   GTK_ICON_SIZE_BUTTON,
-;;   GTK_ICON_SIZE_DND,
-;;   GTK_ICON_SIZE_DIALOG
-;; } GtkIconSize;
-
-(define-enum-extended IconSize
+(define-enum-extended FileChooserAction
   (in-module "Gtk")
-  (c-name "GtkIconSize")
+  (c-name "GtkFileChooserAction")
   (values
-    '("invalid" "GTK_ICON_SIZE_INVALID" "0")
-    '("menu" "GTK_ICON_SIZE_MENU" "1")
-    '("small-toolbar" "GTK_ICON_SIZE_SMALL_TOOLBAR" "2")
-    '("large-toolbar" "GTK_ICON_SIZE_LARGE_TOOLBAR" "3")
-    '("button" "GTK_ICON_SIZE_BUTTON" "4")
-    '("dnd" "GTK_ICON_SIZE_DND" "5")
-    '("dialog" "GTK_ICON_SIZE_DIALOG" "6")
+    '("open" "GTK_FILE_CHOOSER_ACTION_OPEN" "0")
+    '("save" "GTK_FILE_CHOOSER_ACTION_SAVE" "1")
+    '("select_folder" "GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER" "2")
+    '("create_folder" "GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER" "3")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_SENSITIVITY_AUTO,
-;;   GTK_SENSITIVITY_ON,
-;;   GTK_SENSITIVITY_OFF
-;; } GtkSensitivityType;
-
-(define-enum-extended SensitivityType
+(define-enum-extended FileChooserConfirmation
   (in-module "Gtk")
-  (c-name "GtkSensitivityType")
+  (c-name "GtkFileChooserConfirmation")
   (values
-    '("auto" "GTK_SENSITIVITY_AUTO" "0")
-    '("on" "GTK_SENSITIVITY_ON" "1")
-    '("off" "GTK_SENSITIVITY_OFF" "2")
+    '("confirm" "GTK_FILE_CHOOSER_CONFIRMATION_CONFIRM" "0")
+    '("accept_filename" "GTK_FILE_CHOOSER_CONFIRMATION_ACCEPT_FILENAME" "1")
+    '("select_again" "GTK_FILE_CHOOSER_CONFIRMATION_SELECT_AGAIN" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_TEXT_DIR_NONE,
-;;   GTK_TEXT_DIR_LTR,
-;;   GTK_TEXT_DIR_RTL
-;; } GtkTextDirection;
-
-(define-enum-extended TextDirection
+(define-enum-extended FileChooserError
   (in-module "Gtk")
-  (c-name "GtkTextDirection")
+  (c-name "GtkFileChooserError")
   (values
-    '("none" "GTK_TEXT_DIR_NONE" "0")
-    '("ltr" "GTK_TEXT_DIR_LTR" "1")
-    '("rtl" "GTK_TEXT_DIR_RTL" "2")
+    '("nonexistent" "GTK_FILE_CHOOSER_ERROR_NONEXISTENT" "0")
+    '("bad_filename" "GTK_FILE_CHOOSER_ERROR_BAD_FILENAME" "1")
+    '("already_exists" "GTK_FILE_CHOOSER_ERROR_ALREADY_EXISTS" "2")
+    '("incomplete_hostname" "GTK_FILE_CHOOSER_ERROR_INCOMPLETE_HOSTNAME" "3")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_JUSTIFY_LEFT,
-;;   GTK_JUSTIFY_RIGHT,
-;;   GTK_JUSTIFY_CENTER,
-;;   GTK_JUSTIFY_FILL
-;; } GtkJustification;
-
-(define-enum-extended Justification
+(define-flags-extended FileFilterFlags
   (in-module "Gtk")
-  (c-name "GtkJustification")
+  (c-name "GtkFileFilterFlags")
   (values
-    '("left" "GTK_JUSTIFY_LEFT" "0")
-    '("right" "GTK_JUSTIFY_RIGHT" "1")
-    '("center" "GTK_JUSTIFY_CENTER" "2")
-    '("fill" "GTK_JUSTIFY_FILL" "3")
+    '("filename" "GTK_FILE_FILTER_FILENAME" "1")
+    '("uri" "GTK_FILE_FILTER_URI" "2")
+    '("display_name" "GTK_FILE_FILTER_DISPLAY_NAME" "4")
+    '("mime_type" "GTK_FILE_FILTER_MIME_TYPE" "8")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_MENU_DIR_PARENT,
-;;   GTK_MENU_DIR_CHILD,
-;;   GTK_MENU_DIR_NEXT,
-;;   GTK_MENU_DIR_PREV
-;; } GtkMenuDirectionType;
-
-(define-enum-extended MenuDirectionType
+(define-enum-extended IMPreeditStyle
   (in-module "Gtk")
-  (c-name "GtkMenuDirectionType")
+  (c-name "GtkIMPreeditStyle")
   (values
-    '("parent" "GTK_MENU_DIR_PARENT" "0")
-    '("child" "GTK_MENU_DIR_CHILD" "1")
-    '("next" "GTK_MENU_DIR_NEXT" "2")
-    '("prev" "GTK_MENU_DIR_PREV" "3")
+    '("nothing" "GTK_IM_PREEDIT_NOTHING" "0")
+    '("callback" "GTK_IM_PREEDIT_CALLBACK" "1")
+    '("none" "GTK_IM_PREEDIT_NONE" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_MESSAGE_INFO,
-;;   GTK_MESSAGE_WARNING,
-;;   GTK_MESSAGE_QUESTION,
-;;   GTK_MESSAGE_ERROR,
-;;   GTK_MESSAGE_OTHER
-;; } GtkMessageType;
-
-(define-enum-extended MessageType
+(define-enum-extended IMStatusStyle
   (in-module "Gtk")
-  (c-name "GtkMessageType")
+  (c-name "GtkIMStatusStyle")
   (values
-    '("info" "GTK_MESSAGE_INFO" "0")
-    '("warning" "GTK_MESSAGE_WARNING" "1")
-    '("question" "GTK_MESSAGE_QUESTION" "2")
-    '("error" "GTK_MESSAGE_ERROR" "3")
-    '("other" "GTK_MESSAGE_OTHER" "4")
+    '("nothing" "GTK_IM_STATUS_NOTHING" "0")
+    '("callback" "GTK_IM_STATUS_CALLBACK" "1")
+    '("none" "GTK_IM_STATUS_NONE" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_MOVEMENT_LOGICAL_POSITIONS,
-;;   GTK_MOVEMENT_VISUAL_POSITIONS,
-;;   GTK_MOVEMENT_WORDS,
-;;   GTK_MOVEMENT_DISPLAY_LINES,
-;;   GTK_MOVEMENT_DISPLAY_LINE_ENDS,
-;;   GTK_MOVEMENT_PARAGRAPHS,
-;;   GTK_MOVEMENT_PARAGRAPH_ENDS,
-;;   GTK_MOVEMENT_PAGES,
-;;   GTK_MOVEMENT_BUFFER_ENDS,
-;;   GTK_MOVEMENT_HORIZONTAL_PAGES
-;; } GtkMovementStep;
-
-(define-enum-extended MovementStep
+(define-flags-extended IconLookupFlags
   (in-module "Gtk")
-  (c-name "GtkMovementStep")
+  (c-name "GtkIconLookupFlags")
   (values
-    '("logical-positions" "GTK_MOVEMENT_LOGICAL_POSITIONS" "0")
-    '("visual-positions" "GTK_MOVEMENT_VISUAL_POSITIONS" "1")
-    '("words" "GTK_MOVEMENT_WORDS" "2")
-    '("display-lines" "GTK_MOVEMENT_DISPLAY_LINES" "3")
-    '("display-line-ends" "GTK_MOVEMENT_DISPLAY_LINE_ENDS" "4")
-    '("paragraphs" "GTK_MOVEMENT_PARAGRAPHS" "5")
-    '("paragraph-ends" "GTK_MOVEMENT_PARAGRAPH_ENDS" "6")
-    '("pages" "GTK_MOVEMENT_PAGES" "7")
-    '("buffer-ends" "GTK_MOVEMENT_BUFFER_ENDS" "8")
-    '("horizontal-pages" "GTK_MOVEMENT_HORIZONTAL_PAGES" "9")
+    '("no_svg" "GTK_ICON_LOOKUP_NO_SVG" "1")
+    '("force_svg" "GTK_ICON_LOOKUP_FORCE_SVG" "2")
+    '("use_builtin" "GTK_ICON_LOOKUP_USE_BUILTIN" "4")
+    '("generic_fallback" "GTK_ICON_LOOKUP_GENERIC_FALLBACK" "8")
+    '("force_size" "GTK_ICON_LOOKUP_FORCE_SIZE" "16")
+    '("force_regular" "GTK_ICON_LOOKUP_FORCE_REGULAR" "32")
+    '("force_symbolic" "GTK_ICON_LOOKUP_FORCE_SYMBOLIC" "64")
+    '("dir_ltr" "GTK_ICON_LOOKUP_DIR_LTR" "128")
+    '("dir_rtl" "GTK_ICON_LOOKUP_DIR_RTL" "256")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_SCROLL_STEPS,
-;;   GTK_SCROLL_PAGES,
-;;   GTK_SCROLL_ENDS,
-;;   GTK_SCROLL_HORIZONTAL_STEPS,
-;;   GTK_SCROLL_HORIZONTAL_PAGES,
-;;   GTK_SCROLL_HORIZONTAL_ENDS
-;; } GtkScrollStep;
-
-(define-enum-extended ScrollStep
+(define-enum-extended IconSize
   (in-module "Gtk")
-  (c-name "GtkScrollStep")
+  (c-name "GtkIconSize")
   (values
-    '("steps" "GTK_SCROLL_STEPS" "0")
-    '("pages" "GTK_SCROLL_PAGES" "1")
-    '("ends" "GTK_SCROLL_ENDS" "2")
-    '("horizontal-steps" "GTK_SCROLL_HORIZONTAL_STEPS" "3")
-    '("horizontal-pages" "GTK_SCROLL_HORIZONTAL_PAGES" "4")
-    '("horizontal-ends" "GTK_SCROLL_HORIZONTAL_ENDS" "5")
+    '("invalid" "GTK_ICON_SIZE_INVALID" "0")
+    '("menu" "GTK_ICON_SIZE_MENU" "1")
+    '("small_toolbar" "GTK_ICON_SIZE_SMALL_TOOLBAR" "2")
+    '("large_toolbar" "GTK_ICON_SIZE_LARGE_TOOLBAR" "3")
+    '("button" "GTK_ICON_SIZE_BUTTON" "4")
+    '("dnd" "GTK_ICON_SIZE_DND" "5")
+    '("dialog" "GTK_ICON_SIZE_DIALOG" "6")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_ORIENTATION_HORIZONTAL,
-;;   GTK_ORIENTATION_VERTICAL
-;; } GtkOrientation;
-
-(define-enum-extended Orientation
+(define-enum-extended IconThemeError
   (in-module "Gtk")
-  (c-name "GtkOrientation")
+  (c-name "GtkIconThemeError")
   (values
-    '("horizontal" "GTK_ORIENTATION_HORIZONTAL" "0")
-    '("vertical" "GTK_ORIENTATION_VERTICAL" "1")
+    '("not_found" "GTK_ICON_THEME_NOT_FOUND" "0")
+    '("failed" "GTK_ICON_THEME_FAILED" "1")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_PACK_START,
-;;   GTK_PACK_END
-;; } GtkPackType;
-
-(define-enum-extended PackType
+(define-enum-extended IconViewDropPosition
   (in-module "Gtk")
-  (c-name "GtkPackType")
+  (c-name "GtkIconViewDropPosition")
   (values
-    '("start" "GTK_PACK_START" "0")
-    '("end" "GTK_PACK_END" "1")
+    '("no_drop" "GTK_ICON_VIEW_NO_DROP" "0")
+    '("drop_into" "GTK_ICON_VIEW_DROP_INTO" "1")
+    '("drop_left" "GTK_ICON_VIEW_DROP_LEFT" "2")
+    '("drop_right" "GTK_ICON_VIEW_DROP_RIGHT" "3")
+    '("drop_above" "GTK_ICON_VIEW_DROP_ABOVE" "4")
+    '("drop_below" "GTK_ICON_VIEW_DROP_BELOW" "5")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_POS_LEFT,
-;;   GTK_POS_RIGHT,
-;;   GTK_POS_TOP,
-;;   GTK_POS_BOTTOM
-;; } GtkPositionType;
-
-(define-enum-extended PositionType
+(define-enum-extended ImageType
   (in-module "Gtk")
-  (c-name "GtkPositionType")
+  (c-name "GtkImageType")
   (values
-    '("left" "GTK_POS_LEFT" "0")
-    '("right" "GTK_POS_RIGHT" "1")
-    '("top" "GTK_POS_TOP" "2")
-    '("bottom" "GTK_POS_BOTTOM" "3")
+    '("empty" "GTK_IMAGE_EMPTY" "0")
+    '("pixbuf" "GTK_IMAGE_PIXBUF" "1")
+    '("stock" "GTK_IMAGE_STOCK" "2")
+    '("icon_set" "GTK_IMAGE_ICON_SET" "3")
+    '("animation" "GTK_IMAGE_ANIMATION" "4")
+    '("icon_name" "GTK_IMAGE_ICON_NAME" "5")
+    '("gicon" "GTK_IMAGE_GICON" "6")
+    '("surface" "GTK_IMAGE_SURFACE" "7")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_RELIEF_NORMAL,
-;;   GTK_RELIEF_HALF,
-;;   GTK_RELIEF_NONE
-;; } GtkReliefStyle;
-
-(define-enum-extended ReliefStyle
+(define-flags-extended InputHints
   (in-module "Gtk")
-  (c-name "GtkReliefStyle")
+  (c-name "GtkInputHints")
   (values
-    '("normal" "GTK_RELIEF_NORMAL" "0")
-    '("half" "GTK_RELIEF_HALF" "1")
-    '("none" "GTK_RELIEF_NONE" "2")
+    '("none" "GTK_INPUT_HINT_NONE" "0")
+    '("spellcheck" "GTK_INPUT_HINT_SPELLCHECK" "1")
+    '("no_spellcheck" "GTK_INPUT_HINT_NO_SPELLCHECK" "2")
+    '("word_completion" "GTK_INPUT_HINT_WORD_COMPLETION" "4")
+    '("lowercase" "GTK_INPUT_HINT_LOWERCASE" "8")
+    '("uppercase_chars" "GTK_INPUT_HINT_UPPERCASE_CHARS" "16")
+    '("uppercase_words" "GTK_INPUT_HINT_UPPERCASE_WORDS" "32")
+    '("uppercase_sentences" "GTK_INPUT_HINT_UPPERCASE_SENTENCES" "64")
+    '("inhibit_osk" "GTK_INPUT_HINT_INHIBIT_OSK" "128")
+    '("vertical_writing" "GTK_INPUT_HINT_VERTICAL_WRITING" "256")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_SCROLL_NONE,
-;;   GTK_SCROLL_JUMP,
-;;   GTK_SCROLL_STEP_BACKWARD,
-;;   GTK_SCROLL_STEP_FORWARD,
-;;   GTK_SCROLL_PAGE_BACKWARD,
-;;   GTK_SCROLL_PAGE_FORWARD,
-;;   GTK_SCROLL_STEP_UP,
-;;   GTK_SCROLL_STEP_DOWN,
-;;   GTK_SCROLL_PAGE_UP,
-;;   GTK_SCROLL_PAGE_DOWN,
-;;   GTK_SCROLL_STEP_LEFT,
-;;   GTK_SCROLL_STEP_RIGHT,
-;;   GTK_SCROLL_PAGE_LEFT,
-;;   GTK_SCROLL_PAGE_RIGHT,
-;;   GTK_SCROLL_START,
-;;   GTK_SCROLL_END
-;; } GtkScrollType;
-
-(define-enum-extended ScrollType
+(define-enum-extended InputPurpose
   (in-module "Gtk")
-  (c-name "GtkScrollType")
+  (c-name "GtkInputPurpose")
   (values
-    '("none" "GTK_SCROLL_NONE" "0")
-    '("jump" "GTK_SCROLL_JUMP" "1")
-    '("step-backward" "GTK_SCROLL_STEP_BACKWARD" "2")
-    '("step-forward" "GTK_SCROLL_STEP_FORWARD" "3")
-    '("page-backward" "GTK_SCROLL_PAGE_BACKWARD" "4")
-    '("page-forward" "GTK_SCROLL_PAGE_FORWARD" "5")
-    '("step-up" "GTK_SCROLL_STEP_UP" "6")
-    '("step-down" "GTK_SCROLL_STEP_DOWN" "7")
-    '("page-up" "GTK_SCROLL_PAGE_UP" "8")
-    '("page-down" "GTK_SCROLL_PAGE_DOWN" "9")
-    '("step-left" "GTK_SCROLL_STEP_LEFT" "10")
-    '("step-right" "GTK_SCROLL_STEP_RIGHT" "11")
-    '("page-left" "GTK_SCROLL_PAGE_LEFT" "12")
-    '("page-right" "GTK_SCROLL_PAGE_RIGHT" "13")
-    '("start" "GTK_SCROLL_START" "14")
-    '("end" "GTK_SCROLL_END" "15")
+    '("free_form" "GTK_INPUT_PURPOSE_FREE_FORM" "0")
+    '("alpha" "GTK_INPUT_PURPOSE_ALPHA" "1")
+    '("digits" "GTK_INPUT_PURPOSE_DIGITS" "2")
+    '("number" "GTK_INPUT_PURPOSE_NUMBER" "3")
+    '("phone" "GTK_INPUT_PURPOSE_PHONE" "4")
+    '("url" "GTK_INPUT_PURPOSE_URL" "5")
+    '("email" "GTK_INPUT_PURPOSE_EMAIL" "6")
+    '("name" "GTK_INPUT_PURPOSE_NAME" "7")
+    '("password" "GTK_INPUT_PURPOSE_PASSWORD" "8")
+    '("pin" "GTK_INPUT_PURPOSE_PIN" "9")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_SELECTION_NONE,
-;;   GTK_SELECTION_SINGLE,
-;;   GTK_SELECTION_BROWSE,
-;;   GTK_SELECTION_MULTIPLE
-;; } GtkSelectionMode;
-
-(define-enum-extended SelectionMode
+(define-flags-extended JunctionSides
   (in-module "Gtk")
-  (c-name "GtkSelectionMode")
+  (c-name "GtkJunctionSides")
   (values
-    '("none" "GTK_SELECTION_NONE" "0")
-    '("single" "GTK_SELECTION_SINGLE" "1")
-    '("browse" "GTK_SELECTION_BROWSE" "2")
-    '("multiple" "GTK_SELECTION_MULTIPLE" "3")
+    '("none" "GTK_JUNCTION_NONE" "0")
+    '("corner_topleft" "GTK_JUNCTION_CORNER_TOPLEFT" "1")
+    '("corner_topright" "GTK_JUNCTION_CORNER_TOPRIGHT" "2")
+    '("corner_bottomleft" "GTK_JUNCTION_CORNER_BOTTOMLEFT" "4")
+    '("corner_bottomright" "GTK_JUNCTION_CORNER_BOTTOMRIGHT" "8")
+    '("top" "GTK_JUNCTION_TOP" "3")
+    '("bottom" "GTK_JUNCTION_BOTTOM" "12")
+    '("left" "GTK_JUNCTION_LEFT" "5")
+    '("right" "GTK_JUNCTION_RIGHT" "10")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_SHADOW_NONE,
-;;   GTK_SHADOW_IN,
-;;   GTK_SHADOW_OUT,
-;;   GTK_SHADOW_ETCHED_IN,
-;;   GTK_SHADOW_ETCHED_OUT
-;; } GtkShadowType;
-
-(define-enum-extended ShadowType
+(define-enum-extended Justification
   (in-module "Gtk")
-  (c-name "GtkShadowType")
+  (c-name "GtkJustification")
   (values
-    '("none" "GTK_SHADOW_NONE" "0")
-    '("in" "GTK_SHADOW_IN" "1")
-    '("out" "GTK_SHADOW_OUT" "2")
-    '("etched-in" "GTK_SHADOW_ETCHED_IN" "3")
-    '("etched-out" "GTK_SHADOW_ETCHED_OUT" "4")
+    '("left" "GTK_JUSTIFY_LEFT" "0")
+    '("right" "GTK_JUSTIFY_RIGHT" "1")
+    '("center" "GTK_JUSTIFY_CENTER" "2")
+    '("fill" "GTK_JUSTIFY_FILL" "3")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_STATE_NORMAL,
-;;   GTK_STATE_ACTIVE,
-;;   GTK_STATE_PRELIGHT,
-;;   GTK_STATE_SELECTED,
-;;   GTK_STATE_INSENSITIVE,
-;;   GTK_STATE_INCONSISTENT,
-;;   GTK_STATE_FOCUSED
-;; } GtkStateType;
-
-(define-enum-extended StateType
+(define-enum-extended LevelBarMode
   (in-module "Gtk")
-  (c-name "GtkStateType")
+  (c-name "GtkLevelBarMode")
   (values
-    '("normal" "GTK_STATE_NORMAL" "0")
-    '("active" "GTK_STATE_ACTIVE" "1")
-    '("prelight" "GTK_STATE_PRELIGHT" "2")
-    '("selected" "GTK_STATE_SELECTED" "3")
-    '("insensitive" "GTK_STATE_INSENSITIVE" "4")
-    '("inconsistent" "GTK_STATE_INCONSISTENT" "5")
-    '("focused" "GTK_STATE_FOCUSED" "6")
+    '("continuous" "GTK_LEVEL_BAR_MODE_CONTINUOUS" "0")
+    '("discrete" "GTK_LEVEL_BAR_MODE_DISCRETE" "1")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_TOOLBAR_ICONS,
-;;   GTK_TOOLBAR_TEXT,
-;;   GTK_TOOLBAR_BOTH,
-;;   GTK_TOOLBAR_BOTH_HORIZ
-;; } GtkToolbarStyle;
-
-(define-enum-extended ToolbarStyle
+(define-enum-extended License
   (in-module "Gtk")
-  (c-name "GtkToolbarStyle")
+  (c-name "GtkLicense")
   (values
-    '("icons" "GTK_TOOLBAR_ICONS" "0")
-    '("text" "GTK_TOOLBAR_TEXT" "1")
-    '("both" "GTK_TOOLBAR_BOTH" "2")
-    '("both-horiz" "GTK_TOOLBAR_BOTH_HORIZ" "3")
+    '("unknown" "GTK_LICENSE_UNKNOWN" "0")
+    '("custom" "GTK_LICENSE_CUSTOM" "1")
+    '("gpl_2_0" "GTK_LICENSE_GPL_2_0" "2")
+    '("gpl_3_0" "GTK_LICENSE_GPL_3_0" "3")
+    '("lgpl_2_1" "GTK_LICENSE_LGPL_2_1" "4")
+    '("lgpl_3_0" "GTK_LICENSE_LGPL_3_0" "5")
+    '("bsd" "GTK_LICENSE_BSD" "6")
+    '("mit_x11" "GTK_LICENSE_MIT_X11" "7")
+    '("artistic" "GTK_LICENSE_ARTISTIC" "8")
+    '("gpl_2_0_only" "GTK_LICENSE_GPL_2_0_ONLY" "9")
+    '("gpl_3_0_only" "GTK_LICENSE_GPL_3_0_ONLY" "10")
+    '("lgpl_2_1_only" "GTK_LICENSE_LGPL_2_1_ONLY" "11")
+    '("lgpl_3_0_only" "GTK_LICENSE_LGPL_3_0_ONLY" "12")
+    '("agpl_3_0" "GTK_LICENSE_AGPL_3_0" "13")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_WRAP_NONE,
-;;   GTK_WRAP_CHAR,
-;;   GTK_WRAP_WORD,
-;;   GTK_WRAP_WORD_CHAR
-;; } GtkWrapMode;
-
-(define-enum-extended WrapMode
+(define-enum-extended MenuDirectionType
   (in-module "Gtk")
-  (c-name "GtkWrapMode")
+  (c-name "GtkMenuDirectionType")
   (values
-    '("none" "GTK_WRAP_NONE" "0")
-    '("char" "GTK_WRAP_CHAR" "1")
-    '("word" "GTK_WRAP_WORD" "2")
-    '("word-char" "GTK_WRAP_WORD_CHAR" "3")
+    '("parent" "GTK_MENU_DIR_PARENT" "0")
+    '("child" "GTK_MENU_DIR_CHILD" "1")
+    '("next" "GTK_MENU_DIR_NEXT" "2")
+    '("prev" "GTK_MENU_DIR_PREV" "3")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_SORT_ASCENDING,
-;;   GTK_SORT_DESCENDING
-;; } GtkSortType;
-
-(define-enum-extended SortType
+(define-enum-extended MessageType
   (in-module "Gtk")
-  (c-name "GtkSortType")
+  (c-name "GtkMessageType")
   (values
-    '("ascending" "GTK_SORT_ASCENDING" "0")
-    '("descending" "GTK_SORT_DESCENDING" "1")
+    '("info" "GTK_MESSAGE_INFO" "0")
+    '("warning" "GTK_MESSAGE_WARNING" "1")
+    '("question" "GTK_MESSAGE_QUESTION" "2")
+    '("error" "GTK_MESSAGE_ERROR" "3")
+    '("other" "GTK_MESSAGE_OTHER" "4")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_IM_PREEDIT_NOTHING,
-;;   GTK_IM_PREEDIT_CALLBACK,
-;;   GTK_IM_PREEDIT_NONE
-;; } GtkIMPreeditStyle;
-
-(define-enum-extended IMPreeditStyle
+(define-enum-extended MovementStep
   (in-module "Gtk")
-  (c-name "GtkIMPreeditStyle")
+  (c-name "GtkMovementStep")
   (values
-    '("nothing" "GTK_IM_PREEDIT_NOTHING" "0")
-    '("callback" "GTK_IM_PREEDIT_CALLBACK" "1")
-    '("none" "GTK_IM_PREEDIT_NONE" "2")
+    '("logical_positions" "GTK_MOVEMENT_LOGICAL_POSITIONS" "0")
+    '("visual_positions" "GTK_MOVEMENT_VISUAL_POSITIONS" "1")
+    '("words" "GTK_MOVEMENT_WORDS" "2")
+    '("display_lines" "GTK_MOVEMENT_DISPLAY_LINES" "3")
+    '("display_line_ends" "GTK_MOVEMENT_DISPLAY_LINE_ENDS" "4")
+    '("paragraphs" "GTK_MOVEMENT_PARAGRAPHS" "5")
+    '("paragraph_ends" "GTK_MOVEMENT_PARAGRAPH_ENDS" "6")
+    '("pages" "GTK_MOVEMENT_PAGES" "7")
+    '("buffer_ends" "GTK_MOVEMENT_BUFFER_ENDS" "8")
+    '("horizontal_pages" "GTK_MOVEMENT_HORIZONTAL_PAGES" "9")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_IM_STATUS_NOTHING,
-;;   GTK_IM_STATUS_CALLBACK,
-;;   GTK_IM_STATUS_NONE
-;; } GtkIMStatusStyle;
+(define-enum-extended NotebookTab
+  (in-module "Gtk")
+  (c-name "GtkNotebookTab")
+  (values
+    '("first" "GTK_NOTEBOOK_TAB_FIRST" "0")
+    '("last" "GTK_NOTEBOOK_TAB_LAST" "1")
+  )
+)
 
-(define-enum-extended IMStatusStyle
+(define-enum-extended NumberUpLayout
   (in-module "Gtk")
-  (c-name "GtkIMStatusStyle")
+  (c-name "GtkNumberUpLayout")
   (values
-    '("nothing" "GTK_IM_STATUS_NOTHING" "0")
-    '("callback" "GTK_IM_STATUS_CALLBACK" "1")
-    '("none" "GTK_IM_STATUS_NONE" "2")
+    '("lrtb" "GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_TOP_TO_BOTTOM" "0")
+    '("lrbt" "GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_BOTTOM_TO_TOP" "1")
+    '("rltb" "GTK_NUMBER_UP_LAYOUT_RIGHT_TO_LEFT_TOP_TO_BOTTOM" "2")
+    '("rlbt" "GTK_NUMBER_UP_LAYOUT_RIGHT_TO_LEFT_BOTTOM_TO_TOP" "3")
+    '("tblr" "GTK_NUMBER_UP_LAYOUT_TOP_TO_BOTTOM_LEFT_TO_RIGHT" "4")
+    '("tbrl" "GTK_NUMBER_UP_LAYOUT_TOP_TO_BOTTOM_RIGHT_TO_LEFT" "5")
+    '("btlr" "GTK_NUMBER_UP_LAYOUT_BOTTOM_TO_TOP_LEFT_TO_RIGHT" "6")
+    '("btrl" "GTK_NUMBER_UP_LAYOUT_BOTTOM_TO_TOP_RIGHT_TO_LEFT" "7")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_PACK_DIRECTION_LTR,
-;;   GTK_PACK_DIRECTION_RTL,
-;;   GTK_PACK_DIRECTION_TTB,
-;;   GTK_PACK_DIRECTION_BTT
-;; } GtkPackDirection;
+(define-enum-extended Orientation
+  (in-module "Gtk")
+  (c-name "GtkOrientation")
+  (values
+    '("horizontal" "GTK_ORIENTATION_HORIZONTAL" "0")
+    '("vertical" "GTK_ORIENTATION_VERTICAL" "1")
+  )
+)
 
 (define-enum-extended PackDirection
   (in-module "Gtk")
@@ -1088,458 +671,202 @@
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_PRINT_PAGES_ALL,
-;;   GTK_PRINT_PAGES_CURRENT,
-;;   GTK_PRINT_PAGES_RANGES,
-;;   GTK_PRINT_PAGES_SELECTION
-;; } GtkPrintPages;
-
-(define-enum-extended PrintPages
-  (in-module "Gtk")
-  (c-name "GtkPrintPages")
-  (values
-    '("all" "GTK_PRINT_PAGES_ALL" "0")
-    '("current" "GTK_PRINT_PAGES_CURRENT" "1")
-    '("ranges" "GTK_PRINT_PAGES_RANGES" "2")
-    '("selection" "GTK_PRINT_PAGES_SELECTION" "3")
-  )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_PAGE_SET_ALL,
-;;   GTK_PAGE_SET_EVEN,
-;;   GTK_PAGE_SET_ODD
-;; } GtkPageSet;
-
-(define-enum-extended PageSet
+(define-enum-extended PackType
   (in-module "Gtk")
-  (c-name "GtkPageSet")
+  (c-name "GtkPackType")
   (values
-    '("all" "GTK_PAGE_SET_ALL" "0")
-    '("even" "GTK_PAGE_SET_EVEN" "1")
-    '("odd" "GTK_PAGE_SET_ODD" "2")
+    '("start" "GTK_PACK_START" "0")
+    '("end" "GTK_PACK_END" "1")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_TOP_TO_BOTTOM, /*< nick=lrtb >*/
-;;   GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_BOTTOM_TO_TOP, /*< nick=lrbt >*/
-;;   GTK_NUMBER_UP_LAYOUT_RIGHT_TO_LEFT_TOP_TO_BOTTOM, /*< nick=rltb >*/
-;;   GTK_NUMBER_UP_LAYOUT_RIGHT_TO_LEFT_BOTTOM_TO_TOP, /*< nick=rlbt >*/
-;;   GTK_NUMBER_UP_LAYOUT_TOP_TO_BOTTOM_LEFT_TO_RIGHT, /*< nick=tblr >*/
-;;   GTK_NUMBER_UP_LAYOUT_TOP_TO_BOTTOM_RIGHT_TO_LEFT, /*< nick=tbrl >*/
-;;   GTK_NUMBER_UP_LAYOUT_BOTTOM_TO_TOP_LEFT_TO_RIGHT, /*< nick=btlr >*/
-;;   GTK_NUMBER_UP_LAYOUT_BOTTOM_TO_TOP_RIGHT_TO_LEFT  /*< nick=btrl >*/
-;; } GtkNumberUpLayout;
-
-(define-enum-extended NumberUpLayout
+(define-enum-extended PadActionType
   (in-module "Gtk")
-  (c-name "GtkNumberUpLayout")
+  (c-name "GtkPadActionType")
   (values
-    '("left-to-right-top-to-bottom" "GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_TOP_TO_BOTTOM" "0")
-    '("left-to-right-bottom-to-top" "GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_BOTTOM_TO_TOP" "1")
-    '("right-to-left-top-to-bottom" "GTK_NUMBER_UP_LAYOUT_RIGHT_TO_LEFT_TOP_TO_BOTTOM" "2")
-    '("right-to-left-bottom-to-top" "GTK_NUMBER_UP_LAYOUT_RIGHT_TO_LEFT_BOTTOM_TO_TOP" "3")
-    '("top-to-bottom-left-to-right" "GTK_NUMBER_UP_LAYOUT_TOP_TO_BOTTOM_LEFT_TO_RIGHT" "4")
-    '("top-to-bottom-right-to-left" "GTK_NUMBER_UP_LAYOUT_TOP_TO_BOTTOM_RIGHT_TO_LEFT" "5")
-    '("bottom-to-top-left-to-right" "GTK_NUMBER_UP_LAYOUT_BOTTOM_TO_TOP_LEFT_TO_RIGHT" "6")
-    '("bottom-to-top-right-to-left" "GTK_NUMBER_UP_LAYOUT_BOTTOM_TO_TOP_RIGHT_TO_LEFT" "7")
+    '("button" "GTK_PAD_ACTION_BUTTON" "0")
+    '("ring" "GTK_PAD_ACTION_RING" "1")
+    '("strip" "GTK_PAD_ACTION_STRIP" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_PAGE_ORIENTATION_PORTRAIT,
-;;   GTK_PAGE_ORIENTATION_LANDSCAPE,
-;;   GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT,
-;;   GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE
-;; } GtkPageOrientation;
-
 (define-enum-extended PageOrientation
   (in-module "Gtk")
   (c-name "GtkPageOrientation")
   (values
     '("portrait" "GTK_PAGE_ORIENTATION_PORTRAIT" "0")
     '("landscape" "GTK_PAGE_ORIENTATION_LANDSCAPE" "1")
-    '("reverse-portrait" "GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT" "2")
-    '("reverse-landscape" "GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE" "3")
+    '("reverse_portrait" "GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT" "2")
+    '("reverse_landscape" "GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE" "3")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_PRINT_QUALITY_LOW,
-;;   GTK_PRINT_QUALITY_NORMAL,
-;;   GTK_PRINT_QUALITY_HIGH,
-;;   GTK_PRINT_QUALITY_DRAFT
-;; } GtkPrintQuality;
-
-(define-enum-extended PrintQuality
+(define-enum-extended PageSet
   (in-module "Gtk")
-  (c-name "GtkPrintQuality")
+  (c-name "GtkPageSet")
   (values
-    '("low" "GTK_PRINT_QUALITY_LOW" "0")
-    '("normal" "GTK_PRINT_QUALITY_NORMAL" "1")
-    '("high" "GTK_PRINT_QUALITY_HIGH" "2")
-    '("draft" "GTK_PRINT_QUALITY_DRAFT" "3")
+    '("all" "GTK_PAGE_SET_ALL" "0")
+    '("even" "GTK_PAGE_SET_EVEN" "1")
+    '("odd" "GTK_PAGE_SET_ODD" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_PRINT_DUPLEX_SIMPLEX,
-;;   GTK_PRINT_DUPLEX_HORIZONTAL,
-;;   GTK_PRINT_DUPLEX_VERTICAL
-;; } GtkPrintDuplex;
-
-(define-enum-extended PrintDuplex
+(define-enum-extended PanDirection
   (in-module "Gtk")
-  (c-name "GtkPrintDuplex")
+  (c-name "GtkPanDirection")
   (values
-    '("simplex" "GTK_PRINT_DUPLEX_SIMPLEX" "0")
-    '("horizontal" "GTK_PRINT_DUPLEX_HORIZONTAL" "1")
-    '("vertical" "GTK_PRINT_DUPLEX_VERTICAL" "2")
+    '("left" "GTK_PAN_DIRECTION_LEFT" "0")
+    '("right" "GTK_PAN_DIRECTION_RIGHT" "1")
+    '("up" "GTK_PAN_DIRECTION_UP" "2")
+    '("down" "GTK_PAN_DIRECTION_DOWN" "3")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_UNIT_NONE,
-;;   GTK_UNIT_POINTS,
-;;   GTK_UNIT_INCH,
-;;   GTK_UNIT_MM
-;; } GtkUnit;
-
-(define-enum-extended Unit
+(define-enum-extended PathPriorityType
   (in-module "Gtk")
-  (c-name "GtkUnit")
+  (c-name "GtkPathPriorityType")
   (values
-    '("none" "GTK_UNIT_NONE" "0")
-    '("points" "GTK_UNIT_POINTS" "1")
-    '("inch" "GTK_UNIT_INCH" "2")
-    '("mm" "GTK_UNIT_MM" "3")
+    '("lowest" "GTK_PATH_PRIO_LOWEST" "0")
+    '("gtk" "GTK_PATH_PRIO_GTK" "4")
+    '("application" "GTK_PATH_PRIO_APPLICATION" "8")
+    '("theme" "GTK_PATH_PRIO_THEME" "10")
+    '("rc" "GTK_PATH_PRIO_RC" "12")
+    '("highest" "GTK_PATH_PRIO_HIGHEST" "15")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_TREE_VIEW_GRID_LINES_NONE,
-;;   GTK_TREE_VIEW_GRID_LINES_HORIZONTAL,
-;;   GTK_TREE_VIEW_GRID_LINES_VERTICAL,
-;;   GTK_TREE_VIEW_GRID_LINES_BOTH
-;; } GtkTreeViewGridLines;
-
-(define-enum-extended TreeViewGridLines
+(define-enum-extended PathType
   (in-module "Gtk")
-  (c-name "GtkTreeViewGridLines")
+  (c-name "GtkPathType")
   (values
-    '("none" "GTK_TREE_VIEW_GRID_LINES_NONE" "0")
-    '("horizontal" "GTK_TREE_VIEW_GRID_LINES_HORIZONTAL" "1")
-    '("vertical" "GTK_TREE_VIEW_GRID_LINES_VERTICAL" "2")
-    '("both" "GTK_TREE_VIEW_GRID_LINES_BOTH" "3")
+    '("widget" "GTK_PATH_WIDGET" "0")
+    '("widget_class" "GTK_PATH_WIDGET_CLASS" "1")
+    '("class" "GTK_PATH_CLASS" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_DRAG_RESULT_SUCCESS,
-;;   GTK_DRAG_RESULT_NO_TARGET,
-;;   GTK_DRAG_RESULT_USER_CANCELLED,
-;;   GTK_DRAG_RESULT_TIMEOUT_EXPIRED,
-;;   GTK_DRAG_RESULT_GRAB_BROKEN,
-;;   GTK_DRAG_RESULT_ERROR
-;; } GtkDragResult;
-
-(define-enum-extended DragResult
+(define-flags-extended PlacesOpenFlags
   (in-module "Gtk")
-  (c-name "GtkDragResult")
+  (c-name "GtkPlacesOpenFlags")
   (values
-    '("success" "GTK_DRAG_RESULT_SUCCESS" "0")
-    '("no-target" "GTK_DRAG_RESULT_NO_TARGET" "1")
-    '("user-cancelled" "GTK_DRAG_RESULT_USER_CANCELLED" "2")
-    '("timeout-expired" "GTK_DRAG_RESULT_TIMEOUT_EXPIRED" "3")
-    '("grab-broken" "GTK_DRAG_RESULT_GRAB_BROKEN" "4")
-    '("error" "GTK_DRAG_RESULT_ERROR" "5")
+    '("normal" "GTK_PLACES_OPEN_NORMAL" "1")
+    '("new_tab" "GTK_PLACES_OPEN_NEW_TAB" "2")
+    '("new_window" "GTK_PLACES_OPEN_NEW_WINDOW" "4")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   GTK_SIZE_GROUP_NONE,
-;;   GTK_SIZE_GROUP_HORIZONTAL,
-;;   GTK_SIZE_GROUP_VERTICAL,
-;;   GTK_SIZE_GROUP_BOTH
-;; } GtkSizeGroupMode;
-
-(define-enum-extended SizeGroupMode
+(define-enum-extended PolicyType
   (in-module "Gtk")
-  (c-name "GtkSizeGroupMode")
+  (c-name "GtkPolicyType")
   (values
-    '("none" "GTK_SIZE_GROUP_NONE" "0")
-    '("horizontal" "GTK_SIZE_GROUP_HORIZONTAL" "1")
-    '("vertical" "GTK_SIZE_GROUP_VERTICAL" "2")
-    '("both" "GTK_SIZE_GROUP_BOTH" "3")
+    '("always" "GTK_POLICY_ALWAYS" "0")
+    '("automatic" "GTK_POLICY_AUTOMATIC" "1")
+    '("never" "GTK_POLICY_NEVER" "2")
+    '("external" "GTK_POLICY_EXTERNAL" "3")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH = 0,
-;;   GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT,
-;;   GTK_SIZE_REQUEST_CONSTANT_SIZE
-;; } GtkSizeRequestMode;
-
-(define-enum-extended SizeRequestMode
+(define-enum-extended PopoverConstraint
   (in-module "Gtk")
-  (c-name "GtkSizeRequestMode")
+  (c-name "GtkPopoverConstraint")
   (values
-    '("height-for-width" "GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH" "0")
-    '("width-for-height" "GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT" "1")
-    '("constant-size" "GTK_SIZE_REQUEST_CONSTANT_SIZE" "2")
+    '("none" "GTK_POPOVER_CONSTRAINT_NONE" "0")
+    '("window" "GTK_POPOVER_CONSTRAINT_WINDOW" "1")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_SCROLL_MINIMUM = 0,
-;;   GTK_SCROLL_NATURAL
-;; } GtkScrollablePolicy;
-
-(define-enum-extended ScrollablePolicy
+(define-enum-extended PositionType
   (in-module "Gtk")
-  (c-name "GtkScrollablePolicy")
+  (c-name "GtkPositionType")
   (values
-    '("minimum" "GTK_SCROLL_MINIMUM" "0")
-    '("natural" "GTK_SCROLL_NATURAL" "1")
+    '("left" "GTK_POS_LEFT" "0")
+    '("right" "GTK_POS_RIGHT" "1")
+    '("top" "GTK_POS_TOP" "2")
+    '("bottom" "GTK_POS_BOTTOM" "3")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_STATE_FLAG_NORMAL       = 0,
-;;   GTK_STATE_FLAG_ACTIVE       = 1 << 0,
-;;   GTK_STATE_FLAG_PRELIGHT     = 1 << 1,
-;;   GTK_STATE_FLAG_SELECTED     = 1 << 2,
-;;   GTK_STATE_FLAG_INSENSITIVE  = 1 << 3,
-;;   GTK_STATE_FLAG_INCONSISTENT = 1 << 4,
-;;   GTK_STATE_FLAG_FOCUSED      = 1 << 5,
-;;   GTK_STATE_FLAG_BACKDROP     = 1 << 6,
-;;   GTK_STATE_FLAG_DIR_LTR      = 1 << 7,
-;;   GTK_STATE_FLAG_DIR_RTL      = 1 << 8,
-;;   GTK_STATE_FLAG_LINK         = 1 << 9,
-;;   GTK_STATE_FLAG_VISITED      = 1 << 10,
-;;   GTK_STATE_FLAG_CHECKED      = 1 << 11,
-;;   GTK_STATE_FLAG_DROP_ACTIVE  = 1 << 12
-;; } GtkStateFlags;
-
-(define-flags-extended StateFlags
+(define-enum-extended PrintDuplex
   (in-module "Gtk")
-  (c-name "GtkStateFlags")
+  (c-name "GtkPrintDuplex")
   (values
-    '("normal" "GTK_STATE_FLAG_NORMAL" "0x0")
-    '("active" "GTK_STATE_FLAG_ACTIVE" "1 << 0")
-    '("prelight" "GTK_STATE_FLAG_PRELIGHT" "1 << 1")
-    '("selected" "GTK_STATE_FLAG_SELECTED" "1 << 2")
-    '("insensitive" "GTK_STATE_FLAG_INSENSITIVE" "1 << 3")
-    '("inconsistent" "GTK_STATE_FLAG_INCONSISTENT" "1 << 4")
-    '("focused" "GTK_STATE_FLAG_FOCUSED" "1 << 5")
-    '("backdrop" "GTK_STATE_FLAG_BACKDROP" "1 << 6")
-    '("dir-ltr" "GTK_STATE_FLAG_DIR_LTR" "1 << 7")
-    '("dir-rtl" "GTK_STATE_FLAG_DIR_RTL" "1 << 8")
-    '("link" "GTK_STATE_FLAG_LINK" "1 << 9")
-    '("visited" "GTK_STATE_FLAG_VISITED" "1 << 10")
-    '("checked" "GTK_STATE_FLAG_CHECKED" "1 << 11")
-    '("drop-active" "GTK_STATE_FLAG_DROP_ACTIVE" "1 << 12")
-  )
-)
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_REGION_EVEN    = 1 << 0,
-;;   GTK_REGION_ODD     = 1 << 1,
-;;   GTK_REGION_FIRST   = 1 << 2,
-;;   GTK_REGION_LAST    = 1 << 3,
-;;   GTK_REGION_ONLY    = 1 << 4,
-;;   GTK_REGION_SORTED  = 1 << 5
-;; } GtkRegionFlags;
+    '("simplex" "GTK_PRINT_DUPLEX_SIMPLEX" "0")
+    '("horizontal" "GTK_PRINT_DUPLEX_HORIZONTAL" "1")
+    '("vertical" "GTK_PRINT_DUPLEX_VERTICAL" "2")
+  )
+)
 
-(define-flags-extended RegionFlags
+(define-enum-extended PrintError
   (in-module "Gtk")
-  (c-name "GtkRegionFlags")
+  (c-name "GtkPrintError")
   (values
-    '("even" "GTK_REGION_EVEN" "1 << 0")
-    '("odd" "GTK_REGION_ODD" "1 << 1")
-    '("first" "GTK_REGION_FIRST" "1 << 2")
-    '("last" "GTK_REGION_LAST" "1 << 3")
-    '("only" "GTK_REGION_ONLY" "1 << 4")
-    '("sorted" "GTK_REGION_SORTED" "1 << 5")
+    '("general" "GTK_PRINT_ERROR_GENERAL" "0")
+    '("internal_error" "GTK_PRINT_ERROR_INTERNAL_ERROR" "1")
+    '("nomem" "GTK_PRINT_ERROR_NOMEM" "2")
+    '("invalid_file" "GTK_PRINT_ERROR_INVALID_FILE" "3")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   GTK_JUNCTION_NONE   = 0,
-;;   GTK_JUNCTION_CORNER_TOPLEFT = 1 << 0,
-;;   GTK_JUNCTION_CORNER_TOPRIGHT = 1 << 1,
-;;   GTK_JUNCTION_CORNER_BOTTOMLEFT = 1 << 2,
-;;   GTK_JUNCTION_CORNER_BOTTOMRIGHT = 1 << 3,
-;;   GTK_JUNCTION_TOP    = (GTK_JUNCTION_CORNER_TOPLEFT | GTK_JUNCTION_CORNER_TOPRIGHT),
-;;   GTK_JUNCTION_BOTTOM = (GTK_JUNCTION_CORNER_BOTTOMLEFT | GTK_JUNCTION_CORNER_BOTTOMRIGHT),
-;;   GTK_JUNCTION_LEFT   = (GTK_JUNCTION_CORNER_TOPLEFT | GTK_JUNCTION_CORNER_BOTTOMLEFT),
-;;   GTK_JUNCTION_RIGHT  = (GTK_JUNCTION_CORNER_TOPRIGHT | GTK_JUNCTION_CORNER_BOTTOMRIGHT)
-;; } GtkJunctionSides;
-
-(define-flags-extended JunctionSides
+(define-enum-extended PrintOperationAction
   (in-module "Gtk")
-  (c-name "GtkJunctionSides")
+  (c-name "GtkPrintOperationAction")
   (values
-    '("none" "GTK_JUNCTION_NONE" "0x0")
-    '("corner-topleft" "GTK_JUNCTION_CORNER_TOPLEFT" "1 << 0")
-    '("corner-topright" "GTK_JUNCTION_CORNER_TOPRIGHT" "1 << 1")
-    '("corner-bottomleft" "GTK_JUNCTION_CORNER_BOTTOMLEFT" "1 << 2")
-    '("corner-bottomright" "GTK_JUNCTION_CORNER_BOTTOMRIGHT" "1 << 3")
-    '("top" "GTK_JUNCTION_TOP" "0x3")
-    '("bottom" "GTK_JUNCTION_BOTTOM" "0xC")
-    '("left" "GTK_JUNCTION_LEFT" "0x5")
-    '("right" "GTK_JUNCTION_RIGHT" "0xA")
-  )
-)
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_BORDER_STYLE_NONE,
-;;   GTK_BORDER_STYLE_SOLID,
-;;   GTK_BORDER_STYLE_INSET,
-;;   GTK_BORDER_STYLE_OUTSET,
-;;   GTK_BORDER_STYLE_HIDDEN,
-;;   GTK_BORDER_STYLE_DOTTED,
-;;   GTK_BORDER_STYLE_DASHED,
-;;   GTK_BORDER_STYLE_DOUBLE,
-;;   GTK_BORDER_STYLE_GROOVE,
-;;   GTK_BORDER_STYLE_RIDGE
-;; } GtkBorderStyle;
+    '("print_dialog" "GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG" "0")
+    '("print" "GTK_PRINT_OPERATION_ACTION_PRINT" "1")
+    '("preview" "GTK_PRINT_OPERATION_ACTION_PREVIEW" "2")
+    '("export" "GTK_PRINT_OPERATION_ACTION_EXPORT" "3")
+  )
+)
 
-(define-enum-extended BorderStyle
+(define-enum-extended PrintOperationResult
   (in-module "Gtk")
-  (c-name "GtkBorderStyle")
+  (c-name "GtkPrintOperationResult")
   (values
-    '("none" "GTK_BORDER_STYLE_NONE" "0")
-    '("solid" "GTK_BORDER_STYLE_SOLID" "1")
-    '("inset" "GTK_BORDER_STYLE_INSET" "2")
-    '("outset" "GTK_BORDER_STYLE_OUTSET" "3")
-    '("hidden" "GTK_BORDER_STYLE_HIDDEN" "4")
-    '("dotted" "GTK_BORDER_STYLE_DOTTED" "5")
-    '("dashed" "GTK_BORDER_STYLE_DASHED" "6")
-    '("double" "GTK_BORDER_STYLE_DOUBLE" "7")
-    '("groove" "GTK_BORDER_STYLE_GROOVE" "8")
-    '("ridge" "GTK_BORDER_STYLE_RIDGE" "9")
+    '("error" "GTK_PRINT_OPERATION_RESULT_ERROR" "0")
+    '("apply" "GTK_PRINT_OPERATION_RESULT_APPLY" "1")
+    '("cancel" "GTK_PRINT_OPERATION_RESULT_CANCEL" "2")
+    '("in_progress" "GTK_PRINT_OPERATION_RESULT_IN_PROGRESS" "3")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   GTK_LEVEL_BAR_MODE_CONTINUOUS,
-;;   GTK_LEVEL_BAR_MODE_DISCRETE
-;; } GtkLevelBarMode;
-
-(define-enum-extended LevelBarMode
+(define-enum-extended PrintPages
   (in-module "Gtk")
-  (c-name "GtkLevelBarMode")
+  (c-name "GtkPrintPages")
   (values
-    '("continuous" "GTK_LEVEL_BAR_MODE_CONTINUOUS" "0")
-    '("discrete" "GTK_LEVEL_BAR_MODE_DISCRETE" "1")
+    '("all" "GTK_PRINT_PAGES_ALL" "0")
+    '("current" "GTK_PRINT_PAGES_CURRENT" "1")
+    '("ranges" "GTK_PRINT_PAGES_RANGES" "2")
+    '("selection" "GTK_PRINT_PAGES_SELECTION" "3")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_INPUT_PURPOSE_FREE_FORM,
-;;   GTK_INPUT_PURPOSE_ALPHA,
-;;   GTK_INPUT_PURPOSE_DIGITS,
-;;   GTK_INPUT_PURPOSE_NUMBER,
-;;   GTK_INPUT_PURPOSE_PHONE,
-;;   GTK_INPUT_PURPOSE_URL,
-;;   GTK_INPUT_PURPOSE_EMAIL,
-;;   GTK_INPUT_PURPOSE_NAME,
-;;   GTK_INPUT_PURPOSE_PASSWORD,
-;;   GTK_INPUT_PURPOSE_PIN
-;; } GtkInputPurpose;
-
-(define-enum-extended InputPurpose
+(define-enum-extended PrintQuality
   (in-module "Gtk")
-  (c-name "GtkInputPurpose")
+  (c-name "GtkPrintQuality")
   (values
-    '("free-form" "GTK_INPUT_PURPOSE_FREE_FORM" "0")
-    '("alpha" "GTK_INPUT_PURPOSE_ALPHA" "1")
-    '("digits" "GTK_INPUT_PURPOSE_DIGITS" "2")
-    '("number" "GTK_INPUT_PURPOSE_NUMBER" "3")
-    '("phone" "GTK_INPUT_PURPOSE_PHONE" "4")
-    '("url" "GTK_INPUT_PURPOSE_URL" "5")
-    '("email" "GTK_INPUT_PURPOSE_EMAIL" "6")
-    '("name" "GTK_INPUT_PURPOSE_NAME" "7")
-    '("password" "GTK_INPUT_PURPOSE_PASSWORD" "8")
-    '("pin" "GTK_INPUT_PURPOSE_PIN" "9")
+    '("low" "GTK_PRINT_QUALITY_LOW" "0")
+    '("normal" "GTK_PRINT_QUALITY_NORMAL" "1")
+    '("high" "GTK_PRINT_QUALITY_HIGH" "2")
+    '("draft" "GTK_PRINT_QUALITY_DRAFT" "3")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_INPUT_HINT_NONE                = 0,
-;;   GTK_INPUT_HINT_SPELLCHECK          = 1 << 0,
-;;   GTK_INPUT_HINT_NO_SPELLCHECK       = 1 << 1,
-;;   GTK_INPUT_HINT_WORD_COMPLETION     = 1 << 2,
-;;   GTK_INPUT_HINT_LOWERCASE           = 1 << 3,
-;;   GTK_INPUT_HINT_UPPERCASE_CHARS     = 1 << 4,
-;;   GTK_INPUT_HINT_UPPERCASE_WORDS     = 1 << 5,
-;;   GTK_INPUT_HINT_UPPERCASE_SENTENCES = 1 << 6,
-;;   GTK_INPUT_HINT_INHIBIT_OSK         = 1 << 7,
-;;   GTK_INPUT_HINT_VERTICAL_WRITING    = 1 << 8
-;; } GtkInputHints;
-
-(define-flags-extended InputHints
+(define-enum-extended PrintStatus
   (in-module "Gtk")
-  (c-name "GtkInputHints")
+  (c-name "GtkPrintStatus")
   (values
-    '("none" "GTK_INPUT_HINT_NONE" "0x0")
-    '("spellcheck" "GTK_INPUT_HINT_SPELLCHECK" "1 << 0")
-    '("no-spellcheck" "GTK_INPUT_HINT_NO_SPELLCHECK" "1 << 1")
-    '("word-completion" "GTK_INPUT_HINT_WORD_COMPLETION" "1 << 2")
-    '("lowercase" "GTK_INPUT_HINT_LOWERCASE" "1 << 3")
-    '("uppercase-chars" "GTK_INPUT_HINT_UPPERCASE_CHARS" "1 << 4")
-    '("uppercase-words" "GTK_INPUT_HINT_UPPERCASE_WORDS" "1 << 5")
-    '("uppercase-sentences" "GTK_INPUT_HINT_UPPERCASE_SENTENCES" "1 << 6")
-    '("inhibit-osk" "GTK_INPUT_HINT_INHIBIT_OSK" "1 << 7")
-    '("vertical-writing" "GTK_INPUT_HINT_VERTICAL_WRITING" "1 << 8")
+    '("initial" "GTK_PRINT_STATUS_INITIAL" "0")
+    '("preparing" "GTK_PRINT_STATUS_PREPARING" "1")
+    '("generating_data" "GTK_PRINT_STATUS_GENERATING_DATA" "2")
+    '("sending_data" "GTK_PRINT_STATUS_SENDING_DATA" "3")
+    '("pending" "GTK_PRINT_STATUS_PENDING" "4")
+    '("pending_issue" "GTK_PRINT_STATUS_PENDING_ISSUE" "5")
+    '("printing" "GTK_PRINT_STATUS_PRINTING" "6")
+    '("finished" "GTK_PRINT_STATUS_FINISHED" "7")
+    '("finished_aborted" "GTK_PRINT_STATUS_FINISHED_ABORTED" "8")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_PHASE_NONE,
-;;   GTK_PHASE_CAPTURE,
-;;   GTK_PHASE_BUBBLE,
-;;   GTK_PHASE_TARGET
-;; } GtkPropagationPhase;
-
 (define-enum-extended PropagationPhase
   (in-module "Gtk")
   (c-name "GtkPropagationPhase")
@@ -1551,1094 +878,454 @@
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_EVENT_SEQUENCE_NONE,
-;;   GTK_EVENT_SEQUENCE_CLAIMED,
-;;   GTK_EVENT_SEQUENCE_DENIED
-;; } GtkEventSequenceState;
-
-(define-enum-extended EventSequenceState
-  (in-module "Gtk")
-  (c-name "GtkEventSequenceState")
-  (values
-    '("none" "GTK_EVENT_SEQUENCE_NONE" "0")
-    '("claimed" "GTK_EVENT_SEQUENCE_CLAIMED" "1")
-    '("denied" "GTK_EVENT_SEQUENCE_DENIED" "2")
-  )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_PAN_DIRECTION_LEFT,
-;;   GTK_PAN_DIRECTION_RIGHT,
-;;   GTK_PAN_DIRECTION_UP,
-;;   GTK_PAN_DIRECTION_DOWN
-;; } GtkPanDirection;
-
-(define-enum-extended PanDirection
-  (in-module "Gtk")
-  (c-name "GtkPanDirection")
-  (values
-    '("left" "GTK_PAN_DIRECTION_LEFT" "0")
-    '("right" "GTK_PAN_DIRECTION_RIGHT" "1")
-    '("up" "GTK_PAN_DIRECTION_UP" "2")
-    '("down" "GTK_PAN_DIRECTION_DOWN" "3")
-  )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_POPOVER_CONSTRAINT_NONE,
-;;   GTK_POPOVER_CONSTRAINT_WINDOW
-;; } GtkPopoverConstraint;
-
-(define-enum-extended PopoverConstraint
-  (in-module "Gtk")
-  (c-name "GtkPopoverConstraint")
-  (values
-    '("none" "GTK_POPOVER_CONSTRAINT_NONE" "0")
-    '("window" "GTK_POPOVER_CONSTRAINT_WINDOW" "1")
-  )
-)
-
-;; From gtkfilechooser.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_FILE_CHOOSER_ACTION_OPEN,
-;;   GTK_FILE_CHOOSER_ACTION_SAVE,
-;;   GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-;;   GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER
-;; } GtkFileChooserAction;
-
-(define-enum-extended FileChooserAction
-  (in-module "Gtk")
-  (c-name "GtkFileChooserAction")
-  (values
-    '("open" "GTK_FILE_CHOOSER_ACTION_OPEN" "0")
-    '("save" "GTK_FILE_CHOOSER_ACTION_SAVE" "1")
-    '("select-folder" "GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER" "2")
-    '("create-folder" "GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER" "3")
-  )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_FILE_CHOOSER_CONFIRMATION_CONFIRM,
-;;   GTK_FILE_CHOOSER_CONFIRMATION_ACCEPT_FILENAME,
-;;   GTK_FILE_CHOOSER_CONFIRMATION_SELECT_AGAIN
-;; } GtkFileChooserConfirmation;
-
-(define-enum-extended FileChooserConfirmation
-  (in-module "Gtk")
-  (c-name "GtkFileChooserConfirmation")
-  (values
-    '("confirm" "GTK_FILE_CHOOSER_CONFIRMATION_CONFIRM" "0")
-    '("accept-filename" "GTK_FILE_CHOOSER_CONFIRMATION_ACCEPT_FILENAME" "1")
-    '("select-again" "GTK_FILE_CHOOSER_CONFIRMATION_SELECT_AGAIN" "2")
-  )
-)
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_FILE_CHOOSER_ERROR_NONEXISTENT,
-;;   GTK_FILE_CHOOSER_ERROR_BAD_FILENAME,
-;;   GTK_FILE_CHOOSER_ERROR_ALREADY_EXISTS,
-;;   GTK_FILE_CHOOSER_ERROR_INCOMPLETE_HOSTNAME
-;; } GtkFileChooserError;
-
-(define-enum-extended FileChooserError
-  (in-module "Gtk")
-  (c-name "GtkFileChooserError")
-  (values
-    '("nonexistent" "GTK_FILE_CHOOSER_ERROR_NONEXISTENT" "0")
-    '("bad-filename" "GTK_FILE_CHOOSER_ERROR_BAD_FILENAME" "1")
-    '("already-exists" "GTK_FILE_CHOOSER_ERROR_ALREADY_EXISTS" "2")
-    '("incomplete-hostname" "GTK_FILE_CHOOSER_ERROR_INCOMPLETE_HOSTNAME" "3")
-  )
-)
-
-;; From gtkfilechooserutils.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_FILE_CHOOSER_PROP_FIRST                  = 0x1000,
-;;   GTK_FILE_CHOOSER_PROP_ACTION                 = GTK_FILE_CHOOSER_PROP_FIRST,
-;;   GTK_FILE_CHOOSER_PROP_FILTER,
-;;   GTK_FILE_CHOOSER_PROP_LOCAL_ONLY,
-;;   GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET,
-;;   GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET_ACTIVE,
-;;   GTK_FILE_CHOOSER_PROP_USE_PREVIEW_LABEL,
-;;   GTK_FILE_CHOOSER_PROP_EXTRA_WIDGET,
-;;   GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE,
-;;   GTK_FILE_CHOOSER_PROP_SHOW_HIDDEN,
-;;   GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION,
-;;   GTK_FILE_CHOOSER_PROP_CREATE_FOLDERS,
-;;   GTK_FILE_CHOOSER_PROP_LAST                   = GTK_FILE_CHOOSER_PROP_CREATE_FOLDERS
-;; } GtkFileChooserProp;
-
-(define-enum-extended FileChooserProp
-  (in-module "Gtk")
-  (c-name "GtkFileChooserProp")
-  (values
-    '("first" "GTK_FILE_CHOOSER_PROP_FIRST" "0x1000")
-    '("action" "GTK_FILE_CHOOSER_PROP_ACTION" "4096")
-    '("filter" "GTK_FILE_CHOOSER_PROP_FILTER" "4097")
-    '("local-only" "GTK_FILE_CHOOSER_PROP_LOCAL_ONLY" "4098")
-    '("preview-widget" "GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET" "4099")
-    '("preview-widget-active" "GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET_ACTIVE" "4100")
-    '("use-preview-label" "GTK_FILE_CHOOSER_PROP_USE_PREVIEW_LABEL" "4101")
-    '("extra-widget" "GTK_FILE_CHOOSER_PROP_EXTRA_WIDGET" "4102")
-    '("select-multiple" "GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE" "4103")
-    '("show-hidden" "GTK_FILE_CHOOSER_PROP_SHOW_HIDDEN" "4104")
-    '("do-overwrite-confirmation" "GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION" "4105")
-    '("create-folders" "GTK_FILE_CHOOSER_PROP_CREATE_FOLDERS" "4106")
-    '("last" "GTK_FILE_CHOOSER_PROP_LAST" "4106")
-  )
-)
-
-;; From gtkfilefilter.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_FILE_FILTER_FILENAME     = 1 << 0,
-;;   GTK_FILE_FILTER_URI          = 1 << 1,
-;;   GTK_FILE_FILTER_DISPLAY_NAME = 1 << 2,
-;;   GTK_FILE_FILTER_MIME_TYPE    = 1 << 3
-;; } GtkFileFilterFlags;
-
-(define-flags-extended FileFilterFlags
+(define-flags-extended RcFlags
   (in-module "Gtk")
-  (c-name "GtkFileFilterFlags")
+  (c-name "GtkRcFlags")
   (values
-    '("filename" "GTK_FILE_FILTER_FILENAME" "1 << 0")
-    '("uri" "GTK_FILE_FILTER_URI" "1 << 1")
-    '("display-name" "GTK_FILE_FILTER_DISPLAY_NAME" "1 << 2")
-    '("mime-type" "GTK_FILE_FILTER_MIME_TYPE" "1 << 3")
+    '("fg" "GTK_RC_FG" "1")
+    '("bg" "GTK_RC_BG" "2")
+    '("text" "GTK_RC_TEXT" "4")
+    '("base" "GTK_RC_BASE" "8")
   )
 )
 
-;; From gtkfontchooserutils.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_FONT_CHOOSER_PROP_FIRST           = 0x4000,
-;;   GTK_FONT_CHOOSER_PROP_FONT,
-;;   GTK_FONT_CHOOSER_PROP_FONT_DESC,
-;;   GTK_FONT_CHOOSER_PROP_PREVIEW_TEXT,
-;;   GTK_FONT_CHOOSER_PROP_SHOW_PREVIEW_ENTRY,
-;;   GTK_FONT_CHOOSER_PROP_LAST
-;; } GtkFontChooserProp;
-
-(define-enum-extended FontChooserProp
+(define-enum-extended RcTokenType
   (in-module "Gtk")
-  (c-name "GtkFontChooserProp")
+  (c-name "GtkRcTokenType")
   (values
-    '("first" "GTK_FONT_CHOOSER_PROP_FIRST" "0x4000")
-    '("font" "GTK_FONT_CHOOSER_PROP_FONT" "16385")
-    '("font-desc" "GTK_FONT_CHOOSER_PROP_FONT_DESC" "16386")
-    '("preview-text" "GTK_FONT_CHOOSER_PROP_PREVIEW_TEXT" "16387")
-    '("show-preview-entry" "GTK_FONT_CHOOSER_PROP_SHOW_PREVIEW_ENTRY" "16388")
-    '("last" "GTK_FONT_CHOOSER_PROP_LAST" "16389")
+    '("invalid" "GTK_RC_TOKEN_INVALID" "270")
+    '("include" "GTK_RC_TOKEN_INCLUDE" "271")
+    '("normal" "GTK_RC_TOKEN_NORMAL" "272")
+    '("active" "GTK_RC_TOKEN_ACTIVE" "273")
+    '("prelight" "GTK_RC_TOKEN_PRELIGHT" "274")
+    '("selected" "GTK_RC_TOKEN_SELECTED" "275")
+    '("insensitive" "GTK_RC_TOKEN_INSENSITIVE" "276")
+    '("fg" "GTK_RC_TOKEN_FG" "277")
+    '("bg" "GTK_RC_TOKEN_BG" "278")
+    '("text" "GTK_RC_TOKEN_TEXT" "279")
+    '("base" "GTK_RC_TOKEN_BASE" "280")
+    '("xthickness" "GTK_RC_TOKEN_XTHICKNESS" "281")
+    '("ythickness" "GTK_RC_TOKEN_YTHICKNESS" "282")
+    '("font" "GTK_RC_TOKEN_FONT" "283")
+    '("fontset" "GTK_RC_TOKEN_FONTSET" "284")
+    '("font_name" "GTK_RC_TOKEN_FONT_NAME" "285")
+    '("bg_pixmap" "GTK_RC_TOKEN_BG_PIXMAP" "286")
+    '("pixmap_path" "GTK_RC_TOKEN_PIXMAP_PATH" "287")
+    '("style" "GTK_RC_TOKEN_STYLE" "288")
+    '("binding" "GTK_RC_TOKEN_BINDING" "289")
+    '("bind" "GTK_RC_TOKEN_BIND" "290")
+    '("widget" "GTK_RC_TOKEN_WIDGET" "291")
+    '("widget_class" "GTK_RC_TOKEN_WIDGET_CLASS" "292")
+    '("class" "GTK_RC_TOKEN_CLASS" "293")
+    '("lowest" "GTK_RC_TOKEN_LOWEST" "294")
+    '("gtk" "GTK_RC_TOKEN_GTK" "295")
+    '("application" "GTK_RC_TOKEN_APPLICATION" "296")
+    '("theme" "GTK_RC_TOKEN_THEME" "297")
+    '("rc" "GTK_RC_TOKEN_RC" "298")
+    '("highest" "GTK_RC_TOKEN_HIGHEST" "299")
+    '("engine" "GTK_RC_TOKEN_ENGINE" "300")
+    '("module_path" "GTK_RC_TOKEN_MODULE_PATH" "301")
+    '("im_module_path" "GTK_RC_TOKEN_IM_MODULE_PATH" "302")
+    '("im_module_file" "GTK_RC_TOKEN_IM_MODULE_FILE" "303")
+    '("stock" "GTK_RC_TOKEN_STOCK" "304")
+    '("ltr" "GTK_RC_TOKEN_LTR" "305")
+    '("rtl" "GTK_RC_TOKEN_RTL" "306")
+    '("color" "GTK_RC_TOKEN_COLOR" "307")
+    '("unbind" "GTK_RC_TOKEN_UNBIND" "308")
+    '("last" "GTK_RC_TOKEN_LAST" "309")
   )
 )
 
-;; From gtkicontheme.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_ICON_LOOKUP_NO_SVG           = 1 << 0,
-;;   GTK_ICON_LOOKUP_FORCE_SVG        = 1 << 1,
-;;   GTK_ICON_LOOKUP_USE_BUILTIN      = 1 << 2,
-;;   GTK_ICON_LOOKUP_GENERIC_FALLBACK = 1 << 3,
-;;   GTK_ICON_LOOKUP_FORCE_SIZE       = 1 << 4,
-;;   GTK_ICON_LOOKUP_FORCE_REGULAR    = 1 << 5,
-;;   GTK_ICON_LOOKUP_FORCE_SYMBOLIC   = 1 << 6,
-;;   GTK_ICON_LOOKUP_DIR_LTR          = 1 << 7,
-;;   GTK_ICON_LOOKUP_DIR_RTL          = 1 << 8
-;; } GtkIconLookupFlags;
-
-(define-flags-extended IconLookupFlags
+(define-enum-extended RecentChooserError
   (in-module "Gtk")
-  (c-name "GtkIconLookupFlags")
+  (c-name "GtkRecentChooserError")
   (values
-    '("no-svg" "GTK_ICON_LOOKUP_NO_SVG" "1 << 0")
-    '("force-svg" "GTK_ICON_LOOKUP_FORCE_SVG" "1 << 1")
-    '("use-builtin" "GTK_ICON_LOOKUP_USE_BUILTIN" "1 << 2")
-    '("generic-fallback" "GTK_ICON_LOOKUP_GENERIC_FALLBACK" "1 << 3")
-    '("force-size" "GTK_ICON_LOOKUP_FORCE_SIZE" "1 << 4")
-    '("force-regular" "GTK_ICON_LOOKUP_FORCE_REGULAR" "1 << 5")
-    '("force-symbolic" "GTK_ICON_LOOKUP_FORCE_SYMBOLIC" "1 << 6")
-    '("dir-ltr" "GTK_ICON_LOOKUP_DIR_LTR" "1 << 7")
-    '("dir-rtl" "GTK_ICON_LOOKUP_DIR_RTL" "1 << 8")
+    '("not_found" "GTK_RECENT_CHOOSER_ERROR_NOT_FOUND" "0")
+    '("invalid_uri" "GTK_RECENT_CHOOSER_ERROR_INVALID_URI" "1")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   GTK_ICON_THEME_NOT_FOUND,
-;;   GTK_ICON_THEME_FAILED
-;; } GtkIconThemeError;
-
-(define-enum-extended IconThemeError
+(define-flags-extended RecentFilterFlags
   (in-module "Gtk")
-  (c-name "GtkIconThemeError")
+  (c-name "GtkRecentFilterFlags")
   (values
-    '("not-found" "GTK_ICON_THEME_NOT_FOUND" "0")
-    '("failed" "GTK_ICON_THEME_FAILED" "1")
+    '("uri" "GTK_RECENT_FILTER_URI" "1")
+    '("display_name" "GTK_RECENT_FILTER_DISPLAY_NAME" "2")
+    '("mime_type" "GTK_RECENT_FILTER_MIME_TYPE" "4")
+    '("application" "GTK_RECENT_FILTER_APPLICATION" "8")
+    '("group" "GTK_RECENT_FILTER_GROUP" "16")
+    '("age" "GTK_RECENT_FILTER_AGE" "32")
   )
 )
 
-;; From gtkiconview.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_ICON_VIEW_NO_DROP,
-;;   GTK_ICON_VIEW_DROP_INTO,
-;;   GTK_ICON_VIEW_DROP_LEFT,
-;;   GTK_ICON_VIEW_DROP_RIGHT,
-;;   GTK_ICON_VIEW_DROP_ABOVE,
-;;   GTK_ICON_VIEW_DROP_BELOW
-;; } GtkIconViewDropPosition;
-
-(define-enum-extended IconViewDropPosition
+(define-enum-extended RecentManagerError
   (in-module "Gtk")
-  (c-name "GtkIconViewDropPosition")
+  (c-name "GtkRecentManagerError")
   (values
-    '("no-drop" "GTK_ICON_VIEW_NO_DROP" "0")
-    '("drop-into" "GTK_ICON_VIEW_DROP_INTO" "1")
-    '("drop-left" "GTK_ICON_VIEW_DROP_LEFT" "2")
-    '("drop-right" "GTK_ICON_VIEW_DROP_RIGHT" "3")
-    '("drop-above" "GTK_ICON_VIEW_DROP_ABOVE" "4")
-    '("drop-below" "GTK_ICON_VIEW_DROP_BELOW" "5")
+    '("not_found" "GTK_RECENT_MANAGER_ERROR_NOT_FOUND" "0")
+    '("invalid_uri" "GTK_RECENT_MANAGER_ERROR_INVALID_URI" "1")
+    '("invalid_encoding" "GTK_RECENT_MANAGER_ERROR_INVALID_ENCODING" "2")
+    '("not_registered" "GTK_RECENT_MANAGER_ERROR_NOT_REGISTERED" "3")
+    '("read" "GTK_RECENT_MANAGER_ERROR_READ" "4")
+    '("write" "GTK_RECENT_MANAGER_ERROR_WRITE" "5")
+    '("unknown" "GTK_RECENT_MANAGER_ERROR_UNKNOWN" "6")
   )
 )
 
-;; From gtkimage.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_IMAGE_EMPTY,
-;;   GTK_IMAGE_PIXBUF,
-;;   GTK_IMAGE_STOCK,
-;;   GTK_IMAGE_ICON_SET,
-;;   GTK_IMAGE_ANIMATION,
-;;   GTK_IMAGE_ICON_NAME,
-;;   GTK_IMAGE_GICON,
-;;   GTK_IMAGE_SURFACE
-;; } GtkImageType;
-
-(define-enum-extended ImageType
+(define-enum-extended RecentSortType
   (in-module "Gtk")
-  (c-name "GtkImageType")
+  (c-name "GtkRecentSortType")
   (values
-    '("empty" "GTK_IMAGE_EMPTY" "0")
-    '("pixbuf" "GTK_IMAGE_PIXBUF" "1")
-    '("stock" "GTK_IMAGE_STOCK" "2")
-    '("icon-set" "GTK_IMAGE_ICON_SET" "3")
-    '("animation" "GTK_IMAGE_ANIMATION" "4")
-    '("icon-name" "GTK_IMAGE_ICON_NAME" "5")
-    '("gicon" "GTK_IMAGE_GICON" "6")
-    '("surface" "GTK_IMAGE_SURFACE" "7")
+    '("none" "GTK_RECENT_SORT_NONE" "0")
+    '("mru" "GTK_RECENT_SORT_MRU" "1")
+    '("lru" "GTK_RECENT_SORT_LRU" "2")
+    '("custom" "GTK_RECENT_SORT_CUSTOM" "3")
   )
 )
 
-;; From gtkmenu.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_ARROWS_BOTH,
-;;   GTK_ARROWS_START,
-;;   GTK_ARROWS_END
-;; } GtkArrowPlacement;
-
-(define-enum-extended ArrowPlacement
+(define-flags-extended RegionFlags
   (in-module "Gtk")
-  (c-name "GtkArrowPlacement")
+  (c-name "GtkRegionFlags")
   (values
-    '("both" "GTK_ARROWS_BOTH" "0")
-    '("start" "GTK_ARROWS_START" "1")
-    '("end" "GTK_ARROWS_END" "2")
+    '("even" "GTK_REGION_EVEN" "1")
+    '("odd" "GTK_REGION_ODD" "2")
+    '("first" "GTK_REGION_FIRST" "4")
+    '("last" "GTK_REGION_LAST" "8")
+    '("only" "GTK_REGION_ONLY" "16")
+    '("sorted" "GTK_REGION_SORTED" "32")
   )
 )
 
-;; From gtkmenutrackeritem.h
-
-;; Original typedef:
-;; typedef enum  {
-;;   GTK_MENU_TRACKER_ITEM_ROLE_NORMAL,
-;;   GTK_MENU_TRACKER_ITEM_ROLE_CHECK,
-;;   GTK_MENU_TRACKER_ITEM_ROLE_RADIO,
-;; } GtkMenuTrackerItemRole;
-
-(define-enum-extended MenuTrackerItemRole
+(define-enum-extended ReliefStyle
   (in-module "Gtk")
-  (c-name "GtkMenuTrackerItemRole")
+  (c-name "GtkReliefStyle")
   (values
-    '("normal" "GTK_MENU_TRACKER_ITEM_ROLE_NORMAL" "0")
-    '("check" "GTK_MENU_TRACKER_ITEM_ROLE_CHECK" "1")
-    '("radio" "GTK_MENU_TRACKER_ITEM_ROLE_RADIO" "2")
+    '("normal" "GTK_RELIEF_NORMAL" "0")
+    '("half" "GTK_RELIEF_HALF" "1")
+    '("none" "GTK_RELIEF_NONE" "2")
   )
 )
 
-;; From gtkmessagedialog.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_BUTTONS_NONE,
-;;   GTK_BUTTONS_OK,
-;;   GTK_BUTTONS_CLOSE,
-;;   GTK_BUTTONS_CANCEL,
-;;   GTK_BUTTONS_YES_NO,
-;;   GTK_BUTTONS_OK_CANCEL
-;; } GtkButtonsType;
-
-(define-enum-extended ButtonsType
+(define-enum-extended ResizeMode
   (in-module "Gtk")
-  (c-name "GtkButtonsType")
+  (c-name "GtkResizeMode")
   (values
-    '("none" "GTK_BUTTONS_NONE" "0")
-    '("ok" "GTK_BUTTONS_OK" "1")
-    '("close" "GTK_BUTTONS_CLOSE" "2")
-    '("cancel" "GTK_BUTTONS_CANCEL" "3")
-    '("yes-no" "GTK_BUTTONS_YES_NO" "4")
-    '("ok-cancel" "GTK_BUTTONS_OK_CANCEL" "5")
+    '("parent" "GTK_RESIZE_PARENT" "0")
+    '("queue" "GTK_RESIZE_QUEUE" "1")
+    '("immediate" "GTK_RESIZE_IMMEDIATE" "2")
   )
 )
 
-;; From gtkmodelbutton.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_BUTTON_ROLE_NORMAL,
-;;   GTK_BUTTON_ROLE_CHECK,
-;;   GTK_BUTTON_ROLE_RADIO
-;; } GtkButtonRole;
-
-(define-enum-extended ButtonRole
+(define-enum-extended ResponseType
   (in-module "Gtk")
-  (c-name "GtkButtonRole")
+  (c-name "GtkResponseType")
   (values
-    '("normal" "GTK_BUTTON_ROLE_NORMAL" "0")
-    '("check" "GTK_BUTTON_ROLE_CHECK" "1")
-    '("radio" "GTK_BUTTON_ROLE_RADIO" "2")
+    '("none" "GTK_RESPONSE_NONE" "-1")
+    '("reject" "GTK_RESPONSE_REJECT" "-2")
+    '("accept" "GTK_RESPONSE_ACCEPT" "-3")
+    '("delete_event" "GTK_RESPONSE_DELETE_EVENT" "-4")
+    '("ok" "GTK_RESPONSE_OK" "-5")
+    '("cancel" "GTK_RESPONSE_CANCEL" "-6")
+    '("close" "GTK_RESPONSE_CLOSE" "-7")
+    '("yes" "GTK_RESPONSE_YES" "-8")
+    '("no" "GTK_RESPONSE_NO" "-9")
+    '("apply" "GTK_RESPONSE_APPLY" "-10")
+    '("help" "GTK_RESPONSE_HELP" "-11")
   )
 )
 
-;; From gtknotebook.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_NOTEBOOK_TAB_FIRST,
-;;   GTK_NOTEBOOK_TAB_LAST
-;; } GtkNotebookTab;
-
-(define-enum-extended NotebookTab
+(define-enum-extended RevealerTransitionType
   (in-module "Gtk")
-  (c-name "GtkNotebookTab")
+  (c-name "GtkRevealerTransitionType")
   (values
-    '("first" "GTK_NOTEBOOK_TAB_FIRST" "0")
-    '("last" "GTK_NOTEBOOK_TAB_LAST" "1")
+    '("none" "GTK_REVEALER_TRANSITION_TYPE_NONE" "0")
+    '("crossfade" "GTK_REVEALER_TRANSITION_TYPE_CROSSFADE" "1")
+    '("slide_right" "GTK_REVEALER_TRANSITION_TYPE_SLIDE_RIGHT" "2")
+    '("slide_left" "GTK_REVEALER_TRANSITION_TYPE_SLIDE_LEFT" "3")
+    '("slide_up" "GTK_REVEALER_TRANSITION_TYPE_SLIDE_UP" "4")
+    '("slide_down" "GTK_REVEALER_TRANSITION_TYPE_SLIDE_DOWN" "5")
   )
 )
 
-;; From gtkpadcontroller.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_PAD_ACTION_BUTTON,
-;;   GTK_PAD_ACTION_RING,
-;;   GTK_PAD_ACTION_STRIP
-;; } GtkPadActionType;
-
-(define-enum-extended PadActionType
+(define-enum-extended ScrollStep
   (in-module "Gtk")
-  (c-name "GtkPadActionType")
+  (c-name "GtkScrollStep")
   (values
-    '("button" "GTK_PAD_ACTION_BUTTON" "0")
-    '("ring" "GTK_PAD_ACTION_RING" "1")
-    '("strip" "GTK_PAD_ACTION_STRIP" "2")
+    '("steps" "GTK_SCROLL_STEPS" "0")
+    '("pages" "GTK_SCROLL_PAGES" "1")
+    '("ends" "GTK_SCROLL_ENDS" "2")
+    '("horizontal_steps" "GTK_SCROLL_HORIZONTAL_STEPS" "3")
+    '("horizontal_pages" "GTK_SCROLL_HORIZONTAL_PAGES" "4")
+    '("horizontal_ends" "GTK_SCROLL_HORIZONTAL_ENDS" "5")
   )
 )
 
-;; From gtkplacessidebar.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_PLACES_OPEN_NORMAL     = 1 << 0,
-;;   GTK_PLACES_OPEN_NEW_TAB    = 1 << 1,
-;;   GTK_PLACES_OPEN_NEW_WINDOW = 1 << 2
-;; } GtkPlacesOpenFlags;
-
-(define-flags-extended PlacesOpenFlags
+(define-enum-extended ScrollType
   (in-module "Gtk")
-  (c-name "GtkPlacesOpenFlags")
+  (c-name "GtkScrollType")
   (values
-    '("normal" "GTK_PLACES_OPEN_NORMAL" "1 << 0")
-    '("new-tab" "GTK_PLACES_OPEN_NEW_TAB" "1 << 1")
-    '("new-window" "GTK_PLACES_OPEN_NEW_WINDOW" "1 << 2")
+    '("none" "GTK_SCROLL_NONE" "0")
+    '("jump" "GTK_SCROLL_JUMP" "1")
+    '("step_backward" "GTK_SCROLL_STEP_BACKWARD" "2")
+    '("step_forward" "GTK_SCROLL_STEP_FORWARD" "3")
+    '("page_backward" "GTK_SCROLL_PAGE_BACKWARD" "4")
+    '("page_forward" "GTK_SCROLL_PAGE_FORWARD" "5")
+    '("step_up" "GTK_SCROLL_STEP_UP" "6")
+    '("step_down" "GTK_SCROLL_STEP_DOWN" "7")
+    '("page_up" "GTK_SCROLL_PAGE_UP" "8")
+    '("page_down" "GTK_SCROLL_PAGE_DOWN" "9")
+    '("step_left" "GTK_SCROLL_STEP_LEFT" "10")
+    '("step_right" "GTK_SCROLL_STEP_RIGHT" "11")
+    '("page_left" "GTK_SCROLL_PAGE_LEFT" "12")
+    '("page_right" "GTK_SCROLL_PAGE_RIGHT" "13")
+    '("start" "GTK_SCROLL_START" "14")
+    '("end" "GTK_SCROLL_END" "15")
   )
 )
 
-;; From gtkprintbackend.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   /* TODO: add specific errors */
-;;   GTK_PRINT_BACKEND_ERROR_GENERIC
-;; } GtkPrintBackendError;
-
-(define-enum-extended PrintBackendError
+(define-enum-extended ScrollablePolicy
   (in-module "Gtk")
-  (c-name "GtkPrintBackendError")
+  (c-name "GtkScrollablePolicy")
   (values
-    '("generic" "GTK_PRINT_BACKEND_ERROR_GENERIC" "0")
+    '("minimum" "GTK_SCROLL_MINIMUM" "0")
+    '("natural" "GTK_SCROLL_NATURAL" "1")
   )
 )
 
-;; Original typedef:
-;; typedef enum 
-;; {
-;;   GTK_PRINT_BACKEND_STATUS_UNKNOWN,
-;;   GTK_PRINT_BACKEND_STATUS_OK,
-;;   GTK_PRINT_BACKEND_STATUS_UNAVAILABLE
-;; } GtkPrintBackendStatus;
-
-(define-enum-extended PrintBackendStatus
+(define-enum-extended SelectionMode
   (in-module "Gtk")
-  (c-name "GtkPrintBackendStatus")
+  (c-name "GtkSelectionMode")
   (values
-    '("unknown" "GTK_PRINT_BACKEND_STATUS_UNKNOWN" "0")
-    '("ok" "GTK_PRINT_BACKEND_STATUS_OK" "1")
-    '("unavailable" "GTK_PRINT_BACKEND_STATUS_UNAVAILABLE" "2")
+    '("none" "GTK_SELECTION_NONE" "0")
+    '("single" "GTK_SELECTION_SINGLE" "1")
+    '("browse" "GTK_SELECTION_BROWSE" "2")
+    '("multiple" "GTK_SELECTION_MULTIPLE" "3")
   )
 )
 
-;; From gtkprinter.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_PRINT_CAPABILITY_PAGE_SET         = 1 << 0,
-;;   GTK_PRINT_CAPABILITY_COPIES           = 1 << 1,
-;;   GTK_PRINT_CAPABILITY_COLLATE          = 1 << 2,
-;;   GTK_PRINT_CAPABILITY_REVERSE          = 1 << 3,
-;;   GTK_PRINT_CAPABILITY_SCALE            = 1 << 4,
-;;   GTK_PRINT_CAPABILITY_GENERATE_PDF     = 1 << 5,
-;;   GTK_PRINT_CAPABILITY_GENERATE_PS      = 1 << 6,
-;;   GTK_PRINT_CAPABILITY_PREVIEW          = 1 << 7,
-;;   GTK_PRINT_CAPABILITY_NUMBER_UP        = 1 << 8,
-;;   GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT = 1 << 9
-;; } GtkPrintCapabilities;
-
-(define-flags-extended PrintCapabilities
+(define-enum-extended SensitivityType
   (in-module "Gtk")
-  (c-name "GtkPrintCapabilities")
+  (c-name "GtkSensitivityType")
   (values
-    '("page-set" "GTK_PRINT_CAPABILITY_PAGE_SET" "1 << 0")
-    '("copies" "GTK_PRINT_CAPABILITY_COPIES" "1 << 1")
-    '("collate" "GTK_PRINT_CAPABILITY_COLLATE" "1 << 2")
-    '("reverse" "GTK_PRINT_CAPABILITY_REVERSE" "1 << 3")
-    '("scale" "GTK_PRINT_CAPABILITY_SCALE" "1 << 4")
-    '("generate-pdf" "GTK_PRINT_CAPABILITY_GENERATE_PDF" "1 << 5")
-    '("generate-ps" "GTK_PRINT_CAPABILITY_GENERATE_PS" "1 << 6")
-    '("preview" "GTK_PRINT_CAPABILITY_PREVIEW" "1 << 7")
-    '("number-up" "GTK_PRINT_CAPABILITY_NUMBER_UP" "1 << 8")
-    '("number-up-layout" "GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT" "1 << 9")
+    '("auto" "GTK_SENSITIVITY_AUTO" "0")
+    '("on" "GTK_SENSITIVITY_ON" "1")
+    '("off" "GTK_SENSITIVITY_OFF" "2")
   )
 )
 
-;; From gtkprinteroption.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_PRINTER_OPTION_TYPE_BOOLEAN,
-;;   GTK_PRINTER_OPTION_TYPE_PICKONE,
-;;   GTK_PRINTER_OPTION_TYPE_PICKONE_PASSWORD,
-;;   GTK_PRINTER_OPTION_TYPE_PICKONE_PASSCODE,
-;;   GTK_PRINTER_OPTION_TYPE_PICKONE_REAL,
-;;   GTK_PRINTER_OPTION_TYPE_PICKONE_INT,
-;;   GTK_PRINTER_OPTION_TYPE_PICKONE_STRING,
-;;   GTK_PRINTER_OPTION_TYPE_ALTERNATIVE,
-;;   GTK_PRINTER_OPTION_TYPE_STRING,
-;;   GTK_PRINTER_OPTION_TYPE_FILESAVE,
-;;   GTK_PRINTER_OPTION_TYPE_INFO
-;; } GtkPrinterOptionType;
-
-(define-enum-extended PrinterOptionType
-  (in-module "Gtk")
-  (c-name "GtkPrinterOptionType")
-  (values
-    '("boolean" "GTK_PRINTER_OPTION_TYPE_BOOLEAN" "0")
-    '("pickone" "GTK_PRINTER_OPTION_TYPE_PICKONE" "1")
-    '("pickone-password" "GTK_PRINTER_OPTION_TYPE_PICKONE_PASSWORD" "2")
-    '("pickone-passcode" "GTK_PRINTER_OPTION_TYPE_PICKONE_PASSCODE" "3")
-    '("pickone-real" "GTK_PRINTER_OPTION_TYPE_PICKONE_REAL" "4")
-    '("pickone-int" "GTK_PRINTER_OPTION_TYPE_PICKONE_INT" "5")
-    '("pickone-string" "GTK_PRINTER_OPTION_TYPE_PICKONE_STRING" "6")
-    '("alternative" "GTK_PRINTER_OPTION_TYPE_ALTERNATIVE" "7")
-    '("string" "GTK_PRINTER_OPTION_TYPE_STRING" "8")
-    '("filesave" "GTK_PRINTER_OPTION_TYPE_FILESAVE" "9")
-    '("info" "GTK_PRINTER_OPTION_TYPE_INFO" "10")
-  )
-)
-
-;; From gtkprintoperation.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_PRINT_STATUS_INITIAL,
-;;   GTK_PRINT_STATUS_PREPARING,
-;;   GTK_PRINT_STATUS_GENERATING_DATA,
-;;   GTK_PRINT_STATUS_SENDING_DATA,
-;;   GTK_PRINT_STATUS_PENDING,
-;;   GTK_PRINT_STATUS_PENDING_ISSUE,
-;;   GTK_PRINT_STATUS_PRINTING,
-;;   GTK_PRINT_STATUS_FINISHED,
-;;   GTK_PRINT_STATUS_FINISHED_ABORTED
-;; } GtkPrintStatus;
-
-(define-enum-extended PrintStatus
+(define-enum-extended ShadowType
   (in-module "Gtk")
-  (c-name "GtkPrintStatus")
+  (c-name "GtkShadowType")
   (values
-    '("initial" "GTK_PRINT_STATUS_INITIAL" "0")
-    '("preparing" "GTK_PRINT_STATUS_PREPARING" "1")
-    '("generating-data" "GTK_PRINT_STATUS_GENERATING_DATA" "2")
-    '("sending-data" "GTK_PRINT_STATUS_SENDING_DATA" "3")
-    '("pending" "GTK_PRINT_STATUS_PENDING" "4")
-    '("pending-issue" "GTK_PRINT_STATUS_PENDING_ISSUE" "5")
-    '("printing" "GTK_PRINT_STATUS_PRINTING" "6")
-    '("finished" "GTK_PRINT_STATUS_FINISHED" "7")
-    '("finished-aborted" "GTK_PRINT_STATUS_FINISHED_ABORTED" "8")
+    '("none" "GTK_SHADOW_NONE" "0")
+    '("in" "GTK_SHADOW_IN" "1")
+    '("out" "GTK_SHADOW_OUT" "2")
+    '("etched_in" "GTK_SHADOW_ETCHED_IN" "3")
+    '("etched_out" "GTK_SHADOW_ETCHED_OUT" "4")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   GTK_PRINT_OPERATION_RESULT_ERROR,
-;;   GTK_PRINT_OPERATION_RESULT_APPLY,
-;;   GTK_PRINT_OPERATION_RESULT_CANCEL,
-;;   GTK_PRINT_OPERATION_RESULT_IN_PROGRESS
-;; } GtkPrintOperationResult;
-
-(define-enum-extended PrintOperationResult
+(define-enum-extended ShortcutType
   (in-module "Gtk")
-  (c-name "GtkPrintOperationResult")
+  (c-name "GtkShortcutType")
   (values
-    '("error" "GTK_PRINT_OPERATION_RESULT_ERROR" "0")
-    '("apply" "GTK_PRINT_OPERATION_RESULT_APPLY" "1")
-    '("cancel" "GTK_PRINT_OPERATION_RESULT_CANCEL" "2")
-    '("in-progress" "GTK_PRINT_OPERATION_RESULT_IN_PROGRESS" "3")
+    '("accelerator" "GTK_SHORTCUT_ACCELERATOR" "0")
+    '("gesture_pinch" "GTK_SHORTCUT_GESTURE_PINCH" "1")
+    '("gesture_stretch" "GTK_SHORTCUT_GESTURE_STRETCH" "2")
+    '("gesture_rotate_clockwise" "GTK_SHORTCUT_GESTURE_ROTATE_CLOCKWISE" "3")
+    '("gesture_rotate_counterclockwise" "GTK_SHORTCUT_GESTURE_ROTATE_COUNTERCLOCKWISE" "4")
+    '("gesture_two_finger_swipe_left" "GTK_SHORTCUT_GESTURE_TWO_FINGER_SWIPE_LEFT" "5")
+    '("gesture_two_finger_swipe_right" "GTK_SHORTCUT_GESTURE_TWO_FINGER_SWIPE_RIGHT" "6")
+    '("gesture" "GTK_SHORTCUT_GESTURE" "7")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
-;;   GTK_PRINT_OPERATION_ACTION_PRINT,
-;;   GTK_PRINT_OPERATION_ACTION_PREVIEW,
-;;   GTK_PRINT_OPERATION_ACTION_EXPORT
-;; } GtkPrintOperationAction;
-
-(define-enum-extended PrintOperationAction
+(define-enum-extended SizeGroupMode
   (in-module "Gtk")
-  (c-name "GtkPrintOperationAction")
+  (c-name "GtkSizeGroupMode")
   (values
-    '("print-dialog" "GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG" "0")
-    '("print" "GTK_PRINT_OPERATION_ACTION_PRINT" "1")
-    '("preview" "GTK_PRINT_OPERATION_ACTION_PREVIEW" "2")
-    '("export" "GTK_PRINT_OPERATION_ACTION_EXPORT" "3")
+    '("none" "GTK_SIZE_GROUP_NONE" "0")
+    '("horizontal" "GTK_SIZE_GROUP_HORIZONTAL" "1")
+    '("vertical" "GTK_SIZE_GROUP_VERTICAL" "2")
+    '("both" "GTK_SIZE_GROUP_BOTH" "3")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_PRINT_ERROR_GENERAL,
-;;   GTK_PRINT_ERROR_INTERNAL_ERROR,
-;;   GTK_PRINT_ERROR_NOMEM,
-;;   GTK_PRINT_ERROR_INVALID_FILE
-;; } GtkPrintError;
-
-(define-enum-extended PrintError
-  (in-module "Gtk")
-  (c-name "GtkPrintError")
-  (values
-    '("general" "GTK_PRINT_ERROR_GENERAL" "0")
-    '("internal-error" "GTK_PRINT_ERROR_INTERNAL_ERROR" "1")
-    '("nomem" "GTK_PRINT_ERROR_NOMEM" "2")
-    '("invalid-file" "GTK_PRINT_ERROR_INVALID_FILE" "3")
-  )
-)
-
-;; From gtkrbtree.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_RBNODE_BLACK = 1 << 0,
-;;   GTK_RBNODE_RED = 1 << 1,
-;;   GTK_RBNODE_IS_PARENT = 1 << 2,
-;;   GTK_RBNODE_IS_SELECTED = 1 << 3,
-;;   GTK_RBNODE_IS_PRELIT = 1 << 4,
-;;   GTK_RBNODE_INVALID = 1 << 7,
-;;   GTK_RBNODE_COLUMN_INVALID = 1 << 8,
-;;   GTK_RBNODE_DESCENDANTS_INVALID = 1 << 9,
-;;   GTK_RBNODE_NON_COLORS = GTK_RBNODE_IS_PARENT |
-;;                       GTK_RBNODE_IS_SELECTED |
-;;                       GTK_RBNODE_IS_PRELIT |
-;;                           GTK_RBNODE_INVALID |
-;;                           GTK_RBNODE_COLUMN_INVALID |
-;;                           GTK_RBNODE_DESCENDANTS_INVALID
-;; } GtkRBNodeColor;
-
-(define-flags-extended RBNodeColor
-  (in-module "Gtk")
-  (c-name "GtkRBNodeColor")
-  (values
-    '("black" "GTK_RBNODE_BLACK" "1 << 0")
-    '("red" "GTK_RBNODE_RED" "1 << 1")
-    '("is-parent" "GTK_RBNODE_IS_PARENT" "1 << 2")
-    '("is-selected" "GTK_RBNODE_IS_SELECTED" "1 << 3")
-    '("is-prelit" "GTK_RBNODE_IS_PRELIT" "1 << 4")
-    '("invalid" "GTK_RBNODE_INVALID" "1 << 7")
-    '("column-invalid" "GTK_RBNODE_COLUMN_INVALID" "1 << 8")
-    '("descendants-invalid" "GTK_RBNODE_DESCENDANTS_INVALID" "1 << 9")
-    '("non-colors" "GTK_RBNODE_NON_COLORS" "0x39C")
-  )
-)
-
-;; From gtkrecentchooser.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_RECENT_SORT_NONE = 0,
-;;   GTK_RECENT_SORT_MRU,
-;;   GTK_RECENT_SORT_LRU,
-;;   GTK_RECENT_SORT_CUSTOM
-;; } GtkRecentSortType;
-
-(define-enum-extended RecentSortType
+(define-enum-extended SizeRequestMode
   (in-module "Gtk")
-  (c-name "GtkRecentSortType")
+  (c-name "GtkSizeRequestMode")
   (values
-    '("none" "GTK_RECENT_SORT_NONE" "0")
-    '("mru" "GTK_RECENT_SORT_MRU" "1")
-    '("lru" "GTK_RECENT_SORT_LRU" "2")
-    '("custom" "GTK_RECENT_SORT_CUSTOM" "3")
+    '("height_for_width" "GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH" "0")
+    '("width_for_height" "GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT" "1")
+    '("constant_size" "GTK_SIZE_REQUEST_CONSTANT_SIZE" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_RECENT_CHOOSER_ERROR_NOT_FOUND,
-;;   GTK_RECENT_CHOOSER_ERROR_INVALID_URI
-;; } GtkRecentChooserError;
-
-(define-enum-extended RecentChooserError
+(define-enum-extended SortType
   (in-module "Gtk")
-  (c-name "GtkRecentChooserError")
+  (c-name "GtkSortType")
   (values
-    '("not-found" "GTK_RECENT_CHOOSER_ERROR_NOT_FOUND" "0")
-    '("invalid-uri" "GTK_RECENT_CHOOSER_ERROR_INVALID_URI" "1")
+    '("ascending" "GTK_SORT_ASCENDING" "0")
+    '("descending" "GTK_SORT_DESCENDING" "1")
   )
 )
 
-;; From gtkrecentchooserutils.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_RECENT_CHOOSER_PROP_FIRST           = 0x3000,
-;;   GTK_RECENT_CHOOSER_PROP_RECENT_MANAGER,
-;;   GTK_RECENT_CHOOSER_PROP_SHOW_PRIVATE,
-;;   GTK_RECENT_CHOOSER_PROP_SHOW_NOT_FOUND,
-;;   GTK_RECENT_CHOOSER_PROP_SHOW_TIPS,
-;;   GTK_RECENT_CHOOSER_PROP_SHOW_ICONS,
-;;   GTK_RECENT_CHOOSER_PROP_SELECT_MULTIPLE,
-;;   GTK_RECENT_CHOOSER_PROP_LIMIT,
-;;   GTK_RECENT_CHOOSER_PROP_LOCAL_ONLY,
-;;   GTK_RECENT_CHOOSER_PROP_SORT_TYPE,
-;;   GTK_RECENT_CHOOSER_PROP_FILTER,
-;;   GTK_RECENT_CHOOSER_PROP_LAST
-;; } GtkRecentChooserProp;
-
-(define-enum-extended RecentChooserProp
+(define-enum-extended SpinButtonUpdatePolicy
   (in-module "Gtk")
-  (c-name "GtkRecentChooserProp")
+  (c-name "GtkSpinButtonUpdatePolicy")
   (values
-    '("first" "GTK_RECENT_CHOOSER_PROP_FIRST" "0x3000")
-    '("recent-manager" "GTK_RECENT_CHOOSER_PROP_RECENT_MANAGER" "12289")
-    '("show-private" "GTK_RECENT_CHOOSER_PROP_SHOW_PRIVATE" "12290")
-    '("show-not-found" "GTK_RECENT_CHOOSER_PROP_SHOW_NOT_FOUND" "12291")
-    '("show-tips" "GTK_RECENT_CHOOSER_PROP_SHOW_TIPS" "12292")
-    '("show-icons" "GTK_RECENT_CHOOSER_PROP_SHOW_ICONS" "12293")
-    '("select-multiple" "GTK_RECENT_CHOOSER_PROP_SELECT_MULTIPLE" "12294")
-    '("limit" "GTK_RECENT_CHOOSER_PROP_LIMIT" "12295")
-    '("local-only" "GTK_RECENT_CHOOSER_PROP_LOCAL_ONLY" "12296")
-    '("sort-type" "GTK_RECENT_CHOOSER_PROP_SORT_TYPE" "12297")
-    '("filter" "GTK_RECENT_CHOOSER_PROP_FILTER" "12298")
-    '("last" "GTK_RECENT_CHOOSER_PROP_LAST" "12299")
+    '("always" "GTK_UPDATE_ALWAYS" "0")
+    '("if_valid" "GTK_UPDATE_IF_VALID" "1")
   )
 )
 
-;; From gtkrecentfilter.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_RECENT_FILTER_URI          = 1 << 0,
-;;   GTK_RECENT_FILTER_DISPLAY_NAME = 1 << 1,
-;;   GTK_RECENT_FILTER_MIME_TYPE    = 1 << 2,
-;;   GTK_RECENT_FILTER_APPLICATION  = 1 << 3,
-;;   GTK_RECENT_FILTER_GROUP        = 1 << 4,
-;;   GTK_RECENT_FILTER_AGE          = 1 << 5
-;; } GtkRecentFilterFlags;
-
-(define-flags-extended RecentFilterFlags
+(define-enum-extended SpinType
   (in-module "Gtk")
-  (c-name "GtkRecentFilterFlags")
+  (c-name "GtkSpinType")
   (values
-    '("uri" "GTK_RECENT_FILTER_URI" "1 << 0")
-    '("display-name" "GTK_RECENT_FILTER_DISPLAY_NAME" "1 << 1")
-    '("mime-type" "GTK_RECENT_FILTER_MIME_TYPE" "1 << 2")
-    '("application" "GTK_RECENT_FILTER_APPLICATION" "1 << 3")
-    '("group" "GTK_RECENT_FILTER_GROUP" "1 << 4")
-    '("age" "GTK_RECENT_FILTER_AGE" "1 << 5")
+    '("step_forward" "GTK_SPIN_STEP_FORWARD" "0")
+    '("step_backward" "GTK_SPIN_STEP_BACKWARD" "1")
+    '("page_forward" "GTK_SPIN_PAGE_FORWARD" "2")
+    '("page_backward" "GTK_SPIN_PAGE_BACKWARD" "3")
+    '("home" "GTK_SPIN_HOME" "4")
+    '("end" "GTK_SPIN_END" "5")
+    '("user_defined" "GTK_SPIN_USER_DEFINED" "6")
   )
 )
 
-;; From gtkrecentmanager.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_RECENT_MANAGER_ERROR_NOT_FOUND,
-;;   GTK_RECENT_MANAGER_ERROR_INVALID_URI,
-;;   GTK_RECENT_MANAGER_ERROR_INVALID_ENCODING,
-;;   GTK_RECENT_MANAGER_ERROR_NOT_REGISTERED,
-;;   GTK_RECENT_MANAGER_ERROR_READ,
-;;   GTK_RECENT_MANAGER_ERROR_WRITE,
-;;   GTK_RECENT_MANAGER_ERROR_UNKNOWN
-;; } GtkRecentManagerError;
-
-(define-enum-extended RecentManagerError
+(define-enum-extended StackTransitionType
   (in-module "Gtk")
-  (c-name "GtkRecentManagerError")
+  (c-name "GtkStackTransitionType")
   (values
-    '("not-found" "GTK_RECENT_MANAGER_ERROR_NOT_FOUND" "0")
-    '("invalid-uri" "GTK_RECENT_MANAGER_ERROR_INVALID_URI" "1")
-    '("invalid-encoding" "GTK_RECENT_MANAGER_ERROR_INVALID_ENCODING" "2")
-    '("not-registered" "GTK_RECENT_MANAGER_ERROR_NOT_REGISTERED" "3")
-    '("read" "GTK_RECENT_MANAGER_ERROR_READ" "4")
-    '("write" "GTK_RECENT_MANAGER_ERROR_WRITE" "5")
-    '("unknown" "GTK_RECENT_MANAGER_ERROR_UNKNOWN" "6")
+    '("none" "GTK_STACK_TRANSITION_TYPE_NONE" "0")
+    '("crossfade" "GTK_STACK_TRANSITION_TYPE_CROSSFADE" "1")
+    '("slide_right" "GTK_STACK_TRANSITION_TYPE_SLIDE_RIGHT" "2")
+    '("slide_left" "GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT" "3")
+    '("slide_up" "GTK_STACK_TRANSITION_TYPE_SLIDE_UP" "4")
+    '("slide_down" "GTK_STACK_TRANSITION_TYPE_SLIDE_DOWN" "5")
+    '("slide_left_right" "GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT_RIGHT" "6")
+    '("slide_up_down" "GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN" "7")
+    '("over_up" "GTK_STACK_TRANSITION_TYPE_OVER_UP" "8")
+    '("over_down" "GTK_STACK_TRANSITION_TYPE_OVER_DOWN" "9")
+    '("over_left" "GTK_STACK_TRANSITION_TYPE_OVER_LEFT" "10")
+    '("over_right" "GTK_STACK_TRANSITION_TYPE_OVER_RIGHT" "11")
+    '("under_up" "GTK_STACK_TRANSITION_TYPE_UNDER_UP" "12")
+    '("under_down" "GTK_STACK_TRANSITION_TYPE_UNDER_DOWN" "13")
+    '("under_left" "GTK_STACK_TRANSITION_TYPE_UNDER_LEFT" "14")
+    '("under_right" "GTK_STACK_TRANSITION_TYPE_UNDER_RIGHT" "15")
+    '("over_up_down" "GTK_STACK_TRANSITION_TYPE_OVER_UP_DOWN" "16")
+    '("over_down_up" "GTK_STACK_TRANSITION_TYPE_OVER_DOWN_UP" "17")
+    '("over_left_right" "GTK_STACK_TRANSITION_TYPE_OVER_LEFT_RIGHT" "18")
+    '("over_right_left" "GTK_STACK_TRANSITION_TYPE_OVER_RIGHT_LEFT" "19")
   )
 )
 
-;; From gtkrevealer.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_REVEALER_TRANSITION_TYPE_NONE,
-;;   GTK_REVEALER_TRANSITION_TYPE_CROSSFADE,
-;;   GTK_REVEALER_TRANSITION_TYPE_SLIDE_RIGHT,
-;;   GTK_REVEALER_TRANSITION_TYPE_SLIDE_LEFT,
-;;   GTK_REVEALER_TRANSITION_TYPE_SLIDE_UP,
-;;   GTK_REVEALER_TRANSITION_TYPE_SLIDE_DOWN
-;; } GtkRevealerTransitionType;
-
-(define-enum-extended RevealerTransitionType
+(define-flags-extended StateFlags
   (in-module "Gtk")
-  (c-name "GtkRevealerTransitionType")
+  (c-name "GtkStateFlags")
   (values
-    '("none" "GTK_REVEALER_TRANSITION_TYPE_NONE" "0")
-    '("crossfade" "GTK_REVEALER_TRANSITION_TYPE_CROSSFADE" "1")
-    '("slide-right" "GTK_REVEALER_TRANSITION_TYPE_SLIDE_RIGHT" "2")
-    '("slide-left" "GTK_REVEALER_TRANSITION_TYPE_SLIDE_LEFT" "3")
-    '("slide-up" "GTK_REVEALER_TRANSITION_TYPE_SLIDE_UP" "4")
-    '("slide-down" "GTK_REVEALER_TRANSITION_TYPE_SLIDE_DOWN" "5")
+    '("normal" "GTK_STATE_FLAG_NORMAL" "0")
+    '("active" "GTK_STATE_FLAG_ACTIVE" "1")
+    '("prelight" "GTK_STATE_FLAG_PRELIGHT" "2")
+    '("selected" "GTK_STATE_FLAG_SELECTED" "4")
+    '("insensitive" "GTK_STATE_FLAG_INSENSITIVE" "8")
+    '("inconsistent" "GTK_STATE_FLAG_INCONSISTENT" "16")
+    '("focused" "GTK_STATE_FLAG_FOCUSED" "32")
+    '("backdrop" "GTK_STATE_FLAG_BACKDROP" "64")
+    '("dir_ltr" "GTK_STATE_FLAG_DIR_LTR" "128")
+    '("dir_rtl" "GTK_STATE_FLAG_DIR_RTL" "256")
+    '("link" "GTK_STATE_FLAG_LINK" "512")
+    '("visited" "GTK_STATE_FLAG_VISITED" "1024")
+    '("checked" "GTK_STATE_FLAG_CHECKED" "2048")
+    '("drop_active" "GTK_STATE_FLAG_DROP_ACTIVE" "4096")
   )
 )
 
-;; From gtkscrolledwindow.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_CORNER_TOP_LEFT,
-;;   GTK_CORNER_BOTTOM_LEFT,
-;;   GTK_CORNER_TOP_RIGHT,
-;;   GTK_CORNER_BOTTOM_RIGHT
-;; } GtkCornerType;
-
-(define-enum-extended CornerType
+(define-enum-extended StateType
   (in-module "Gtk")
-  (c-name "GtkCornerType")
+  (c-name "GtkStateType")
   (values
-    '("top-left" "GTK_CORNER_TOP_LEFT" "0")
-    '("bottom-left" "GTK_CORNER_BOTTOM_LEFT" "1")
-    '("top-right" "GTK_CORNER_TOP_RIGHT" "2")
-    '("bottom-right" "GTK_CORNER_BOTTOM_RIGHT" "3")
+    '("normal" "GTK_STATE_NORMAL" "0")
+    '("active" "GTK_STATE_ACTIVE" "1")
+    '("prelight" "GTK_STATE_PRELIGHT" "2")
+    '("selected" "GTK_STATE_SELECTED" "3")
+    '("insensitive" "GTK_STATE_INSENSITIVE" "4")
+    '("inconsistent" "GTK_STATE_INCONSISTENT" "5")
+    '("focused" "GTK_STATE_FOCUSED" "6")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_POLICY_ALWAYS,
-;;   GTK_POLICY_AUTOMATIC,
-;;   GTK_POLICY_NEVER,
-;;   GTK_POLICY_EXTERNAL
-;; } GtkPolicyType;
-
-(define-enum-extended PolicyType
+(define-flags-extended StyleContextPrintFlags
   (in-module "Gtk")
-  (c-name "GtkPolicyType")
+  (c-name "GtkStyleContextPrintFlags")
   (values
-    '("always" "GTK_POLICY_ALWAYS" "0")
-    '("automatic" "GTK_POLICY_AUTOMATIC" "1")
-    '("never" "GTK_POLICY_NEVER" "2")
-    '("external" "GTK_POLICY_EXTERNAL" "3")
+    '("none" "GTK_STYLE_CONTEXT_PRINT_NONE" "0")
+    '("recurse" "GTK_STYLE_CONTEXT_PRINT_RECURSE" "1")
+    '("show_style" "GTK_STYLE_CONTEXT_PRINT_SHOW_STYLE" "2")
   )
 )
 
-;; From gtkselection.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_TARGET_SAME_APP = 1 << 0,    /*< nick=same-app >*/
-;;   GTK_TARGET_SAME_WIDGET = 1 << 1, /*< nick=same-widget >*/
-;;   GTK_TARGET_OTHER_APP = 1 << 2,   /*< nick=other-app >*/
-;;   GTK_TARGET_OTHER_WIDGET = 1 << 3 /*< nick=other-widget >*/
-;; } GtkTargetFlags;
-
 (define-flags-extended TargetFlags
   (in-module "Gtk")
   (c-name "GtkTargetFlags")
   (values
-    '("same-app" "GTK_TARGET_SAME_APP" "1 << 0")
-    '("same-widget" "GTK_TARGET_SAME_WIDGET" "1 << 1")
-    '("other-app" "GTK_TARGET_OTHER_APP" "1 << 2")
-    '("other-widget" "GTK_TARGET_OTHER_WIDGET" "1 << 3")
+    '("same_app" "GTK_TARGET_SAME_APP" "1")
+    '("same_widget" "GTK_TARGET_SAME_WIDGET" "2")
+    '("other_app" "GTK_TARGET_OTHER_APP" "4")
+    '("other_widget" "GTK_TARGET_OTHER_WIDGET" "8")
   )
 )
 
-;; From gtkshortcutsshortcut.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_SHORTCUT_ACCELERATOR,
-;;   GTK_SHORTCUT_GESTURE_PINCH,
-;;   GTK_SHORTCUT_GESTURE_STRETCH,
-;;   GTK_SHORTCUT_GESTURE_ROTATE_CLOCKWISE,
-;;   GTK_SHORTCUT_GESTURE_ROTATE_COUNTERCLOCKWISE,
-;;   GTK_SHORTCUT_GESTURE_TWO_FINGER_SWIPE_LEFT,
-;;   GTK_SHORTCUT_GESTURE_TWO_FINGER_SWIPE_RIGHT,
-;;   GTK_SHORTCUT_GESTURE
-;; } GtkShortcutType;
-
-(define-enum-extended ShortcutType
+(define-enum-extended TextBufferTargetInfo
   (in-module "Gtk")
-  (c-name "GtkShortcutType")
+  (c-name "GtkTextBufferTargetInfo")
   (values
-    '("accelerator" "GTK_SHORTCUT_ACCELERATOR" "0")
-    '("gesture-pinch" "GTK_SHORTCUT_GESTURE_PINCH" "1")
-    '("gesture-stretch" "GTK_SHORTCUT_GESTURE_STRETCH" "2")
-    '("gesture-rotate-clockwise" "GTK_SHORTCUT_GESTURE_ROTATE_CLOCKWISE" "3")
-    '("gesture-rotate-counterclockwise" "GTK_SHORTCUT_GESTURE_ROTATE_COUNTERCLOCKWISE" "4")
-    '("gesture-two-finger-swipe-left" "GTK_SHORTCUT_GESTURE_TWO_FINGER_SWIPE_LEFT" "5")
-    '("gesture-two-finger-swipe-right" "GTK_SHORTCUT_GESTURE_TWO_FINGER_SWIPE_RIGHT" "6")
-    '("gesture" "GTK_SHORTCUT_GESTURE" "7")
+    '("buffer_contents" "GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS" "-1")
+    '("rich_text" "GTK_TEXT_BUFFER_TARGET_INFO_RICH_TEXT" "-2")
+    '("text" "GTK_TEXT_BUFFER_TARGET_INFO_TEXT" "-3")
   )
 )
 
-;; From gtkspinbutton.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_UPDATE_ALWAYS,
-;;   GTK_UPDATE_IF_VALID
-;; } GtkSpinButtonUpdatePolicy;
-
-(define-enum-extended SpinButtonUpdatePolicy
+(define-enum-extended TextDirection
   (in-module "Gtk")
-  (c-name "GtkSpinButtonUpdatePolicy")
+  (c-name "GtkTextDirection")
   (values
-    '("always" "GTK_UPDATE_ALWAYS" "0")
-    '("if-valid" "GTK_UPDATE_IF_VALID" "1")
+    '("none" "GTK_TEXT_DIR_NONE" "0")
+    '("ltr" "GTK_TEXT_DIR_LTR" "1")
+    '("rtl" "GTK_TEXT_DIR_RTL" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_SPIN_STEP_FORWARD,
-;;   GTK_SPIN_STEP_BACKWARD,
-;;   GTK_SPIN_PAGE_FORWARD,
-;;   GTK_SPIN_PAGE_BACKWARD,
-;;   GTK_SPIN_HOME,
-;;   GTK_SPIN_END,
-;;   GTK_SPIN_USER_DEFINED
-;; } GtkSpinType;
-
-(define-enum-extended SpinType
-  (in-module "Gtk")
-  (c-name "GtkSpinType")
-  (values
-    '("step-forward" "GTK_SPIN_STEP_FORWARD" "0")
-    '("step-backward" "GTK_SPIN_STEP_BACKWARD" "1")
-    '("page-forward" "GTK_SPIN_PAGE_FORWARD" "2")
-    '("page-backward" "GTK_SPIN_PAGE_BACKWARD" "3")
-    '("home" "GTK_SPIN_HOME" "4")
-    '("end" "GTK_SPIN_END" "5")
-    '("user-defined" "GTK_SPIN_USER_DEFINED" "6")
-  )
-)
-
-;; From gtkstack.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_STACK_TRANSITION_TYPE_NONE,
-;;   GTK_STACK_TRANSITION_TYPE_CROSSFADE,
-;;   GTK_STACK_TRANSITION_TYPE_SLIDE_RIGHT,
-;;   GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT,
-;;   GTK_STACK_TRANSITION_TYPE_SLIDE_UP,
-;;   GTK_STACK_TRANSITION_TYPE_SLIDE_DOWN,
-;;   GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT_RIGHT,
-;;   GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN,
-;;   GTK_STACK_TRANSITION_TYPE_OVER_UP,
-;;   GTK_STACK_TRANSITION_TYPE_OVER_DOWN,
-;;   GTK_STACK_TRANSITION_TYPE_OVER_LEFT,
-;;   GTK_STACK_TRANSITION_TYPE_OVER_RIGHT,
-;;   GTK_STACK_TRANSITION_TYPE_UNDER_UP,
-;;   GTK_STACK_TRANSITION_TYPE_UNDER_DOWN,
-;;   GTK_STACK_TRANSITION_TYPE_UNDER_LEFT,
-;;   GTK_STACK_TRANSITION_TYPE_UNDER_RIGHT,
-;;   GTK_STACK_TRANSITION_TYPE_OVER_UP_DOWN,
-;;   GTK_STACK_TRANSITION_TYPE_OVER_DOWN_UP,
-;;   GTK_STACK_TRANSITION_TYPE_OVER_LEFT_RIGHT,
-;;   GTK_STACK_TRANSITION_TYPE_OVER_RIGHT_LEFT
-;; } GtkStackTransitionType;
-
-(define-enum-extended StackTransitionType
-  (in-module "Gtk")
-  (c-name "GtkStackTransitionType")
-  (values
-    '("none" "GTK_STACK_TRANSITION_TYPE_NONE" "0")
-    '("crossfade" "GTK_STACK_TRANSITION_TYPE_CROSSFADE" "1")
-    '("slide-right" "GTK_STACK_TRANSITION_TYPE_SLIDE_RIGHT" "2")
-    '("slide-left" "GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT" "3")
-    '("slide-up" "GTK_STACK_TRANSITION_TYPE_SLIDE_UP" "4")
-    '("slide-down" "GTK_STACK_TRANSITION_TYPE_SLIDE_DOWN" "5")
-    '("slide-left-right" "GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT_RIGHT" "6")
-    '("slide-up-down" "GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN" "7")
-    '("over-up" "GTK_STACK_TRANSITION_TYPE_OVER_UP" "8")
-    '("over-down" "GTK_STACK_TRANSITION_TYPE_OVER_DOWN" "9")
-    '("over-left" "GTK_STACK_TRANSITION_TYPE_OVER_LEFT" "10")
-    '("over-right" "GTK_STACK_TRANSITION_TYPE_OVER_RIGHT" "11")
-    '("under-up" "GTK_STACK_TRANSITION_TYPE_UNDER_UP" "12")
-    '("under-down" "GTK_STACK_TRANSITION_TYPE_UNDER_DOWN" "13")
-    '("under-left" "GTK_STACK_TRANSITION_TYPE_UNDER_LEFT" "14")
-    '("under-right" "GTK_STACK_TRANSITION_TYPE_UNDER_RIGHT" "15")
-    '("over-up-down" "GTK_STACK_TRANSITION_TYPE_OVER_UP_DOWN" "16")
-    '("over-down-up" "GTK_STACK_TRANSITION_TYPE_OVER_DOWN_UP" "17")
-    '("over-left-right" "GTK_STACK_TRANSITION_TYPE_OVER_LEFT_RIGHT" "18")
-    '("over-right-left" "GTK_STACK_TRANSITION_TYPE_OVER_RIGHT_LEFT" "19")
-  )
-)
-
-;; From gtkstylecontext.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_STYLE_CONTEXT_PRINT_NONE         = 0,
-;;   GTK_STYLE_CONTEXT_PRINT_RECURSE      = 1 << 0,
-;;   GTK_STYLE_CONTEXT_PRINT_SHOW_STYLE   = 1 << 1
-;; } GtkStyleContextPrintFlags;
-
-(define-flags-extended StyleContextPrintFlags
+(define-enum-extended TextExtendSelection
   (in-module "Gtk")
-  (c-name "GtkStyleContextPrintFlags")
+  (c-name "GtkTextExtendSelection")
   (values
-    '("none" "GTK_STYLE_CONTEXT_PRINT_NONE" "0x0")
-    '("recurse" "GTK_STYLE_CONTEXT_PRINT_RECURSE" "1 << 0")
-    '("show-style" "GTK_STYLE_CONTEXT_PRINT_SHOW_STYLE" "1 << 1")
+    '("word" "GTK_TEXT_EXTEND_SELECTION_WORD" "0")
+    '("line" "GTK_TEXT_EXTEND_SELECTION_LINE" "1")
   )
 )
 
-;; From gtktextbuffer.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS = - 1,
-;;   GTK_TEXT_BUFFER_TARGET_INFO_RICH_TEXT       = - 2,
-;;   GTK_TEXT_BUFFER_TARGET_INFO_TEXT            = - 3
-;; } GtkTextBufferTargetInfo;
-
-(define-enum-extended TextBufferTargetInfo
+(define-flags-extended TextSearchFlags
   (in-module "Gtk")
-  (c-name "GtkTextBufferTargetInfo")
+  (c-name "GtkTextSearchFlags")
   (values
-    '("buffer-contents" "GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS" "-1")
-    '("rich-text" "GTK_TEXT_BUFFER_TARGET_INFO_RICH_TEXT" "-2")
-    '("text" "GTK_TEXT_BUFFER_TARGET_INFO_TEXT" "-3")
+    '("visible_only" "GTK_TEXT_SEARCH_VISIBLE_ONLY" "1")
+    '("text_only" "GTK_TEXT_SEARCH_TEXT_ONLY" "2")
+    '("case_insensitive" "GTK_TEXT_SEARCH_CASE_INSENSITIVE" "4")
   )
 )
 
-;; From gtktextiter.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_TEXT_SEARCH_VISIBLE_ONLY     = 1 << 0,
-;;   GTK_TEXT_SEARCH_TEXT_ONLY        = 1 << 1,
-;;   GTK_TEXT_SEARCH_CASE_INSENSITIVE = 1 << 2
-;;   /* Possible future plans: SEARCH_REGEXP */
-;; } GtkTextSearchFlags;
-
-(define-flags-extended TextSearchFlags
+(define-enum-extended TextViewLayer
   (in-module "Gtk")
-  (c-name "GtkTextSearchFlags")
+  (c-name "GtkTextViewLayer")
   (values
-    '("visible-only" "GTK_TEXT_SEARCH_VISIBLE_ONLY" "1 << 0")
-    '("text-only" "GTK_TEXT_SEARCH_TEXT_ONLY" "1 << 1")
-    '("case-insensitive" "GTK_TEXT_SEARCH_CASE_INSENSITIVE" "1 << 2")
+    '("below" "GTK_TEXT_VIEW_LAYER_BELOW" "0")
+    '("above" "GTK_TEXT_VIEW_LAYER_ABOVE" "1")
+    '("below_text" "GTK_TEXT_VIEW_LAYER_BELOW_TEXT" "2")
+    '("above_text" "GTK_TEXT_VIEW_LAYER_ABOVE_TEXT" "3")
   )
 )
 
-;; From gtktextview.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   /*< private >*/
-;;   GTK_TEXT_WINDOW_PRIVATE,
-;;   /*< public >*/
-;;   GTK_TEXT_WINDOW_WIDGET,
-;;   GTK_TEXT_WINDOW_TEXT,
-;;   GTK_TEXT_WINDOW_LEFT,
-;;   GTK_TEXT_WINDOW_RIGHT,
-;;   GTK_TEXT_WINDOW_TOP,
-;;   GTK_TEXT_WINDOW_BOTTOM
-;; } GtkTextWindowType;
-
 (define-enum-extended TextWindowType
   (in-module "Gtk")
   (c-name "GtkTextWindowType")
@@ -2653,51 +1340,15 @@
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_TEXT_VIEW_LAYER_BELOW,
-;;   GTK_TEXT_VIEW_LAYER_ABOVE,
-;;   GTK_TEXT_VIEW_LAYER_BELOW_TEXT,
-;;   GTK_TEXT_VIEW_LAYER_ABOVE_TEXT
-;; } GtkTextViewLayer;
-
-(define-enum-extended TextViewLayer
-  (in-module "Gtk")
-  (c-name "GtkTextViewLayer")
-  (values
-    '("below" "GTK_TEXT_VIEW_LAYER_BELOW" "0")
-    '("above" "GTK_TEXT_VIEW_LAYER_ABOVE" "1")
-    '("below-text" "GTK_TEXT_VIEW_LAYER_BELOW_TEXT" "2")
-    '("above-text" "GTK_TEXT_VIEW_LAYER_ABOVE_TEXT" "3")
-  )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_TEXT_EXTEND_SELECTION_WORD,
-;;   GTK_TEXT_EXTEND_SELECTION_LINE
-;; } GtkTextExtendSelection;
-
-(define-enum-extended TextExtendSelection
+(define-flags-extended ToolPaletteDragTargets
   (in-module "Gtk")
-  (c-name "GtkTextExtendSelection")
+  (c-name "GtkToolPaletteDragTargets")
   (values
-    '("word" "GTK_TEXT_EXTEND_SELECTION_WORD" "0")
-    '("line" "GTK_TEXT_EXTEND_SELECTION_LINE" "1")
+    '("items" "GTK_TOOL_PALETTE_DRAG_ITEMS" "1")
+    '("groups" "GTK_TOOL_PALETTE_DRAG_GROUPS" "2")
   )
 )
 
-;; From gtktoolbar.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_TOOLBAR_SPACE_EMPTY,
-;;   GTK_TOOLBAR_SPACE_LINE
-;; } GtkToolbarSpaceStyle;
-
 (define-enum-extended ToolbarSpaceStyle
   (in-module "Gtk")
   (c-name "GtkToolbarSpaceStyle")
@@ -2707,469 +1358,125 @@
   )
 )
 
-;; From gtktoolpalette.h
-
-;; Original typedef:
-;; typedef enum /*< flags >*/
-;; {
-;;   GTK_TOOL_PALETTE_DRAG_ITEMS = (1 << 0),
-;;   GTK_TOOL_PALETTE_DRAG_GROUPS = (1 << 1)
-;; }
-;; GtkToolPaletteDragTargets;
-
-(define-flags-extended ToolPaletteDragTargets
+(define-enum-extended ToolbarStyle
   (in-module "Gtk")
-  (c-name "GtkToolPaletteDragTargets")
+  (c-name "GtkToolbarStyle")
   (values
-    '("items" "GTK_TOOL_PALETTE_DRAG_ITEMS" "(1 << 0)")
-    '("groups" "GTK_TOOL_PALETTE_DRAG_GROUPS" "(1 << 1)")
+    '("icons" "GTK_TOOLBAR_ICONS" "0")
+    '("text" "GTK_TOOLBAR_TEXT" "1")
+    '("both" "GTK_TOOLBAR_BOTH" "2")
+    '("both_horiz" "GTK_TOOLBAR_BOTH_HORIZ" "3")
   )
 )
 
-;; From gtktreemodel.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_TREE_MODEL_ITERS_PERSIST = 1 << 0,
-;;   GTK_TREE_MODEL_LIST_ONLY = 1 << 1
-;; } GtkTreeModelFlags;
-
 (define-flags-extended TreeModelFlags
   (in-module "Gtk")
   (c-name "GtkTreeModelFlags")
   (values
-    '("iters-persist" "GTK_TREE_MODEL_ITERS_PERSIST" "1 << 0")
-    '("list-only" "GTK_TREE_MODEL_LIST_ONLY" "1 << 1")
+    '("iters_persist" "GTK_TREE_MODEL_ITERS_PERSIST" "1")
+    '("list_only" "GTK_TREE_MODEL_LIST_ONLY" "2")
   )
 )
 
-;; From gtktreeviewcolumn.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_TREE_VIEW_COLUMN_GROW_ONLY,
-;;   GTK_TREE_VIEW_COLUMN_AUTOSIZE,
-;;   GTK_TREE_VIEW_COLUMN_FIXED
-;; } GtkTreeViewColumnSizing;
-
 (define-enum-extended TreeViewColumnSizing
   (in-module "Gtk")
   (c-name "GtkTreeViewColumnSizing")
   (values
-    '("grow-only" "GTK_TREE_VIEW_COLUMN_GROW_ONLY" "0")
+    '("grow_only" "GTK_TREE_VIEW_COLUMN_GROW_ONLY" "0")
     '("autosize" "GTK_TREE_VIEW_COLUMN_AUTOSIZE" "1")
     '("fixed" "GTK_TREE_VIEW_COLUMN_FIXED" "2")
   )
 )
 
-;; From gtktreeview.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   /* drop before/after this row */
-;;   GTK_TREE_VIEW_DROP_BEFORE,
-;;   GTK_TREE_VIEW_DROP_AFTER,
-;;   /* drop as a child of this row (with fallback to before or after
-;;    * if into is not possible)
-;;    */
-;;   GTK_TREE_VIEW_DROP_INTO_OR_BEFORE,
-;;   GTK_TREE_VIEW_DROP_INTO_OR_AFTER
-;; } GtkTreeViewDropPosition;
-
 (define-enum-extended TreeViewDropPosition
   (in-module "Gtk")
   (c-name "GtkTreeViewDropPosition")
   (values
     '("before" "GTK_TREE_VIEW_DROP_BEFORE" "0")
     '("after" "GTK_TREE_VIEW_DROP_AFTER" "1")
-    '("into-or-before" "GTK_TREE_VIEW_DROP_INTO_OR_BEFORE" "2")
-    '("into-or-after" "GTK_TREE_VIEW_DROP_INTO_OR_AFTER" "3")
+    '("into_or_before" "GTK_TREE_VIEW_DROP_INTO_OR_BEFORE" "2")
+    '("into_or_after" "GTK_TREE_VIEW_DROP_INTO_OR_AFTER" "3")
   )
 )
 
-;; From gtkwidget.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_WIDGET_HELP_TOOLTIP,
-;;   GTK_WIDGET_HELP_WHATS_THIS
-;; } GtkWidgetHelpType;
-
-(define-enum-extended WidgetHelpType
-  (in-module "Gtk")
-  (c-name "GtkWidgetHelpType")
-  (values
-    '("tooltip" "GTK_WIDGET_HELP_TOOLTIP" "0")
-    '("whats-this" "GTK_WIDGET_HELP_WHATS_THIS" "1")
-  )
-)
-
-;; From gtkwin32embed.h
-
-;; Original typedef:
-;; typedef enum {                                      /* send or post? */
-;;   /* First those sent from the socket
-;;    * to the plug
-;;    */
-;;   GTK_WIN32_EMBED_WINDOW_ACTIVATE,          /* post */
-;;   GTK_WIN32_EMBED_WINDOW_DEACTIVATE,                /* post */
-;;   GTK_WIN32_EMBED_FOCUS_IN,                 /* post */
-;;   GTK_WIN32_EMBED_FOCUS_OUT,                        /* post */
-;;   GTK_WIN32_EMBED_MODALITY_ON,                      /* post */
-;;   GTK_WIN32_EMBED_MODALITY_OFF,                     /* post */
-;; 
-;;   /* Then the ones sent from the plug
-;;    * to the socket.
-;;    */
-;;   GTK_WIN32_EMBED_PARENT_NOTIFY,            /* post */
-;;   GTK_WIN32_EMBED_EVENT_PLUG_MAPPED,                /* post */
-;;   GTK_WIN32_EMBED_PLUG_RESIZED,                     /* post */
-;;   GTK_WIN32_EMBED_REQUEST_FOCUS,            /* post */
-;;   GTK_WIN32_EMBED_FOCUS_NEXT,                       /* post */
-;;   GTK_WIN32_EMBED_FOCUS_PREV,                       /* post */
-;;   GTK_WIN32_EMBED_GRAB_KEY,                 /* post */
-;;   GTK_WIN32_EMBED_UNGRAB_KEY,                       /* post */
-;;   GTK_WIN32_EMBED_LAST
-;; } GtkWin32EmbedMessageType;
-
-(define-enum-extended Win32EmbedMessageType
-  (in-module "Gtk")
-  (c-name "GtkWin32EmbedMessageType")
-  (values
-    '("window-activate" "GTK_WIN32_EMBED_WINDOW_ACTIVATE" "0")
-    '("window-deactivate" "GTK_WIN32_EMBED_WINDOW_DEACTIVATE" "1")
-    '("focus-in" "GTK_WIN32_EMBED_FOCUS_IN" "2")
-    '("focus-out" "GTK_WIN32_EMBED_FOCUS_OUT" "3")
-    '("modality-on" "GTK_WIN32_EMBED_MODALITY_ON" "4")
-    '("modality-off" "GTK_WIN32_EMBED_MODALITY_OFF" "5")
-    '("parent-notify" "GTK_WIN32_EMBED_PARENT_NOTIFY" "6")
-    '("event-plug-mapped" "GTK_WIN32_EMBED_EVENT_PLUG_MAPPED" "7")
-    '("plug-resized" "GTK_WIN32_EMBED_PLUG_RESIZED" "8")
-    '("request-focus" "GTK_WIN32_EMBED_REQUEST_FOCUS" "9")
-    '("focus-next" "GTK_WIN32_EMBED_FOCUS_NEXT" "10")
-    '("focus-prev" "GTK_WIN32_EMBED_FOCUS_PREV" "11")
-    '("grab-key" "GTK_WIN32_EMBED_GRAB_KEY" "12")
-    '("ungrab-key" "GTK_WIN32_EMBED_UNGRAB_KEY" "13")
-    '("last" "GTK_WIN32_EMBED_LAST" "14")
-  )
-)
-
-;; From gtkwindow.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_WINDOW_TOPLEVEL,
-;;   GTK_WINDOW_POPUP
-;; } GtkWindowType;
-
-(define-enum-extended WindowType
+(define-enum-extended TreeViewGridLines
   (in-module "Gtk")
-  (c-name "GtkWindowType")
+  (c-name "GtkTreeViewGridLines")
   (values
-    '("toplevel" "GTK_WINDOW_TOPLEVEL" "0")
-    '("popup" "GTK_WINDOW_POPUP" "1")
+    '("none" "GTK_TREE_VIEW_GRID_LINES_NONE" "0")
+    '("horizontal" "GTK_TREE_VIEW_GRID_LINES_HORIZONTAL" "1")
+    '("vertical" "GTK_TREE_VIEW_GRID_LINES_VERTICAL" "2")
+    '("both" "GTK_TREE_VIEW_GRID_LINES_BOTH" "3")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_WIN_POS_NONE,
-;;   GTK_WIN_POS_CENTER,
-;;   GTK_WIN_POS_MOUSE,
-;;   GTK_WIN_POS_CENTER_ALWAYS,
-;;   GTK_WIN_POS_CENTER_ON_PARENT
-;; } GtkWindowPosition;
-
-(define-enum-extended WindowPosition
-  (in-module "Gtk")
-  (c-name "GtkWindowPosition")
-  (values
-    '("none" "GTK_WIN_POS_NONE" "0")
-    '("center" "GTK_WIN_POS_CENTER" "1")
-    '("mouse" "GTK_WIN_POS_MOUSE" "2")
-    '("center-always" "GTK_WIN_POS_CENTER_ALWAYS" "3")
-    '("center-on-parent" "GTK_WIN_POS_CENTER_ON_PARENT" "4")
-  )
-)
-
-;; From xembed.h
-
-;; Original typedef:
-;; typedef enum {
-;;   XEMBED_EMBEDDED_NOTIFY        = 0,
-;;   XEMBED_WINDOW_ACTIVATE        = 1,
-;;   XEMBED_WINDOW_DEACTIVATE      = 2,
-;;   XEMBED_REQUEST_FOCUS          = 3,
-;;   XEMBED_FOCUS_IN               = 4,
-;;   XEMBED_FOCUS_OUT              = 5,
-;;   XEMBED_FOCUS_NEXT             = 6,
-;;   XEMBED_FOCUS_PREV             = 7,
-;;   XEMBED_GRAB_KEY               = 8,
-;;   XEMBED_UNGRAB_KEY             = 9,
-;;   XEMBED_MODALITY_ON            = 10,
-;;   XEMBED_MODALITY_OFF           = 11,
-;; 
-;; /* Non standard messages*/
-;;   XEMBED_GTK_GRAB_KEY           = 108, 
-;;   XEMBED_GTK_UNGRAB_KEY         = 109
-;; } XEmbedMessageType;
-
-(define-enum-extended XEmbedMessageType
-  (in-module "Gtk")
-  (c-name "XEmbedMessageType")
-  (values
-    '("embedded-notify" "XEMBED_EMBEDDED_NOTIFY" "0")
-    '("window-activate" "XEMBED_WINDOW_ACTIVATE" "1")
-    '("window-deactivate" "XEMBED_WINDOW_DEACTIVATE" "2")
-    '("request-focus" "XEMBED_REQUEST_FOCUS" "3")
-    '("focus-in" "XEMBED_FOCUS_IN" "4")
-    '("focus-out" "XEMBED_FOCUS_OUT" "5")
-    '("focus-next" "XEMBED_FOCUS_NEXT" "6")
-    '("focus-prev" "XEMBED_FOCUS_PREV" "7")
-    '("grab-key" "XEMBED_GRAB_KEY" "8")
-    '("ungrab-key" "XEMBED_UNGRAB_KEY" "9")
-    '("modality-on" "XEMBED_MODALITY_ON" "10")
-    '("modality-off" "XEMBED_MODALITY_OFF" "11")
-    '("gtk-grab-key" "XEMBED_GTK_GRAB_KEY" "108")
-    '("gtk-ungrab-key" "XEMBED_GTK_UNGRAB_KEY" "109")
-  )
-)
-
-;; From gtkrc.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_RC_FG             = 1 << 0,
-;;   GTK_RC_BG             = 1 << 1,
-;;   GTK_RC_TEXT           = 1 << 2,
-;;   GTK_RC_BASE           = 1 << 3
-;; } GtkRcFlags;
-
-(define-flags-extended RcFlags
-  (in-module "Gtk")
-  (c-name "GtkRcFlags")
-  (values
-    '("fg" "GTK_RC_FG" "1 << 0")
-    '("bg" "GTK_RC_BG" "1 << 1")
-    '("text" "GTK_RC_TEXT" "1 << 2")
-    '("base" "GTK_RC_BASE" "1 << 3")
-  )
-)
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_RC_TOKEN_INVALID = G_TOKEN_LAST,
-;;   GTK_RC_TOKEN_INCLUDE,
-;;   GTK_RC_TOKEN_NORMAL,
-;;   GTK_RC_TOKEN_ACTIVE,
-;;   GTK_RC_TOKEN_PRELIGHT,
-;;   GTK_RC_TOKEN_SELECTED,
-;;   GTK_RC_TOKEN_INSENSITIVE,
-;;   GTK_RC_TOKEN_FG,
-;;   GTK_RC_TOKEN_BG,
-;;   GTK_RC_TOKEN_TEXT,
-;;   GTK_RC_TOKEN_BASE,
-;;   GTK_RC_TOKEN_XTHICKNESS,
-;;   GTK_RC_TOKEN_YTHICKNESS,
-;;   GTK_RC_TOKEN_FONT,
-;;   GTK_RC_TOKEN_FONTSET,
-;;   GTK_RC_TOKEN_FONT_NAME,
-;;   GTK_RC_TOKEN_BG_PIXMAP,
-;;   GTK_RC_TOKEN_PIXMAP_PATH,
-;;   GTK_RC_TOKEN_STYLE,
-;;   GTK_RC_TOKEN_BINDING,
-;;   GTK_RC_TOKEN_BIND,
-;;   GTK_RC_TOKEN_WIDGET,
-;;   GTK_RC_TOKEN_WIDGET_CLASS,
-;;   GTK_RC_TOKEN_CLASS,
-;;   GTK_RC_TOKEN_LOWEST,
-;;   GTK_RC_TOKEN_GTK,
-;;   GTK_RC_TOKEN_APPLICATION,
-;;   GTK_RC_TOKEN_THEME,
-;;   GTK_RC_TOKEN_RC,
-;;   GTK_RC_TOKEN_HIGHEST,
-;;   GTK_RC_TOKEN_ENGINE,
-;;   GTK_RC_TOKEN_MODULE_PATH,
-;;   GTK_RC_TOKEN_IM_MODULE_PATH,
-;;   GTK_RC_TOKEN_IM_MODULE_FILE,
-;;   GTK_RC_TOKEN_STOCK,
-;;   GTK_RC_TOKEN_LTR,
-;;   GTK_RC_TOKEN_RTL,
-;;   GTK_RC_TOKEN_COLOR,
-;;   GTK_RC_TOKEN_UNBIND,
-;;   GTK_RC_TOKEN_LAST
-;; } GtkRcTokenType;
-
-(define-enum-extended RcTokenType
+(define-flags-extended UIManagerItemType
   (in-module "Gtk")
-  (c-name "GtkRcTokenType")
+  (c-name "GtkUIManagerItemType")
   (values
-    '("invalid" "GTK_RC_TOKEN_INVALID" "G_TOKEN_LAST")
-    '("include" "GTK_RC_TOKEN_INCLUDE" "(G_TOKEN_LAST) + 1")
-    '("normal" "GTK_RC_TOKEN_NORMAL" "(G_TOKEN_LAST) + 2")
-    '("active" "GTK_RC_TOKEN_ACTIVE" "(G_TOKEN_LAST) + 3")
-    '("prelight" "GTK_RC_TOKEN_PRELIGHT" "(G_TOKEN_LAST) + 4")
-    '("selected" "GTK_RC_TOKEN_SELECTED" "(G_TOKEN_LAST) + 5")
-    '("insensitive" "GTK_RC_TOKEN_INSENSITIVE" "(G_TOKEN_LAST) + 6")
-    '("fg" "GTK_RC_TOKEN_FG" "(G_TOKEN_LAST) + 7")
-    '("bg" "GTK_RC_TOKEN_BG" "(G_TOKEN_LAST) + 8")
-    '("text" "GTK_RC_TOKEN_TEXT" "(G_TOKEN_LAST) + 9")
-    '("base" "GTK_RC_TOKEN_BASE" "(G_TOKEN_LAST) + 10")
-    '("xthickness" "GTK_RC_TOKEN_XTHICKNESS" "(G_TOKEN_LAST) + 11")
-    '("ythickness" "GTK_RC_TOKEN_YTHICKNESS" "(G_TOKEN_LAST) + 12")
-    '("font" "GTK_RC_TOKEN_FONT" "(G_TOKEN_LAST) + 13")
-    '("fontset" "GTK_RC_TOKEN_FONTSET" "(G_TOKEN_LAST) + 14")
-    '("font-name" "GTK_RC_TOKEN_FONT_NAME" "(G_TOKEN_LAST) + 15")
-    '("bg-pixmap" "GTK_RC_TOKEN_BG_PIXMAP" "(G_TOKEN_LAST) + 16")
-    '("pixmap-path" "GTK_RC_TOKEN_PIXMAP_PATH" "(G_TOKEN_LAST) + 17")
-    '("style" "GTK_RC_TOKEN_STYLE" "(G_TOKEN_LAST) + 18")
-    '("binding" "GTK_RC_TOKEN_BINDING" "(G_TOKEN_LAST) + 19")
-    '("bind" "GTK_RC_TOKEN_BIND" "(G_TOKEN_LAST) + 20")
-    '("widget" "GTK_RC_TOKEN_WIDGET" "(G_TOKEN_LAST) + 21")
-    '("widget-class" "GTK_RC_TOKEN_WIDGET_CLASS" "(G_TOKEN_LAST) + 22")
-    '("class" "GTK_RC_TOKEN_CLASS" "(G_TOKEN_LAST) + 23")
-    '("lowest" "GTK_RC_TOKEN_LOWEST" "(G_TOKEN_LAST) + 24")
-    '("gtk" "GTK_RC_TOKEN_GTK" "(G_TOKEN_LAST) + 25")
-    '("application" "GTK_RC_TOKEN_APPLICATION" "(G_TOKEN_LAST) + 26")
-    '("theme" "GTK_RC_TOKEN_THEME" "(G_TOKEN_LAST) + 27")
-    '("rc" "GTK_RC_TOKEN_RC" "(G_TOKEN_LAST) + 28")
-    '("highest" "GTK_RC_TOKEN_HIGHEST" "(G_TOKEN_LAST) + 29")
-    '("engine" "GTK_RC_TOKEN_ENGINE" "(G_TOKEN_LAST) + 30")
-    '("module-path" "GTK_RC_TOKEN_MODULE_PATH" "(G_TOKEN_LAST) + 31")
-    '("im-module-path" "GTK_RC_TOKEN_IM_MODULE_PATH" "(G_TOKEN_LAST) + 32")
-    '("im-module-file" "GTK_RC_TOKEN_IM_MODULE_FILE" "(G_TOKEN_LAST) + 33")
-    '("stock" "GTK_RC_TOKEN_STOCK" "(G_TOKEN_LAST) + 34")
-    '("ltr" "GTK_RC_TOKEN_LTR" "(G_TOKEN_LAST) + 35")
-    '("rtl" "GTK_RC_TOKEN_RTL" "(G_TOKEN_LAST) + 36")
-    '("color" "GTK_RC_TOKEN_COLOR" "(G_TOKEN_LAST) + 37")
-    '("unbind" "GTK_RC_TOKEN_UNBIND" "(G_TOKEN_LAST) + 38")
-    '("last" "GTK_RC_TOKEN_LAST" "(G_TOKEN_LAST) + 39")
-  )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_PATH_PRIO_LOWEST      = 0,
-;;   GTK_PATH_PRIO_GTK         = 4,
-;;   GTK_PATH_PRIO_APPLICATION = 8,
-;;   GTK_PATH_PRIO_THEME       = 10,
-;;   GTK_PATH_PRIO_RC          = 12,
-;;   GTK_PATH_PRIO_HIGHEST     = 15
-;; } GtkPathPriorityType;
+    '("auto" "GTK_UI_MANAGER_AUTO" "0")
+    '("menubar" "GTK_UI_MANAGER_MENUBAR" "1")
+    '("menu" "GTK_UI_MANAGER_MENU" "2")
+    '("toolbar" "GTK_UI_MANAGER_TOOLBAR" "4")
+    '("placeholder" "GTK_UI_MANAGER_PLACEHOLDER" "8")
+    '("popup" "GTK_UI_MANAGER_POPUP" "16")
+    '("menuitem" "GTK_UI_MANAGER_MENUITEM" "32")
+    '("toolitem" "GTK_UI_MANAGER_TOOLITEM" "64")
+    '("separator" "GTK_UI_MANAGER_SEPARATOR" "128")
+    '("accelerator" "GTK_UI_MANAGER_ACCELERATOR" "256")
+    '("popup_with_accels" "GTK_UI_MANAGER_POPUP_WITH_ACCELS" "512")
+  )
+)
 
-(define-enum-extended PathPriorityType
+(define-enum-extended Unit
   (in-module "Gtk")
-  (c-name "GtkPathPriorityType")
+  (c-name "GtkUnit")
   (values
-    '("lowest" "GTK_PATH_PRIO_LOWEST" "0")
-    '("gtk" "GTK_PATH_PRIO_GTK" "4")
-    '("application" "GTK_PATH_PRIO_APPLICATION" "8")
-    '("theme" "GTK_PATH_PRIO_THEME" "10")
-    '("rc" "GTK_PATH_PRIO_RC" "12")
-    '("highest" "GTK_PATH_PRIO_HIGHEST" "15")
+    '("none" "GTK_UNIT_NONE" "0")
+    '("points" "GTK_UNIT_POINTS" "1")
+    '("inch" "GTK_UNIT_INCH" "2")
+    '("mm" "GTK_UNIT_MM" "3")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_PATH_WIDGET,
-;;   GTK_PATH_WIDGET_CLASS,
-;;   GTK_PATH_CLASS
-;; } GtkPathType;
-
-(define-enum-extended PathType
+(define-enum-extended WidgetHelpType
   (in-module "Gtk")
-  (c-name "GtkPathType")
+  (c-name "GtkWidgetHelpType")
   (values
-    '("widget" "GTK_PATH_WIDGET" "0")
-    '("widget-class" "GTK_PATH_WIDGET_CLASS" "1")
-    '("class" "GTK_PATH_CLASS" "2")
+    '("tooltip" "GTK_WIDGET_HELP_TOOLTIP" "0")
+    '("whats_this" "GTK_WIDGET_HELP_WHATS_THIS" "1")
   )
 )
 
-;; From gtkstyle.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_EXPANDER_COLLAPSED,
-;;   GTK_EXPANDER_SEMI_COLLAPSED,
-;;   GTK_EXPANDER_SEMI_EXPANDED,
-;;   GTK_EXPANDER_EXPANDED
-;; } GtkExpanderStyle;
-
-(define-enum-extended ExpanderStyle
+(define-enum-extended WindowPosition
   (in-module "Gtk")
-  (c-name "GtkExpanderStyle")
+  (c-name "GtkWindowPosition")
   (values
-    '("collapsed" "GTK_EXPANDER_COLLAPSED" "0")
-    '("semi-collapsed" "GTK_EXPANDER_SEMI_COLLAPSED" "1")
-    '("semi-expanded" "GTK_EXPANDER_SEMI_EXPANDED" "2")
-    '("expanded" "GTK_EXPANDER_EXPANDED" "3")
+    '("none" "GTK_WIN_POS_NONE" "0")
+    '("center" "GTK_WIN_POS_CENTER" "1")
+    '("mouse" "GTK_WIN_POS_MOUSE" "2")
+    '("center_always" "GTK_WIN_POS_CENTER_ALWAYS" "3")
+    '("center_on_parent" "GTK_WIN_POS_CENTER_ON_PARENT" "4")
   )
 )
 
-;; From gtktable.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   GTK_EXPAND = 1 << 0,
-;;   GTK_SHRINK = 1 << 1,
-;;   GTK_FILL   = 1 << 2
-;; } GtkAttachOptions;
-
-(define-flags-extended AttachOptions
+(define-enum-extended WindowType
   (in-module "Gtk")
-  (c-name "GtkAttachOptions")
+  (c-name "GtkWindowType")
   (values
-    '("expand" "GTK_EXPAND" "1 << 0")
-    '("shrink" "GTK_SHRINK" "1 << 1")
-    '("fill" "GTK_FILL" "1 << 2")
+    '("toplevel" "GTK_WINDOW_TOPLEVEL" "0")
+    '("popup" "GTK_WINDOW_POPUP" "1")
   )
 )
 
-;; From gtkuimanager.h
-
-;; Original typedef:
-;; typedef enum {
-;;   GTK_UI_MANAGER_AUTO              = 0,
-;;   GTK_UI_MANAGER_MENUBAR           = 1 << 0,
-;;   GTK_UI_MANAGER_MENU              = 1 << 1,
-;;   GTK_UI_MANAGER_TOOLBAR           = 1 << 2,
-;;   GTK_UI_MANAGER_PLACEHOLDER       = 1 << 3,
-;;   GTK_UI_MANAGER_POPUP             = 1 << 4,
-;;   GTK_UI_MANAGER_MENUITEM          = 1 << 5,
-;;   GTK_UI_MANAGER_TOOLITEM          = 1 << 6,
-;;   GTK_UI_MANAGER_SEPARATOR         = 1 << 7,
-;;   GTK_UI_MANAGER_ACCELERATOR       = 1 << 8,
-;;   GTK_UI_MANAGER_POPUP_WITH_ACCELS = 1 << 9
-;; } GtkUIManagerItemType;
-
-(define-flags-extended UIManagerItemType
+(define-enum-extended WrapMode
   (in-module "Gtk")
-  (c-name "GtkUIManagerItemType")
+  (c-name "GtkWrapMode")
   (values
-    '("auto" "GTK_UI_MANAGER_AUTO" "0x0")
-    '("menubar" "GTK_UI_MANAGER_MENUBAR" "1 << 0")
-    '("menu" "GTK_UI_MANAGER_MENU" "1 << 1")
-    '("toolbar" "GTK_UI_MANAGER_TOOLBAR" "1 << 2")
-    '("placeholder" "GTK_UI_MANAGER_PLACEHOLDER" "1 << 3")
-    '("popup" "GTK_UI_MANAGER_POPUP" "1 << 4")
-    '("menuitem" "GTK_UI_MANAGER_MENUITEM" "1 << 5")
-    '("toolitem" "GTK_UI_MANAGER_TOOLITEM" "1 << 6")
-    '("separator" "GTK_UI_MANAGER_SEPARATOR" "1 << 7")
-    '("accelerator" "GTK_UI_MANAGER_ACCELERATOR" "1 << 8")
-    '("popup-with-accels" "GTK_UI_MANAGER_POPUP_WITH_ACCELS" "1 << 9")
+    '("none" "GTK_WRAP_NONE" "0")
+    '("char" "GTK_WRAP_CHAR" "1")
+    '("word" "GTK_WRAP_WORD" "2")
+    '("word_char" "GTK_WRAP_WORD_CHAR" "3")
   )
 )
 
diff --git a/tools/gen_scripts/gtkmm_generate_defs.sh b/tools/gen_scripts/gtkmm_generate_defs.sh
new file mode 100755
index 0000000..1e6be42
--- /dev/null
+++ b/tools/gen_scripts/gtkmm_generate_defs.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+if [ -z "$GTKMM_DIR" ]; then
+  echo -e "GTKMM_DIR must contain the path to the gtkmm repository."
+  exit 1;
+fi
+
+function patch_directory {
+    PATCH_OPTIONS="--backup --version-control=simple --suffix=.orig"
+    for patch_file in $1/*.patch;
+    do
+       orig_file=$(echo $patch_file | sed s/.patch$//)
+       patch $PATCH_OPTIONS $orig_file $patch_file
+    done
+}
+
+MMGIRGEN_PATH=mmgirgenerator
+
+############## Gdk ###############
+# Gdk enums
+$MMGIRGEN_PATH Gdk-3.0 \
+    --namespace=Gdk \
+    --print-enum > $GTKMM_DIR/gdk/src/gdk_enums.defs
+
+patch_directory $GTKMM_DIR/gdk/src
+
+
+############## Gtk ###############
+# Gtk enums
+$MMGIRGEN_PATH Gtk-3.0 \
+    --namespace=Gtk \
+    --print-enum > $GTKMM_DIR/gtk/src/gtk_enums.defs
+
+patch_directory $GTKMM_DIR/gtk/src



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