[gtkmm] Added WrapBox.



commit e15bdaa64ce57d0e26f295bc940dfecbb3c445ee
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Aug 31 11:21:15 2010 +0200

    Added WrapBox.
    
    * gtk/src/gtk_enums.defs: Regenerated with enums.pl.
    * gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
    * gtk/src/buttonbox.hg: Adapted to the removal of the
      BUTTONBOX_DEFAULT_STYLE enum value from GTK+.
    * tools/extra_defs_gen/generate_defs_gtk.cc: Added GtkWrapBox.
    * gtk/src/gtk_signals.defs: Added parts for GtkWrapBox.
    * tools/m4/convert_gtk.m4: Added the GtkWrapBox enums.
    * gtk/src/filelist.am:
      * gtk/src/wrapbox.[hg|ccg]: Added WrapBox.

 ChangeLog                                 |   14 +
 gtk/src/buttonbox.hg                      |    6 +-
 gtk/src/filelist.am                       |    3 +-
 gtk/src/gtk_enums.defs                    | 1590 ++++++++++++++++++++++-------
 gtk/src/gtk_methods.defs                  |  656 +++++++------
 gtk/src/gtk_signals.defs                  |  299 ++++++
 gtk/src/wrapbox.ccg                       |   35 +
 gtk/src/wrapbox.hg                        |   83 ++
 tools/extra_defs_gen/generate_defs_gtk.cc |    3 +-
 tools/m4/convert_gtk.m4                   |    3 +-
 10 files changed, 2003 insertions(+), 689 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ac286a8..d67fd77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-31  Murray Cumming  <murrayc murrayc com>
+
+	Added WrapBox.
+
+	* gtk/src/gtk_enums.defs: Regenerated with enums.pl.
+	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
+	* gtk/src/buttonbox.hg: Adapted to the removal of the
+  BUTTONBOX_DEFAULT_STYLE enum value from GTK+.
+	* tools/extra_defs_gen/generate_defs_gtk.cc: Added GtkWrapBox.
+	* gtk/src/gtk_signals.defs: Added parts for GtkWrapBox.
+	* tools/m4/convert_gtk.m4: Added the GtkWrapBox enums.
+	* gtk/src/filelist.am:
+  * gtk/src/wrapbox.[hg|ccg]: Added WrapBox.
+
 2010-08-30  Murray Cumming  <murrayc murrayc com>
 
 	gtkmm: Added new methods wrapping new C functions.
diff --git a/gtk/src/buttonbox.hg b/gtk/src/buttonbox.hg
index 93419e5..e781ea9 100644
--- a/gtk/src/buttonbox.hg
+++ b/gtk/src/buttonbox.hg
@@ -28,7 +28,7 @@ namespace Gtk
 
 // This is a #define in GTK+, and unrelated to the GtkButtonBoxStyle enum.
 /** @ingroup gtkmmEnums */
-enum { BUTTONBOX_DEFAULT = -1 };
+enum { BUTTONBOX_DEFAULT_SPACING = -1 };
 
 
 /** Base class for Gtk::HButtonBox and Gtk::VButtonBox
@@ -71,7 +71,7 @@ class VButtonBox : public ButtonBox
 {
   _CLASS_GTKOBJECT(VButtonBox,GtkVButtonBox,GTK_VBUTTON_BOX,Gtk::ButtonBox,GtkButtonBox)
 public:
-  explicit VButtonBox(ButtonBoxStyle layout = BUTTONBOX_DEFAULT_STYLE, int spacing = BUTTONBOX_DEFAULT);
+  explicit VButtonBox(ButtonBoxStyle layout = BUTTONBOX_EDGE, int spacing = BUTTONBOX_DEFAULT_SPACING);
 };
 
 /** A container for arranging buttons horizontally.
@@ -93,7 +93,7 @@ class HButtonBox : public ButtonBox
 {
   _CLASS_GTKOBJECT(HButtonBox,GtkHButtonBox,GTK_HBUTTON_BOX,Gtk::ButtonBox,GtkButtonBox)
 public:
-  explicit HButtonBox(ButtonBoxStyle layout = BUTTONBOX_DEFAULT_STYLE, int spacing = BUTTONBOX_DEFAULT);
+  explicit HButtonBox(ButtonBoxStyle layout = BUTTONBOX_EDGE, int spacing = BUTTONBOX_DEFAULT_SPACING);
 };
 
 } // namespace Gtk
diff --git a/gtk/src/filelist.am b/gtk/src/filelist.am
index 2af1c2b..2bb1d59 100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@ -178,7 +178,8 @@ gtkmm_files_any_hg =		\
 	viewport.hg		\
 	volumebutton.hg		\
 	widget.hg		\
-	window.hg
+	window.hg \
+	wrapbox.hg
 
 gtkmm_files_posix_hg =		\
 	pagesetupunixdialog.hg	\
diff --git a/gtk/src/gtk_enums.defs b/gtk/src/gtk_enums.defs
index 782ee0d..11d545f 100644
--- a/gtk/src/gtk_enums.defs
+++ b/gtk/src/gtk_enums.defs
@@ -1,5 +1,48 @@
+;; 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
+;; } GtkLicense;
+
+(define-enum-extended License
+  (in-module "Gtk")
+  (c-name "GtkLicense")
+  (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")
+  )
+)
+
 ;; From gtkaccelgroup.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_ACCEL_VISIBLE        = 1 << 0,	/* display in GtkAccelLabel? */
+;;   GTK_ACCEL_LOCKED         = 1 << 1,	/* is it removable? */
+;;   GTK_ACCEL_MASK           = 0x07
+;; } GtkAccelFlags;
+
 (define-flags-extended AccelFlags
   (in-module "Gtk")
   (c-name "GtkAccelFlags")
@@ -12,6 +55,16 @@
 
 ;; From gtkassistant.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_ASSISTANT_PAGE_CONTENT,
+;;   GTK_ASSISTANT_PAGE_INTRO,
+;;   GTK_ASSISTANT_PAGE_CONFIRM,
+;;   GTK_ASSISTANT_PAGE_SUMMARY,
+;;   GTK_ASSISTANT_PAGE_PROGRESS
+;; } GtkAssistantPageType;
+
 (define-enum-extended AssistantPageType
   (in-module "Gtk")
   (c-name "GtkAssistantPageType")
@@ -26,6 +79,20 @@
 
 ;; 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
+;; } GtkBuilderError;
+
 (define-enum-extended BuilderError
   (in-module "Gtk")
   (c-name "GtkBuilderError")
@@ -44,6 +111,16 @@
 
 ;; 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;
+
 (define-flags-extended CalendarDisplayOptions
   (in-module "Gtk")
   (c-name "GtkCalendarDisplayOptions")
@@ -52,13 +129,19 @@
     '("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")
-    '("week-start-monday" "GTK_CALENDAR_WEEK_START_MONDAY" "1 << 4")
     '("show-details" "GTK_CALENDAR_SHOW_DETAILS" "1 << 5")
   )
 )
 
 ;; 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")
@@ -70,6 +153,17 @@
 
 ;; 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
+;; } GtkCellRendererState;
+
 (define-flags-extended CellRendererState
   (in-module "Gtk")
   (c-name "GtkCellRendererState")
@@ -82,6 +176,14 @@
   )
 )
 
+;; 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")
@@ -92,91 +194,25 @@
   )
 )
 
-;; From gtkclist.h
-
-(define-enum-extended CellType
-  (in-module "Gtk")
-  (c-name "GtkCellType")
-  (values
-    '("empty" "GTK_CELL_EMPTY" "0")
-    '("text" "GTK_CELL_TEXT" "1")
-    '("pixmap" "GTK_CELL_PIXMAP" "2")
-    '("pixtext" "GTK_CELL_PIXTEXT" "3")
-    '("widget" "GTK_CELL_WIDGET" "4")
-  )
-)
-
-(define-enum-extended CListDragPos
-  (in-module "Gtk")
-  (c-name "GtkCListDragPos")
-  (values
-    '("none" "GTK_CLIST_DRAG_NONE" "0")
-    '("before" "GTK_CLIST_DRAG_BEFORE" "1")
-    '("into" "GTK_CLIST_DRAG_INTO" "2")
-    '("after" "GTK_CLIST_DRAG_AFTER" "3")
-  )
-)
-
-(define-flags-extended ButtonAction
-  (in-module "Gtk")
-  (c-name "GtkButtonAction")
-  (values
-    '("ignored" "GTK_BUTTON_IGNORED" "0")
-    '("selects" "GTK_BUTTON_SELECTS" "1 << 0")
-    '("drags" "GTK_BUTTON_DRAGS" "1 << 1")
-    '("expands" "GTK_BUTTON_EXPANDS" "1 << 2")
-  )
-)
-
-;; From gtkctree.h
-
-(define-enum-extended CTreePos
-  (in-module "Gtk")
-  (c-name "GtkCTreePos")
-  (values
-    '("before" "GTK_CTREE_POS_BEFORE" "0")
-    '("as-child" "GTK_CTREE_POS_AS_CHILD" "1")
-    '("after" "GTK_CTREE_POS_AFTER" "2")
-  )
-)
-
-(define-enum-extended CTreeLineStyle
-  (in-module "Gtk")
-  (c-name "GtkCTreeLineStyle")
-  (values
-    '("none" "GTK_CTREE_LINES_NONE" "0")
-    '("solid" "GTK_CTREE_LINES_SOLID" "1")
-    '("dotted" "GTK_CTREE_LINES_DOTTED" "2")
-    '("tabbed" "GTK_CTREE_LINES_TABBED" "3")
-  )
-)
-
-(define-enum-extended CTreeExpanderStyle
-  (in-module "Gtk")
-  (c-name "GtkCTreeExpanderStyle")
-  (values
-    '("none" "GTK_CTREE_EXPANDER_NONE" "0")
-    '("square" "GTK_CTREE_EXPANDER_SQUARE" "1")
-    '("triangle" "GTK_CTREE_EXPANDER_TRIANGLE" "2")
-    '("circular" "GTK_CTREE_EXPANDER_CIRCULAR" "3")
-  )
-)
-
-(define-enum-extended CTreeExpansionType
-  (in-module "Gtk")
-  (c-name "GtkCTreeExpansionType")
-  (values
-    '("expand" "GTK_CTREE_EXPANSION_EXPAND" "0")
-    '("expand-recursive" "GTK_CTREE_EXPANSION_EXPAND_RECURSIVE" "1")
-    '("collapse" "GTK_CTREE_EXPANSION_COLLAPSE" "2")
-    '("collapse-recursive" "GTK_CTREE_EXPANSION_COLLAPSE_RECURSIVE" "3")
-    '("toggle" "GTK_CTREE_EXPANSION_TOGGLE" "4")
-    '("toggle-recursive" "GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE" "5")
-  )
-)
-
 ;; 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
+;; } GtkDebugFlag;
+
 (define-flags-extended DebugFlag
   (in-module "Gtk")
   (c-name "GtkDebugFlag")
@@ -193,11 +229,20 @@
     '("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")
   )
 )
 
 ;; From gtkdialog.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_DIALOG_MODAL               = 1 << 0, /* call gtk_window_set_modal (win, TRUE) */
+;;   GTK_DIALOG_DESTROY_WITH_PARENT = 1 << 1, /* call gtk_window_set_destroy_with_parent () */
+;;   GTK_DIALOG_NO_SEPARATOR        = 1 << 2  /* no separator bar above buttons */
+;; } GtkDialogFlags;
+
 (define-flags-extended DialogFlags
   (in-module "Gtk")
   (c-name "GtkDialogFlags")
@@ -208,6 +253,36 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   /* GTK returns this if a response widget has no response_id,
+;;    * or if the dialog gets programmatically hidden or destroyed.
+;;    */
+;;   GTK_RESPONSE_NONE = -1,
+;; 
+;;   /* GTK won't return these unless you pass them in
+;;    * as the response for an action widget. They are
+;;    * for your convenience.
+;;    */
+;;   GTK_RESPONSE_REJECT = -2,
+;;   GTK_RESPONSE_ACCEPT = -3,
+;; 
+;;   /* If the dialog is deleted. */
+;;   GTK_RESPONSE_DELETE_EVENT = -4,
+;; 
+;;   /* These are returned from GTK dialogs, and you can also use them
+;;    * yourself if you like.
+;;    */
+;;   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
   (in-module "Gtk")
   (c-name "GtkResponseType")
@@ -228,6 +303,14 @@
 
 ;; From gtkdnd.h
 
+;; Original typedef:
+;; typedef enum {
+;;   GTK_DEST_DEFAULT_MOTION     = 1 << 0, /* respond to "drag_motion" */
+;;   GTK_DEST_DEFAULT_HIGHLIGHT  = 1 << 1, /* auto-highlight */
+;;   GTK_DEST_DEFAULT_DROP       = 1 << 2, /* respond to "drag_drop" */
+;;   GTK_DEST_DEFAULT_ALL        = 0x07
+;; } GtkDestDefaults;
+
 (define-flags-extended DestDefaults
   (in-module "Gtk")
   (c-name "GtkDestDefaults")
@@ -239,6 +322,14 @@
   )
 )
 
+;; 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")
@@ -252,6 +343,13 @@
 
 ;; From gtkentry.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_ENTRY_ICON_PRIMARY,
+;;   GTK_ENTRY_ICON_SECONDARY
+;; } GtkEntryIconPosition;
+
 (define-enum-extended EntryIconPosition
   (in-module "Gtk")
   (c-name "GtkEntryIconPosition")
@@ -263,6 +361,28 @@
 
 ;; From gtkenums.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_ANCHOR_CENTER,
+;;   GTK_ANCHOR_NORTH,
+;;   GTK_ANCHOR_NORTH_WEST,
+;;   GTK_ANCHOR_NORTH_EAST,
+;;   GTK_ANCHOR_SOUTH,
+;;   GTK_ANCHOR_SOUTH_WEST,
+;;   GTK_ANCHOR_SOUTH_EAST,
+;;   GTK_ANCHOR_WEST,
+;;   GTK_ANCHOR_EAST,
+;;   GTK_ANCHOR_N		= GTK_ANCHOR_NORTH,
+;;   GTK_ANCHOR_NW		= GTK_ANCHOR_NORTH_WEST,
+;;   GTK_ANCHOR_NE		= GTK_ANCHOR_NORTH_EAST,
+;;   GTK_ANCHOR_S		= GTK_ANCHOR_SOUTH,
+;;   GTK_ANCHOR_SW		= GTK_ANCHOR_SOUTH_WEST,
+;;   GTK_ANCHOR_SE		= GTK_ANCHOR_SOUTH_EAST,
+;;   GTK_ANCHOR_W		= GTK_ANCHOR_WEST,
+;;   GTK_ANCHOR_E		= GTK_ANCHOR_EAST
+;; } GtkAnchorType;
+
 (define-enum-extended AnchorType
   (in-module "Gtk")
   (c-name "GtkAnchorType")
@@ -287,6 +407,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_ARROWS_BOTH,
+;;   GTK_ARROWS_START,
+;;   GTK_ARROWS_END
+;; } GtkArrowPlacement;
+
 (define-enum-extended ArrowPlacement
   (in-module "Gtk")
   (c-name "GtkArrowPlacement")
@@ -297,6 +425,16 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_ARROW_UP,
+;;   GTK_ARROW_DOWN,
+;;   GTK_ARROW_LEFT,
+;;   GTK_ARROW_RIGHT,
+;;   GTK_ARROW_NONE
+;; } GtkArrowType;
+
 (define-enum-extended ArrowType
   (in-module "Gtk")
   (c-name "GtkArrowType")
@@ -309,6 +447,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_EXPAND = 1 << 0,
+;;   GTK_SHRINK = 1 << 1,
+;;   GTK_FILL   = 1 << 2
+;; } GtkAttachOptions;
+
 (define-flags-extended AttachOptions
   (in-module "Gtk")
   (c-name "GtkAttachOptions")
@@ -319,11 +465,20 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_BUTTONBOX_SPREAD = 1,
+;;   GTK_BUTTONBOX_EDGE,
+;;   GTK_BUTTONBOX_START,
+;;   GTK_BUTTONBOX_END,
+;;   GTK_BUTTONBOX_CENTER
+;; } GtkButtonBoxStyle;
+
 (define-enum-extended ButtonBoxStyle
   (in-module "Gtk")
   (c-name "GtkButtonBoxStyle")
   (values
-    '("default-style" "GTK_BUTTONBOX_DEFAULT_STYLE" "0")
     '("spread" "GTK_BUTTONBOX_SPREAD" "1")
     '("edge" "GTK_BUTTONBOX_EDGE" "2")
     '("start" "GTK_BUTTONBOX_START" "3")
@@ -332,29 +487,46 @@
   )
 )
 
-(define-enum-extended CurveType
-  (in-module "Gtk")
-  (c-name "GtkCurveType")
-  (values
-    '("linear" "GTK_CURVE_TYPE_LINEAR" "0")
-    '("spline" "GTK_CURVE_TYPE_SPLINE" "1")
-    '("free" "GTK_CURVE_TYPE_FREE" "2")
-  )
-)
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_DELETE_CHARS,
+;;   GTK_DELETE_WORD_ENDS,           /* delete only the portion of the word to the
+;;                                    * left/right of cursor if we're in the middle
+;;                                    * of a word */
+;;   GTK_DELETE_WORDS,
+;;   GTK_DELETE_DISPLAY_LINES,
+;;   GTK_DELETE_DISPLAY_LINE_ENDS,
+;;   GTK_DELETE_PARAGRAPH_ENDS,      /* like C-k in Emacs (or its reverse) */
+;;   GTK_DELETE_PARAGRAPHS,          /* C-k in pico, kill whole line */
+;;   GTK_DELETE_WHITESPACE           /* M-\ in Emacs */
+;; } GtkDeleteType;
 
 (define-enum-extended DeleteType
   (in-module "Gtk")
   (c-name "GtkDeleteType")
   (values
     '("chars" "GTK_DELETE_CHARS" "0")
-    '("words" "GTK_DELETE_WORDS" "1")
-    '("display-lines" "GTK_DELETE_DISPLAY_LINES" "2")
-    '("display-line-ends" "GTK_DELETE_DISPLAY_LINE_ENDS" "3")
-    '("paragraph-ends" "GTK_DELETE_PARAGRAPH_ENDS" "4")
-    '("paragraphs" "GTK_DELETE_PARAGRAPHS" "5")
-    '("whitespace" "GTK_DELETE_WHITESPACE" "6")
-  )
-)
+    '("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")
+  )
+)
+
+;; 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
   (in-module "Gtk")
@@ -369,6 +541,15 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_EXPANDER_COLLAPSED,
+;;   GTK_EXPANDER_SEMI_COLLAPSED,
+;;   GTK_EXPANDER_SEMI_EXPANDED,
+;;   GTK_EXPANDER_EXPANDED
+;; } GtkExpanderStyle;
+
 (define-enum-extended ExpanderStyle
   (in-module "Gtk")
   (c-name "GtkExpanderStyle")
@@ -380,6 +561,18 @@
   )
 )
 
+;; 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
   (in-module "Gtk")
   (c-name "GtkIconSize")
@@ -394,6 +587,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_SENSITIVITY_AUTO,
+;;   GTK_SENSITIVITY_ON,
+;;   GTK_SENSITIVITY_OFF
+;; } GtkSensitivityType;
+
 (define-enum-extended SensitivityType
   (in-module "Gtk")
   (c-name "GtkSensitivityType")
@@ -404,6 +605,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_TEXT_DIR_NONE,
+;;   GTK_TEXT_DIR_LTR,
+;;   GTK_TEXT_DIR_RTL
+;; } GtkTextDirection;
+
 (define-enum-extended TextDirection
   (in-module "Gtk")
   (c-name "GtkTextDirection")
@@ -414,6 +623,15 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_JUSTIFY_LEFT,
+;;   GTK_JUSTIFY_RIGHT,
+;;   GTK_JUSTIFY_CENTER,
+;;   GTK_JUSTIFY_FILL
+;; } GtkJustification;
+
 (define-enum-extended Justification
   (in-module "Gtk")
   (c-name "GtkJustification")
@@ -425,6 +643,15 @@
   )
 )
 
+;; 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
   (in-module "Gtk")
   (c-name "GtkMenuDirectionType")
@@ -436,6 +663,16 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_MESSAGE_INFO,
+;;   GTK_MESSAGE_WARNING,
+;;   GTK_MESSAGE_QUESTION,
+;;   GTK_MESSAGE_ERROR,
+;;   GTK_MESSAGE_OTHER
+;; } GtkMessageType;
+
 (define-enum-extended MessageType
   (in-module "Gtk")
   (c-name "GtkMessageType")
@@ -448,6 +685,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_PIXELS,
+;;   GTK_INCHES,
+;;   GTK_CENTIMETERS
+;; } GtkMetricType;
+
 (define-enum-extended MetricType
   (in-module "Gtk")
   (c-name "GtkMetricType")
@@ -458,6 +703,21 @@
   )
 )
 
+;; 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
   (in-module "Gtk")
   (c-name "GtkMovementStep")
@@ -475,6 +735,17 @@
   )
 )
 
+;; 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
   (in-module "Gtk")
   (c-name "GtkScrollStep")
@@ -488,6 +759,13 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_ORIENTATION_HORIZONTAL,
+;;   GTK_ORIENTATION_VERTICAL
+;; } GtkOrientation;
+
 (define-enum-extended Orientation
   (in-module "Gtk")
   (c-name "GtkOrientation")
@@ -497,6 +775,15 @@
   )
 )
 
+;; 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
   (in-module "Gtk")
   (c-name "GtkCornerType")
@@ -508,6 +795,13 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_PACK_START,
+;;   GTK_PACK_END
+;; } GtkPackType;
+
 (define-enum-extended PackType
   (in-module "Gtk")
   (c-name "GtkPackType")
@@ -517,6 +811,17 @@
   )
 )
 
+;; 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;
+
 (define-enum-extended PathPriorityType
   (in-module "Gtk")
   (c-name "GtkPathPriorityType")
@@ -530,6 +835,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_PATH_WIDGET,
+;;   GTK_PATH_WIDGET_CLASS,
+;;   GTK_PATH_CLASS
+;; } GtkPathType;
+
 (define-enum-extended PathType
   (in-module "Gtk")
   (c-name "GtkPathType")
@@ -540,6 +853,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_POLICY_ALWAYS,
+;;   GTK_POLICY_AUTOMATIC,
+;;   GTK_POLICY_NEVER
+;; } GtkPolicyType;
+
 (define-enum-extended PolicyType
   (in-module "Gtk")
   (c-name "GtkPolicyType")
@@ -550,6 +871,15 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_POS_LEFT,
+;;   GTK_POS_RIGHT,
+;;   GTK_POS_TOP,
+;;   GTK_POS_BOTTOM
+;; } GtkPositionType;
+
 (define-enum-extended PositionType
   (in-module "Gtk")
   (c-name "GtkPositionType")
@@ -561,6 +891,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_RELIEF_NORMAL,
+;;   GTK_RELIEF_HALF,
+;;   GTK_RELIEF_NONE
+;; } GtkReliefStyle;
+
 (define-enum-extended ReliefStyle
   (in-module "Gtk")
   (c-name "GtkReliefStyle")
@@ -571,6 +909,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_RESIZE_PARENT,		/* Pass resize request to the parent */
+;;   GTK_RESIZE_QUEUE,		/* Queue resizes on this widget */
+;;   GTK_RESIZE_IMMEDIATE		/* Perform the resizes now */
+;; } GtkResizeMode;
+
 (define-enum-extended ResizeMode
   (in-module "Gtk")
   (c-name "GtkResizeMode")
@@ -581,6 +927,27 @@
   )
 )
 
+;; 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
   (in-module "Gtk")
   (c-name "GtkScrollType")
@@ -604,6 +971,15 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_SELECTION_NONE,                             /* Nothing can be selected */
+;;   GTK_SELECTION_SINGLE,
+;;   GTK_SELECTION_BROWSE,
+;;   GTK_SELECTION_MULTIPLE
+;; } GtkSelectionMode;
+
 (define-enum-extended SelectionMode
   (in-module "Gtk")
   (c-name "GtkSelectionMode")
@@ -612,10 +988,19 @@
     '("single" "GTK_SELECTION_SINGLE" "1")
     '("browse" "GTK_SELECTION_BROWSE" "2")
     '("multiple" "GTK_SELECTION_MULTIPLE" "3")
-    '("extended" "GTK_SELECTION_EXTENDED" "3")
   )
 )
 
+;; 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
   (in-module "Gtk")
   (c-name "GtkShadowType")
@@ -628,6 +1013,16 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_STATE_NORMAL,
+;;   GTK_STATE_ACTIVE,
+;;   GTK_STATE_PRELIGHT,
+;;   GTK_STATE_SELECTED,
+;;   GTK_STATE_INSENSITIVE
+;; } GtkStateType;
+
 (define-enum-extended StateType
   (in-module "Gtk")
   (c-name "GtkStateType")
@@ -640,23 +1035,14 @@
   )
 )
 
-(define-enum-extended SubmenuDirection
-  (in-module "Gtk")
-  (c-name "GtkSubmenuDirection")
-  (values
-    '("left" "GTK_DIRECTION_LEFT" "0")
-    '("right" "GTK_DIRECTION_RIGHT" "1")
-  )
-)
-
-(define-enum-extended SubmenuPlacement
-  (in-module "Gtk")
-  (c-name "GtkSubmenuPlacement")
-  (values
-    '("top-bottom" "GTK_TOP_BOTTOM" "0")
-    '("left-right" "GTK_LEFT_RIGHT" "1")
-  )
-)
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_TOOLBAR_ICONS,
+;;   GTK_TOOLBAR_TEXT,
+;;   GTK_TOOLBAR_BOTH,
+;;   GTK_TOOLBAR_BOTH_HORIZ
+;; } GtkToolbarStyle;
 
 (define-enum-extended ToolbarStyle
   (in-module "Gtk")
@@ -669,6 +1055,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_UPDATE_CONTINUOUS,
+;;   GTK_UPDATE_DISCONTINUOUS,
+;;   GTK_UPDATE_DELAYED
+;; } GtkUpdateType;
+
 (define-enum-extended UpdateType
   (in-module "Gtk")
   (c-name "GtkUpdateType")
@@ -679,6 +1073,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_VISIBILITY_NONE,
+;;   GTK_VISIBILITY_PARTIAL,
+;;   GTK_VISIBILITY_FULL
+;; } GtkVisibility;
+
 (define-enum-extended Visibility
   (in-module "Gtk")
   (c-name "GtkVisibility")
@@ -689,6 +1091,16 @@
   )
 )
 
+;; 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")
@@ -701,6 +1113,13 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_WINDOW_TOPLEVEL,
+;;   GTK_WINDOW_POPUP
+;; } GtkWindowType;
+
 (define-enum-extended WindowType
   (in-module "Gtk")
   (c-name "GtkWindowType")
@@ -710,6 +1129,15 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_WRAP_NONE,
+;;   GTK_WRAP_CHAR,
+;;   GTK_WRAP_WORD,
+;;   GTK_WRAP_WORD_CHAR
+;; } GtkWrapMode;
+
 (define-enum-extended WrapMode
   (in-module "Gtk")
   (c-name "GtkWrapMode")
@@ -721,6 +1149,13 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_SORT_ASCENDING,
+;;   GTK_SORT_DESCENDING
+;; } GtkSortType;
+
 (define-enum-extended SortType
   (in-module "Gtk")
   (c-name "GtkSortType")
@@ -730,6 +1165,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_IM_PREEDIT_NOTHING,
+;;   GTK_IM_PREEDIT_CALLBACK,
+;;   GTK_IM_PREEDIT_NONE
+;; } GtkIMPreeditStyle;
+
 (define-enum-extended IMPreeditStyle
   (in-module "Gtk")
   (c-name "GtkIMPreeditStyle")
@@ -740,6 +1183,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_IM_STATUS_NOTHING,
+;;   GTK_IM_STATUS_CALLBACK,
+;;   GTK_IM_STATUS_NONE
+;; } GtkIMStatusStyle;
+
 (define-enum-extended IMStatusStyle
   (in-module "Gtk")
   (c-name "GtkIMStatusStyle")
@@ -750,6 +1201,15 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_PACK_DIRECTION_LTR,
+;;   GTK_PACK_DIRECTION_RTL,
+;;   GTK_PACK_DIRECTION_TTB,
+;;   GTK_PACK_DIRECTION_BTT
+;; } GtkPackDirection;
+
 (define-enum-extended PackDirection
   (in-module "Gtk")
   (c-name "GtkPackDirection")
@@ -761,6 +1221,15 @@
   )
 )
 
+;; 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")
@@ -772,6 +1241,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_PAGE_SET_ALL,
+;;   GTK_PAGE_SET_EVEN,
+;;   GTK_PAGE_SET_ODD
+;; } GtkPageSet;
+
 (define-enum-extended PageSet
   (in-module "Gtk")
   (c-name "GtkPageSet")
@@ -782,6 +1259,19 @@
   )
 )
 
+;; 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
   (in-module "Gtk")
   (c-name "GtkNumberUpLayout")
@@ -797,6 +1287,15 @@
   )
 )
 
+;; 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")
@@ -808,6 +1307,15 @@
   )
 )
 
+;; 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
   (in-module "Gtk")
   (c-name "GtkPrintQuality")
@@ -819,6 +1327,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_PRINT_DUPLEX_SIMPLEX,
+;;   GTK_PRINT_DUPLEX_HORIZONTAL,
+;;   GTK_PRINT_DUPLEX_VERTICAL
+;; } GtkPrintDuplex;
+
 (define-enum-extended PrintDuplex
   (in-module "Gtk")
   (c-name "GtkPrintDuplex")
@@ -829,6 +1345,15 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_UNIT_PIXEL,
+;;   GTK_UNIT_POINTS,
+;;   GTK_UNIT_INCH,
+;;   GTK_UNIT_MM
+;; } GtkUnit;
+
 (define-enum-extended Unit
   (in-module "Gtk")
   (c-name "GtkUnit")
@@ -840,6 +1365,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
   (in-module "Gtk")
   (c-name "GtkTreeViewGridLines")
@@ -851,6 +1385,17 @@
   )
 )
 
+;; 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
   (in-module "Gtk")
   (c-name "GtkDragResult")
@@ -864,107 +1409,127 @@
   )
 )
 
-;; From gtkfilechooser.h
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH = 0,
+;;   GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT
+;; } GtkSizeRequestMode;
 
-(define-enum-extended FileChooserAction
+(define-enum-extended SizeRequestMode
   (in-module "Gtk")
-  (c-name "GtkFileChooserAction")
+  (c-name "GtkSizeRequestMode")
   (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")
+    '("height-for-width" "GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH" "0")
+    '("width-for-height" "GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT" "1")
   )
 )
 
-(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_WRAP_ALLOCATE_FREE = 0,
+;;   GTK_WRAP_ALLOCATE_ALIGNED,
+;;   GTK_WRAP_ALLOCATE_HOMOGENEOUS
+;; } GtkWrapAllocationMode;
 
-(define-enum-extended FileChooserError
+(define-enum-extended WrapAllocationMode
   (in-module "Gtk")
-  (c-name "GtkFileChooserError")
+  (c-name "GtkWrapAllocationMode")
   (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")
+    '("free" "GTK_WRAP_ALLOCATE_FREE" "0")
+    '("aligned" "GTK_WRAP_ALLOCATE_ALIGNED" "1")
+    '("homogeneous" "GTK_WRAP_ALLOCATE_HOMOGENEOUS" "2")
   )
 )
 
-;; From gtkfilechooserprivate.h
+;; Original typedef:
+;; typedef enum {
+;;   GTK_WRAP_BOX_SPREAD_BEGIN = 0,
+;;   GTK_WRAP_BOX_SPREAD_END,
+;;   GTK_WRAP_BOX_SPREAD_EVEN,
+;;   GTK_WRAP_BOX_SPREAD_EXPAND
+;; } GtkWrapBoxSpreading;
 
-(define-enum-extended LoadState
+(define-enum-extended WrapBoxSpreading
   (in-module "Gtk")
-  (c-name "LoadState")
+  (c-name "GtkWrapBoxSpreading")
   (values
-    '("empty" "LOAD_EMPTY" "0")
-    '("preload" "LOAD_PRELOAD" "1")
-    '("loading" "LOAD_LOADING" "2")
-    '("finished" "LOAD_FINISHED" "3")
+    '("begin" "GTK_WRAP_BOX_SPREAD_BEGIN" "0")
+    '("end" "GTK_WRAP_BOX_SPREAD_END" "1")
+    '("even" "GTK_WRAP_BOX_SPREAD_EVEN" "2")
+    '("expand" "GTK_WRAP_BOX_SPREAD_EXPAND" "3")
   )
 )
 
-(define-enum-extended ReloadState
-  (in-module "Gtk")
-  (c-name "ReloadState")
-  (values
-    '("empty" "RELOAD_EMPTY" "0")
-    '("has-folder" "RELOAD_HAS_FOLDER" "1")
-    '("was-unmapped" "RELOAD_WAS_UNMAPPED" "2")
-  )
-)
+;; From gtkfilechooser.h
 
-(define-enum-extended LocationMode
+;; 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 "LocationMode")
+  (c-name "GtkFileChooserAction")
   (values
-    '("path-bar" "LOCATION_MODE_PATH_BAR" "0")
-    '("filename-entry" "LOCATION_MODE_FILENAME_ENTRY" "1")
+    '("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")
   )
 )
 
-(define-enum-extended OperationMode
+;; 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 "OperationMode")
+  (c-name "GtkFileChooserConfirmation")
   (values
-    '("browse" "OPERATION_MODE_BROWSE" "0")
-    '("search" "OPERATION_MODE_SEARCH" "1")
-    '("recent" "OPERATION_MODE_RECENT" "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")
   )
 )
 
-;; From gtkfilechooserutils.h
+;; 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-flags-extended FileChooserProp
+(define-enum-extended FileChooserError
   (in-module "Gtk")
-  (c-name "GtkFileChooserProp")
+  (c-name "GtkFileChooserError")
   (values
-    '("first" "GTK_FILE_CHOOSER_PROP_FIRST" "0x1000")
-    '("action" "GTK_FILE_CHOOSER_PROP_ACTION" "0x1000")
-    '("file-system-backend" "GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND" "1")
-    '("filter" "GTK_FILE_CHOOSER_PROP_FILTER" "2")
-    '("local-only" "GTK_FILE_CHOOSER_PROP_LOCAL_ONLY" "3")
-    '("preview-widget" "GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET" "4")
-    '("preview-widget-active" "GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET_ACTIVE" "5")
-    '("use-preview-label" "GTK_FILE_CHOOSER_PROP_USE_PREVIEW_LABEL" "6")
-    '("extra-widget" "GTK_FILE_CHOOSER_PROP_EXTRA_WIDGET" "7")
-    '("select-multiple" "GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE" "8")
-    '("show-hidden" "GTK_FILE_CHOOSER_PROP_SHOW_HIDDEN" "9")
-    '("do-overwrite-confirmation" "GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION" "10")
-    '("create-folders" "GTK_FILE_CHOOSER_PROP_CREATE_FOLDERS" "11")
-    '("last" "GTK_FILE_CHOOSER_PROP_LAST" "0xB")
+    '("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 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
   (in-module "Gtk")
   (c-name "GtkFileFilterFlags")
@@ -978,6 +1543,16 @@
 
 ;; 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
+;; } GtkIconLookupFlags;
+
 (define-flags-extended IconLookupFlags
   (in-module "Gtk")
   (c-name "GtkIconLookupFlags")
@@ -990,6 +1565,12 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   GTK_ICON_THEME_NOT_FOUND,
+;;   GTK_ICON_THEME_FAILED
+;; } GtkIconThemeError;
+
 (define-enum-extended IconThemeError
   (in-module "Gtk")
   (c-name "GtkIconThemeError")
@@ -1001,6 +1582,17 @@
 
 ;; 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
   (in-module "Gtk")
   (c-name "GtkIconViewDropPosition")
@@ -1016,24 +1608,47 @@
 
 ;; From gtkimage.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_IMAGE_EMPTY,
+;;   GTK_IMAGE_PIXMAP,
+;;   GTK_IMAGE_PIXBUF,
+;;   GTK_IMAGE_STOCK,
+;;   GTK_IMAGE_ICON_SET,
+;;   GTK_IMAGE_ANIMATION,
+;;   GTK_IMAGE_ICON_NAME,
+;;   GTK_IMAGE_GICON
+;; } GtkImageType;
+
 (define-enum-extended ImageType
   (in-module "Gtk")
   (c-name "GtkImageType")
   (values
     '("empty" "GTK_IMAGE_EMPTY" "0")
     '("pixmap" "GTK_IMAGE_PIXMAP" "1")
-    '("image" "GTK_IMAGE_IMAGE" "2")
-    '("pixbuf" "GTK_IMAGE_PIXBUF" "3")
-    '("stock" "GTK_IMAGE_STOCK" "4")
-    '("icon-set" "GTK_IMAGE_ICON_SET" "5")
-    '("animation" "GTK_IMAGE_ANIMATION" "6")
-    '("icon-name" "GTK_IMAGE_ICON_NAME" "7")
-    '("gicon" "GTK_IMAGE_GICON" "8")
+    '("pixbuf" "GTK_IMAGE_PIXBUF" "2")
+    '("stock" "GTK_IMAGE_STOCK" "3")
+    '("icon-set" "GTK_IMAGE_ICON_SET" "4")
+    '("animation" "GTK_IMAGE_ANIMATION" "5")
+    '("icon-name" "GTK_IMAGE_ICON_NAME" "6")
+    '("gicon" "GTK_IMAGE_GICON" "7")
   )
 )
 
 ;; 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
   (in-module "Gtk")
   (c-name "GtkButtonsType")
@@ -1049,6 +1664,13 @@
 
 ;; From gtknotebook.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_NOTEBOOK_TAB_FIRST,
+;;   GTK_NOTEBOOK_TAB_LAST
+;; } GtkNotebookTab;
+
 (define-enum-extended NotebookTab
   (in-module "Gtk")
   (c-name "GtkNotebookTab")
@@ -1060,75 +1682,39 @@
 
 ;; From gtkobject.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_IN_DESTRUCTION	= 1 << 0, /* Used internally during dispose */
+;;   GTK_RESERVED_1	= 1 << 2,
+;;   GTK_RESERVED_2	= 1 << 3
+;; } GtkObjectFlags;
+
 (define-flags-extended ObjectFlags
   (in-module "Gtk")
   (c-name "GtkObjectFlags")
   (values
     '("in-destruction" "GTK_IN_DESTRUCTION" "1 << 0")
+    '("reserved-1" "GTK_RESERVED_1" "1 << 2")
     '("reserved-2" "GTK_RESERVED_2" "1 << 3")
   )
 )
 
-;; From gtkprintbackend.h
-
-(define-enum-extended PrintBackendError
-  (in-module "Gtk")
-  (c-name "GtkPrintBackendError")
-  (values
-    '("c" "GTK_PRINT_BACKEND_ERROR_GENERIC" "0")
-  )
-)
-
-(define-enum-extended PrintBackendStatus
-  (in-module "Gtk")
-  (c-name "GtkPrintBackendStatus")
-  (values
-    '("unknown" "GTK_PRINT_BACKEND_STATUS_UNKNOWN" "0")
-    '("ok" "GTK_PRINT_BACKEND_STATUS_OK" "1")
-    '("unavailable" "GTK_PRINT_BACKEND_STATUS_UNAVAILABLE" "2")
-  )
-)
-
-;; From gtkprinter.h
-
-(define-flags-extended PrintCapabilities
-  (in-module "Gtk")
-  (c-name "GtkPrintCapabilities")
-  (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")
-  )
-)
-
-;; From gtkprinteroption.h
-
-(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")
-  )
-)
-
 ;; 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
   (in-module "Gtk")
   (c-name "GtkPrintStatus")
@@ -1145,6 +1731,14 @@
   )
 )
 
+;; 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
   (in-module "Gtk")
   (c-name "GtkPrintOperationResult")
@@ -1156,6 +1750,14 @@
   )
 )
 
+;; 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
   (in-module "Gtk")
   (c-name "GtkPrintOperationAction")
@@ -1167,6 +1769,15 @@
   )
 )
 
+;; 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")
@@ -1178,20 +1789,28 @@
   )
 )
 
-;; From gtkprintoperation-private.h
-
-(define-enum-extended PageDrawingState
-  (in-module "Gtk")
-  (c-name "GtkPageDrawingState")
-  (values
-    '("ready" "GTK_PAGE_DRAWING_STATE_READY" "0")
-    '("drawing" "GTK_PAGE_DRAWING_STATE_DRAWING" "1")
-    '("deferred-drawing" "GTK_PAGE_DRAWING_STATE_DEFERRED_DRAWING" "2")
-  )
-)
-
 ;; From gtkprivate.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   PRIVATE_GTK_USER_STYLE            = 1 <<  0,
+;;   PRIVATE_GTK_RESIZE_PENDING        = 1 <<  2,
+;;   PRIVATE_GTK_HAS_POINTER           = 1 <<  3,   /* If the pointer is above a window belonging to the widget */
+;;   PRIVATE_GTK_SHADOWED		    = 1 <<  4,   /* If there is a grab in effect shadowing the widget */
+;;   PRIVATE_GTK_HAS_SHAPE_MASK	    = 1 <<  5,
+;;   PRIVATE_GTK_IN_REPARENT           = 1 <<  6,
+;;   PRIVATE_GTK_DIRECTION_SET         = 1 <<  7,   /* If the reading direction is not DIR_NONE */
+;;   PRIVATE_GTK_DIRECTION_LTR         = 1 <<  8,   /* If the reading direction is DIR_LTR */
+;;   PRIVATE_GTK_ANCHORED              = 1 <<  9,   /* If widget has a GtkWindow ancestor */
+;;   PRIVATE_GTK_CHILD_VISIBLE         = 1 <<  10,  /* If widget should be mapped when parent is mapped */
+;;   PRIVATE_GTK_REDRAW_ON_ALLOC       = 1 <<  11,  /* If we should queue a draw on the entire widget when it is reallocated */
+;;   PRIVATE_GTK_ALLOC_NEEDED          = 1 <<  12,  /* If we we should allocate even if the allocation is the same */
+;;   PRIVATE_GTK_REQUEST_NEEDED        = 1 <<  13,  /* Whether we need to call gtk_widget_size_request */
+;;   PRIVATE_GTK_WIDTH_REQUEST_NEEDED  = 1 <<  14,  /* Whether we need to call gtk_extended_layout_get_desired_width */
+;;   PRIVATE_GTK_HEIGHT_REQUEST_NEEDED = 1 <<  15   /* Whether we need to call gtk_extended_layout_get_desired_height */
+;; } GtkPrivateFlags;
+
 (define-flags-extended PrivateFlags
   (in-module "Gtk")
   (c-name "GtkPrivateFlags")
@@ -1209,19 +1828,21 @@
     '("redraw-on-alloc" "PRIVATE_GTK_REDRAW_ON_ALLOC" "1 << 11")
     '("alloc-needed" "PRIVATE_GTK_ALLOC_NEEDED" "1 << 12")
     '("request-needed" "PRIVATE_GTK_REQUEST_NEEDED" "1 << 13")
+    '("width-request-needed" "PRIVATE_GTK_WIDTH_REQUEST_NEEDED" "1 << 14")
+    '("height-request-needed" "PRIVATE_GTK_HEIGHT_REQUEST_NEEDED" "1 << 15")
   )
 )
 
 ;; From gtkprogressbar.h
 
-(define-enum-extended ProgressBarStyle
-  (in-module "Gtk")
-  (c-name "GtkProgressBarStyle")
-  (values
-    '("continuous" "GTK_PROGRESS_CONTINUOUS" "0")
-    '("discrete" "GTK_PROGRESS_DISCRETE" "1")
-  )
-)
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_PROGRESS_LEFT_TO_RIGHT,
+;;   GTK_PROGRESS_RIGHT_TO_LEFT,
+;;   GTK_PROGRESS_BOTTOM_TO_TOP,
+;;   GTK_PROGRESS_TOP_TO_BOTTOM
+;; } GtkProgressBarOrientation;
 
 (define-enum-extended ProgressBarOrientation
   (in-module "Gtk")
@@ -1234,28 +1855,17 @@
   )
 )
 
-;; From gtkrbtree.h
-
-(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")
-    '("is-semi-collapsed" "GTK_RBNODE_IS_SEMI_COLLAPSED" "1 << 5")
-    '("is-semi-expanded" "GTK_RBNODE_IS_SEMI_EXPANDED" "1 << 6")
-    '("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" "0x4")
-  )
-)
-
 ;; 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")
@@ -1267,55 +1877,108 @@
   )
 )
 
+;; 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
   (in-module "Gtk")
   (c-name "GtkRcTokenType")
   (values
-    '("invalid" "GTK_RC_TOKEN_INVALID" "#error")
-    '("include" "GTK_RC_TOKEN_INCLUDE" "1")
-    '("normal" "GTK_RC_TOKEN_NORMAL" "2")
-    '("active" "GTK_RC_TOKEN_ACTIVE" "3")
-    '("prelight" "GTK_RC_TOKEN_PRELIGHT" "4")
-    '("selected" "GTK_RC_TOKEN_SELECTED" "5")
-    '("insensitive" "GTK_RC_TOKEN_INSENSITIVE" "6")
-    '("fg" "GTK_RC_TOKEN_FG" "7")
-    '("bg" "GTK_RC_TOKEN_BG" "8")
-    '("text" "GTK_RC_TOKEN_TEXT" "9")
-    '("base" "GTK_RC_TOKEN_BASE" "10")
-    '("xthickness" "GTK_RC_TOKEN_XTHICKNESS" "11")
-    '("ythickness" "GTK_RC_TOKEN_YTHICKNESS" "12")
-    '("font" "GTK_RC_TOKEN_FONT" "13")
-    '("fontset" "GTK_RC_TOKEN_FONTSET" "14")
-    '("font-name" "GTK_RC_TOKEN_FONT_NAME" "15")
-    '("bg-pixmap" "GTK_RC_TOKEN_BG_PIXMAP" "16")
-    '("pixmap-path" "GTK_RC_TOKEN_PIXMAP_PATH" "17")
-    '("style" "GTK_RC_TOKEN_STYLE" "18")
-    '("binding" "GTK_RC_TOKEN_BINDING" "19")
-    '("bind" "GTK_RC_TOKEN_BIND" "20")
-    '("widget" "GTK_RC_TOKEN_WIDGET" "21")
-    '("widget-class" "GTK_RC_TOKEN_WIDGET_CLASS" "22")
-    '("class" "GTK_RC_TOKEN_CLASS" "23")
-    '("lowest" "GTK_RC_TOKEN_LOWEST" "24")
-    '("gtk" "GTK_RC_TOKEN_GTK" "25")
-    '("application" "GTK_RC_TOKEN_APPLICATION" "26")
-    '("theme" "GTK_RC_TOKEN_THEME" "27")
-    '("rc" "GTK_RC_TOKEN_RC" "28")
-    '("highest" "GTK_RC_TOKEN_HIGHEST" "29")
-    '("engine" "GTK_RC_TOKEN_ENGINE" "30")
-    '("module-path" "GTK_RC_TOKEN_MODULE_PATH" "31")
-    '("im-module-path" "GTK_RC_TOKEN_IM_MODULE_PATH" "32")
-    '("im-module-file" "GTK_RC_TOKEN_IM_MODULE_FILE" "33")
-    '("stock" "GTK_RC_TOKEN_STOCK" "34")
-    '("ltr" "GTK_RC_TOKEN_LTR" "35")
-    '("rtl" "GTK_RC_TOKEN_RTL" "36")
-    '("color" "GTK_RC_TOKEN_COLOR" "37")
-    '("unbind" "GTK_RC_TOKEN_UNBIND" "38")
-    '("last" "GTK_RC_TOKEN_LAST" "39")
+    '("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")
   )
 )
 
 ;; 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
   (in-module "Gtk")
   (c-name "GtkRecentSortType")
@@ -1327,6 +1990,13 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_RECENT_CHOOSER_ERROR_NOT_FOUND,
+;;   GTK_RECENT_CHOOSER_ERROR_INVALID_URI
+;; } GtkRecentChooserError;
+
 (define-enum-extended RecentChooserError
   (in-module "Gtk")
   (c-name "GtkRecentChooserError")
@@ -1336,29 +2006,18 @@
   )
 )
 
-;; From gtkrecentchooserutils.h
-
-(define-flags-extended RecentChooserProp
-  (in-module "Gtk")
-  (c-name "GtkRecentChooserProp")
-  (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")
-  )
-)
-
 ;; 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
   (in-module "Gtk")
   (c-name "GtkRecentFilterFlags")
@@ -1374,6 +2033,18 @@
 
 ;; 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
   (in-module "Gtk")
   (c-name "GtkRecentManagerError")
@@ -1390,6 +2061,14 @@
 
 ;; From gtksizegroup.h
 
+;; 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
   (in-module "Gtk")
   (c-name "GtkSizeGroupMode")
@@ -1403,6 +2082,13 @@
 
 ;; From gtkspinbutton.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_UPDATE_ALWAYS,
+;;   GTK_UPDATE_IF_VALID
+;; } GtkSpinButtonUpdatePolicy;
+
 (define-enum-extended SpinButtonUpdatePolicy
   (in-module "Gtk")
   (c-name "GtkSpinButtonUpdatePolicy")
@@ -1412,6 +2098,18 @@
   )
 )
 
+;; 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")
@@ -1428,15 +2126,33 @@
 
 ;; 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
   (in-module "Gtk")
   (c-name "GtkTextBufferTargetInfo")
   (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")
   )
 )
 
 ;; From gtktextiter.h
 
+;; Original typedef:
+;; typedef enum {
+;;   GTK_TEXT_SEARCH_VISIBLE_ONLY = 1 << 0,
+;;   GTK_TEXT_SEARCH_TEXT_ONLY    = 1 << 1
+;;   /* Possible future plans: SEARCH_CASE_INSENSITIVE, SEARCH_REGEXP */
+;; } GtkTextSearchFlags;
+
 (define-flags-extended TextSearchFlags
   (in-module "Gtk")
   (c-name "GtkTextSearchFlags")
@@ -1448,6 +2164,18 @@
 
 ;; From gtktextview.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_TEXT_WINDOW_PRIVATE,
+;;   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")
@@ -1464,6 +2192,13 @@
 
 ;; 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")
@@ -1475,28 +2210,32 @@
 
 ;; 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
   (in-module "Gtk")
   (c-name "GtkToolPaletteDragTargets")
   (values
-    '("items" "GTK_TOOL_PALETTE_DRAG_ITEMS" "1 << 0")
-    '("groups" "GTK_TOOL_PALETTE_DRAG_GROUPS" "1 << 1")
-  )
-)
-
-;; From gtktree.h
-
-(define-enum-extended TreeViewMode
-  (in-module "Gtk")
-  (c-name "GtkTreeViewMode")
-  (values
-    '("line" "GTK_TREE_VIEW_LINE" "0")
-    '("item" "GTK_TREE_VIEW_ITEM" "1")
+    '("items" "GTK_TOOL_PALETTE_DRAG_ITEMS" "(1 << 0)")
+    '("groups" "GTK_TOOL_PALETTE_DRAG_GROUPS" "(1 << 1)")
   )
 )
 
 ;; 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")
@@ -1508,6 +2247,14 @@
 
 ;; 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")
@@ -1520,6 +2267,19 @@
 
 ;; 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")
@@ -1533,11 +2293,26 @@
 
 ;; 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
   (in-module "Gtk")
   (c-name "GtkUIManagerItemType")
   (values
-    '("auto" "GTK_UI_MANAGER_AUTO" "0")
+    '("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")
@@ -1553,6 +2328,30 @@
 
 ;; From gtkwidget.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_TOPLEVEL         = 1 << 4,
+;;   GTK_NO_WINDOW        = 1 << 5,
+;;   GTK_REALIZED         = 1 << 6,
+;;   GTK_MAPPED           = 1 << 7,
+;;   GTK_VISIBLE          = 1 << 8,
+;;   GTK_SENSITIVE        = 1 << 9,
+;;   GTK_PARENT_SENSITIVE = 1 << 10,
+;;   GTK_CAN_FOCUS        = 1 << 11,
+;;   GTK_HAS_FOCUS        = 1 << 12,
+;;   GTK_CAN_DEFAULT      = 1 << 13,
+;;   GTK_HAS_DEFAULT      = 1 << 14,
+;;   GTK_HAS_GRAB	       = 1 << 15,
+;;   GTK_RC_STYLE	       = 1 << 16,
+;;   GTK_COMPOSITE_CHILD  = 1 << 17,
+;;   GTK_APP_PAINTABLE    = 1 << 18,
+;;   GTK_RECEIVES_DEFAULT = 1 << 19,
+;;   GTK_DOUBLE_BUFFERED  = 1 << 20,
+;;   GTK_NO_SHOW_ALL      = 1 << 21,
+;;   GTK_MULTIDEVICE      = 1 << 22
+;; } GtkWidgetFlags;
+
 (define-flags-extended WidgetFlags
   (in-module "Gtk")
   (c-name "GtkWidgetFlags")
@@ -1571,14 +2370,21 @@
     '("has-grab" "GTK_HAS_GRAB" "1 << 15")
     '("rc-style" "GTK_RC_STYLE" "1 << 16")
     '("composite-child" "GTK_COMPOSITE_CHILD" "1 << 17")
-    '("no-reparent" "GTK_NO_REPARENT" "1 << 18")
-    '("app-paintable" "GTK_APP_PAINTABLE" "1 << 19")
-    '("receives-default" "GTK_RECEIVES_DEFAULT" "1 << 20")
-    '("double-buffered" "GTK_DOUBLE_BUFFERED" "1 << 21")
-    '("no-show-all" "GTK_NO_SHOW_ALL" "1 << 22")
+    '("app-paintable" "GTK_APP_PAINTABLE" "1 << 18")
+    '("receives-default" "GTK_RECEIVES_DEFAULT" "1 << 19")
+    '("double-buffered" "GTK_DOUBLE_BUFFERED" "1 << 20")
+    '("no-show-all" "GTK_NO_SHOW_ALL" "1 << 21")
+    '("multidevice" "GTK_MULTIDEVICE" "1 << 22")
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   GTK_WIDGET_HELP_TOOLTIP,
+;;   GTK_WIDGET_HELP_WHATS_THIS
+;; } GtkWidgetHelpType;
+
 (define-enum-extended WidgetHelpType
   (in-module "Gtk")
   (c-name "GtkWidgetHelpType")
@@ -1588,27 +2394,37 @@
   )
 )
 
-;; From gtkwin32embed.h
+;; 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-enum-extended Win32EmbedMessageType
+(define-flags-extended PrintCapabilities
   (in-module "Gtk")
-  (c-name "GtkWin32EmbedMessageType")
+  (c-name "GtkPrintCapabilities")
   (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")
+    '("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")
   )
 )
 
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index de33320..ea480c1 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -66,6 +66,12 @@
   (gtype-id "GTK_TYPE_CELL_LAYOUT")
 )
 
+(define-object CellSizeRequest
+  (in-module "Gtk")
+  (c-name "GtkCellSizeRequest")
+  (gtype-id "GTK_TYPE_CELL_SIZE_REQUEST")
+)
+
 (define-object Editable
   (in-module "Gtk")
   (c-name "GtkEditable")
@@ -86,10 +92,11 @@
   (gtype-id "GTK_TYPE_ENTRY_COMPLETION")
 )
 
-(define-object ExtendedLayout
+(define-object IMContext
   (in-module "Gtk")
-  (c-name "GtkExtendedLayout")
-  (gtype-id "GTK_TYPE_EXTENDED_LAYOUT")
+  (parent "GObject")
+  (c-name "GtkIMContext")
+  (gtype-id "GTK_TYPE_IM_CONTEXT")
 )
 
 (define-object IMContextSimple
@@ -538,13 +545,6 @@
   (gtype-id "GTK_TYPE_PROGRESS_BAR")
 )
 
-(define-object Progress
-  (in-module "Gtk")
-  (parent "GtkWidget")
-  (c-name "GtkProgress")
-  (gtype-id "GTK_TYPE_PROGRESS")
-)
-
 (define-object Misc
   (in-module "Gtk")
   (parent "GtkWidget")
@@ -1189,8 +1189,32 @@
   (gtype-id "GTK_TYPE_WINDOW_GROUP")
 )
 
+(define-object WrapBox
+  (in-module "Gtk")
+  (parent "GtkContainer")
+  (c-name "GtkWrapBox")
+  (gtype-id "GTK_TYPE_WRAP_BOX")
+)
+
 ;; Enumerations and flags ...
 
+(define-enum License
+  (in-module "Gtk")
+  (c-name "GtkLicense")
+  (gtype-id "GTK_TYPE_LICENSE")
+  (values
+    '("unknown" "GTK_LICENSE_UNKNOWN")
+    '("custom" "GTK_LICENSE_CUSTOM")
+    '("gpl-2-0" "GTK_LICENSE_GPL_2_0")
+    '("gpl-3-0" "GTK_LICENSE_GPL_3_0")
+    '("lgpl-2-1" "GTK_LICENSE_LGPL_2_1")
+    '("lgpl-3-0" "GTK_LICENSE_LGPL_3_0")
+    '("bsd" "GTK_LICENSE_BSD")
+    '("mit-x11" "GTK_LICENSE_MIT_X11")
+    '("artistic" "GTK_LICENSE_ARTISTIC")
+  )
+)
+
 (define-flags AccelFlags
   (in-module "Gtk")
   (c-name "GtkAccelFlags")
@@ -1241,7 +1265,6 @@
     '("show-day-names" "GTK_CALENDAR_SHOW_DAY_NAMES")
     '("no-month-change" "GTK_CALENDAR_NO_MONTH_CHANGE")
     '("show-week-numbers" "GTK_CALENDAR_SHOW_WEEK_NUMBERS")
-    '("week-start-monday" "GTK_CALENDAR_WEEK_START_MONDAY")
     '("show-details" "GTK_CALENDAR_SHOW_DETAILS")
   )
 )
@@ -1430,7 +1453,6 @@
   (c-name "GtkButtonBoxStyle")
   (gtype-id "GTK_TYPE_BUTTON_BOX_STYLE")
   (values
-    '("default-style" "GTK_BUTTONBOX_DEFAULT_STYLE")
     '("spread" "GTK_BUTTONBOX_SPREAD")
     '("edge" "GTK_BUTTONBOX_EDGE")
     '("start" "GTK_BUTTONBOX_START")
@@ -1733,7 +1755,6 @@
     '("single" "GTK_SELECTION_SINGLE")
     '("browse" "GTK_SELECTION_BROWSE")
     '("multiple" "GTK_SELECTION_MULTIPLE")
-    '("extended" "GTK_SELECTION_EXTENDED")
   )
 )
 
@@ -1763,26 +1784,6 @@
   )
 )
 
-(define-enum SubmenuDirection
-  (in-module "Gtk")
-  (c-name "GtkSubmenuDirection")
-  (gtype-id "GTK_TYPE_SUBMENU_DIRECTION")
-  (values
-    '("left" "GTK_DIRECTION_LEFT")
-    '("right" "GTK_DIRECTION_RIGHT")
-  )
-)
-
-(define-enum SubmenuPlacement
-  (in-module "Gtk")
-  (c-name "GtkSubmenuPlacement")
-  (gtype-id "GTK_TYPE_SUBMENU_PLACEMENT")
-  (values
-    '("top-bottom" "GTK_TOP_BOTTOM")
-    '("left-right" "GTK_LEFT_RIGHT")
-  )
-)
-
 (define-enum ToolbarStyle
   (in-module "Gtk")
   (c-name "GtkToolbarStyle")
@@ -2018,6 +2019,29 @@
   )
 )
 
+(define-enum WrapAllocationMode
+  (in-module "Gtk")
+  (c-name "GtkWrapAllocationMode")
+  (gtype-id "GTK_TYPE_WRAP_ALLOCATION_MODE")
+  (values
+    '("free" "GTK_WRAP_ALLOCATE_FREE")
+    '("aligned" "GTK_WRAP_ALLOCATE_ALIGNED")
+    '("homogeneous" "GTK_WRAP_ALLOCATE_HOMOGENEOUS")
+  )
+)
+
+(define-enum WrapBoxSpreading
+  (in-module "Gtk")
+  (c-name "GtkWrapBoxSpreading")
+  (gtype-id "GTK_TYPE_WRAP_BOX_SPREADING")
+  (values
+    '("begin" "GTK_WRAP_BOX_SPREAD_BEGIN")
+    '("end" "GTK_WRAP_BOX_SPREAD_END")
+    '("even" "GTK_WRAP_BOX_SPREAD_EVEN")
+    '("expand" "GTK_WRAP_BOX_SPREAD_EXPAND")
+  )
+)
+
 (define-enum FileChooserAction
   (in-module "Gtk")
   (c-name "GtkFileChooserAction")
@@ -2109,7 +2133,6 @@
   (values
     '("empty" "GTK_IMAGE_EMPTY")
     '("pixmap" "GTK_IMAGE_PIXMAP")
-    '("image" "GTK_IMAGE_IMAGE")
     '("pixbuf" "GTK_IMAGE_PIXBUF")
     '("stock" "GTK_IMAGE_STOCK")
     '("icon-set" "GTK_IMAGE_ICON_SET")
@@ -2652,6 +2675,21 @@
   )
 )
 
+(define-method set_license_type
+  (of-object "GtkAboutDialog")
+  (c-name "gtk_about_dialog_set_license_type")
+  (return-type "none")
+  (parameters
+    '("GtkLicense" "license_type")
+  )
+)
+
+(define-method get_license_type
+  (of-object "GtkAboutDialog")
+  (c-name "gtk_about_dialog_get_license_type")
+  (return-type "GtkLicense")
+)
+
 (define-method get_wrap_license
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_get_wrap_license")
@@ -5199,6 +5237,15 @@
   (return-type "gint")
 )
 
+(define-method get_day_is_marked
+  (of-object "GtkCalendar")
+  (c-name "gtk_calendar_get_day_is_marked")
+  (return-type "gboolean")
+  (parameters
+    '("guint" "day")
+  )
+)
+
 
 
 ;; From gtkcelleditable.h
@@ -5662,6 +5709,78 @@
 
 
 
+;; From gtkcellsizerequest.h
+
+(define-function gtk_cell_size_request_get_type
+  (c-name "gtk_cell_size_request_get_type")
+  (return-type "GType")
+)
+
+(define-method get_request_mode
+  (of-object "GtkCellSizeRequest")
+  (c-name "gtk_cell_size_request_get_request_mode")
+  (return-type "GtkSizeRequestMode")
+)
+
+(define-method get_width
+  (of-object "GtkCellSizeRequest")
+  (c-name "gtk_cell_size_request_get_width")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("gint*" "minimum_size")
+    '("gint*" "natural_size")
+  )
+)
+
+(define-method get_height_for_width
+  (of-object "GtkCellSizeRequest")
+  (c-name "gtk_cell_size_request_get_height_for_width")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("gint" "width")
+    '("gint*" "minimum_height")
+    '("gint*" "natural_height")
+  )
+)
+
+(define-method get_height
+  (of-object "GtkCellSizeRequest")
+  (c-name "gtk_cell_size_request_get_height")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("gint*" "minimum_size")
+    '("gint*" "natural_size")
+  )
+)
+
+(define-method get_width_for_height
+  (of-object "GtkCellSizeRequest")
+  (c-name "gtk_cell_size_request_get_width_for_height")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("gint" "height")
+    '("gint*" "minimum_width")
+    '("gint*" "natural_width")
+  )
+)
+
+(define-method get_size
+  (of-object "GtkCellSizeRequest")
+  (c-name "gtk_cell_size_request_get_size")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("GtkRequisition*" "minimum_size")
+    '("GtkRequisition*" "natural_size")
+  )
+)
+
+
+
 ;; From gtkcellview.h
 
 (define-function gtk_cell_view_get_type
@@ -5739,6 +5858,29 @@
   )
 )
 
+(define-method get_desired_width_of_row
+  (of-object "GtkCellView")
+  (c-name "gtk_cell_view_get_desired_width_of_row")
+  (return-type "none")
+  (parameters
+    '("GtkTreePath*" "path")
+    '("gint*" "minimum_size")
+    '("gint*" "natural_size")
+  )
+)
+
+(define-method get_desired_height_for_width_of_row
+  (of-object "GtkCellView")
+  (c-name "gtk_cell_view_get_desired_height_for_width_of_row")
+  (return-type "none")
+  (parameters
+    '("GtkTreePath*" "path")
+    '("gint" "avail_size")
+    '("gint*" "minimum_size")
+    '("gint*" "natural_size")
+  )
+)
+
 (define-method set_background_color
   (of-object "GtkCellView")
   (c-name "gtk_cell_view_set_background_color")
@@ -8592,72 +8734,19 @@
   (return-type "GtkWidget*")
 )
 
-
-
-;; From gtkextendedlayout.h
-
-(define-function gtk_extended_layout_get_type
-  (c-name "gtk_extended_layout_get_type")
-  (return-type "GType")
-)
-
-(define-method is_height_for_width
-  (of-object "GtkExtendedLayout")
-  (c-name "gtk_extended_layout_is_height_for_width")
-  (return-type "gboolean")
-)
-
-(define-method get_desired_width
-  (of-object "GtkExtendedLayout")
-  (c-name "gtk_extended_layout_get_desired_width")
-  (return-type "none")
-  (parameters
-    '("gint*" "minimum_width")
-    '("gint*" "natural_width")
-  )
-)
-
-(define-method get_desired_height
-  (of-object "GtkExtendedLayout")
-  (c-name "gtk_extended_layout_get_desired_height")
-  (return-type "none")
-  (parameters
-    '("gint*" "minimum_height")
-    '("gint*" "natural_height")
-  )
-)
-
-(define-method get_width_for_height
-  (of-object "GtkExtendedLayout")
-  (c-name "gtk_extended_layout_get_width_for_height")
-  (return-type "none")
-  (parameters
-    '("gint" "height")
-    '("gint*" "minimum_width")
-    '("gint*" "natural_width")
-  )
-)
-
-(define-method get_height_for_width
-  (of-object "GtkExtendedLayout")
-  (c-name "gtk_extended_layout_get_height_for_width")
+(define-method set_label_fill
+  (of-object "GtkExpander")
+  (c-name "gtk_expander_set_label_fill")
   (return-type "none")
   (parameters
-    '("gint" "width")
-    '("gint*" "minimum_height")
-    '("gint*" "natural_height")
+    '("gboolean" "label_fill")
   )
 )
 
-(define-method get_desired_size
-  (of-object "GtkExtendedLayout")
-  (c-name "gtk_extended_layout_get_desired_size")
-  (return-type "none")
-  (parameters
-    '("gboolean" "request_natural")
-    '("GtkRequisition*" "minimum_size")
-    '("GtkRequisition*" "natural_size")
-  )
+(define-method get_label_fill
+  (of-object "GtkExpander")
+  (c-name "gtk_expander_get_label_fill")
+  (return-type "gboolean")
 )
 
 
@@ -9702,29 +9791,6 @@
 
 
 
-;; From gtkgc.h
-
-(define-function gtk_gc_get
-  (c-name "gtk_gc_get")
-  (return-type "GdkGC*")
-  (parameters
-    '("gint" "depth")
-    '("GdkColormap*" "colormap")
-    '("GdkGCValues*" "values")
-    '("GdkGCValuesMask" "values_mask")
-  )
-)
-
-(define-function gtk_gc_release
-  (c-name "gtk_gc_release")
-  (return-type "none")
-  (parameters
-    '("GdkGC*" "gc")
-  )
-)
-
-
-
 ;; From gtk.h
 
 
@@ -11187,15 +11253,6 @@
   )
 )
 
-(define-function gtk_image_new_from_image
-  (c-name "gtk_image_new_from_image")
-  (return-type "GtkWidget*")
-  (parameters
-    '("GdkImage*" "image")
-    '("GdkBitmap*" "mask")
-  )
-)
-
 (define-function gtk_image_new_from_file
   (c-name "gtk_image_new_from_file")
   (return-type "GtkWidget*")
@@ -11272,16 +11329,6 @@
   )
 )
 
-(define-method set_from_image
-  (of-object "GtkImage")
-  (c-name "gtk_image_set_from_image")
-  (return-type "none")
-  (parameters
-    '("GdkImage*" "gdk_image")
-    '("GdkBitmap*" "mask")
-  )
-)
-
 (define-method set_from_file
   (of-object "GtkImage")
   (c-name "gtk_image_set_from_file")
@@ -11374,16 +11421,6 @@
   )
 )
 
-(define-method get_image
-  (of-object "GtkImage")
-  (c-name "gtk_image_get_image")
-  (return-type "none")
-  (parameters
-    '("GdkImage**" "gdk_image")
-    '("GdkBitmap**" "mask")
-  )
-)
-
 (define-method get_pixbuf
   (of-object "GtkImage")
   (c-name "gtk_image_get_pixbuf")
@@ -13905,6 +13942,18 @@
   (return-type "gboolean")
 )
 
+(define-method get_tab_hborder
+  (of-object "GtkNotebook")
+  (c-name "gtk_notebook_get_tab_hborder")
+  (return-type "guint16")
+)
+
+(define-method get_tab_vborder
+  (of-object "GtkNotebook")
+  (c-name "gtk_notebook_get_tab_vborder")
+  (return-type "guint16")
+)
+
 (define-method popup_enable
   (of-object "GtkNotebook")
   (c-name "gtk_notebook_popup_enable")
@@ -15822,126 +15871,6 @@
 
 
 
-;; From gtkprogress.h
-
-(define-function gtk_progress_get_type
-  (c-name "gtk_progress_get_type")
-  (return-type "GType")
-)
-
-(define-method set_show_text
-  (of-object "GtkProgress")
-  (c-name "gtk_progress_set_show_text")
-  (return-type "none")
-  (parameters
-    '("gboolean" "show_text")
-  )
-)
-
-(define-method set_text_alignment
-  (of-object "GtkProgress")
-  (c-name "gtk_progress_set_text_alignment")
-  (return-type "none")
-  (parameters
-    '("gfloat" "x_align")
-    '("gfloat" "y_align")
-  )
-)
-
-(define-method set_format_string
-  (of-object "GtkProgress")
-  (c-name "gtk_progress_set_format_string")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "format")
-  )
-)
-
-(define-method set_adjustment
-  (of-object "GtkProgress")
-  (c-name "gtk_progress_set_adjustment")
-  (return-type "none")
-  (parameters
-    '("GtkAdjustment*" "adjustment")
-  )
-)
-
-(define-method configure
-  (of-object "GtkProgress")
-  (c-name "gtk_progress_configure")
-  (return-type "none")
-  (parameters
-    '("gdouble" "value")
-    '("gdouble" "min")
-    '("gdouble" "max")
-  )
-)
-
-(define-method set_percentage
-  (of-object "GtkProgress")
-  (c-name "gtk_progress_set_percentage")
-  (return-type "none")
-  (parameters
-    '("gdouble" "percentage")
-  )
-)
-
-(define-method set_value
-  (of-object "GtkProgress")
-  (c-name "gtk_progress_set_value")
-  (return-type "none")
-  (parameters
-    '("gdouble" "value")
-  )
-)
-
-(define-method get_value
-  (of-object "GtkProgress")
-  (c-name "gtk_progress_get_value")
-  (return-type "gdouble")
-)
-
-(define-method set_activity_mode
-  (of-object "GtkProgress")
-  (c-name "gtk_progress_set_activity_mode")
-  (return-type "none")
-  (parameters
-    '("gboolean" "activity_mode")
-  )
-)
-
-(define-method get_current_text
-  (of-object "GtkProgress")
-  (c-name "gtk_progress_get_current_text")
-  (return-type "gchar*")
-)
-
-(define-method get_text_from_value
-  (of-object "GtkProgress")
-  (c-name "gtk_progress_get_text_from_value")
-  (return-type "gchar*")
-  (parameters
-    '("gdouble" "value")
-  )
-)
-
-(define-method get_current_percentage
-  (of-object "GtkProgress")
-  (c-name "gtk_progress_get_current_percentage")
-  (return-type "gdouble")
-)
-
-(define-method get_percentage_from_value
-  (of-object "GtkProgress")
-  (c-name "gtk_progress_get_percentage_from_value")
-  (return-type "gdouble")
-  (parameters
-    '("gdouble" "value")
-  )
-)
-
-
-
 ;; From gtkradioaction.h
 
 (define-function gtk_radio_action_get_type
@@ -16297,7 +16226,7 @@
   (c-name "gtk_range_set_min_slider_size")
   (return-type "none")
   (parameters
-    '("gboolean" "min_size")
+    '("gint" "min_size")
   )
 )
 
@@ -18528,6 +18457,16 @@
   )
 )
 
+(define-function gtk_distribute_natural_allocation
+  (c-name "gtk_distribute_natural_allocation")
+  (return-type "gint")
+  (parameters
+    '("gint" "extra_space")
+    '("guint" "n_requested_sizes")
+    '("GtkRequestedSize*" "sizes")
+  )
+)
+
 
 
 ;; From gtksocket.h
@@ -19371,23 +19310,6 @@
   )
 )
 
-(define-function gtk_paint_polygon
-  (c-name "gtk_paint_polygon")
-  (return-type "none")
-  (parameters
-    '("GtkStyle*" "style")
-    '("GdkWindow*" "window")
-    '("GtkStateType" "state_type")
-    '("GtkShadowType" "shadow_type")
-    '("const-GdkRectangle*" "area")
-    '("GtkWidget*" "widget")
-    '("const-gchar*" "detail")
-    '("const-GdkPoint*" "points")
-    '("gint" "n_points")
-    '("gboolean" "fill")
-  )
-)
-
 (define-function gtk_paint_arrow
   (c-name "gtk_paint_arrow")
   (return-type "none")
@@ -20842,7 +20764,7 @@
   (parameters
     '("GtkWidget*" "widget")
     '("GdkDrawable*" "drawable")
-    '("GdkGC*" "cursor_gc")
+    '("gpointer" "cursor_gc")
     '("gint" "x_offset")
     '("gint" "y_offset")
     '("gint" "x")
@@ -26354,6 +26276,11 @@
 
 ;; From gtktypebuiltins.h
 
+(define-function gtk_license_get_type
+  (c-name "gtk_license_get_type")
+  (return-type "GType")
+)
+
 (define-function gtk_accel_flags_get_type
   (c-name "gtk_accel_flags_get_type")
   (return-type "GType")
@@ -26569,16 +26496,6 @@
   (return-type "GType")
 )
 
-(define-function gtk_submenu_direction_get_type
-  (c-name "gtk_submenu_direction_get_type")
-  (return-type "GType")
-)
-
-(define-function gtk_submenu_placement_get_type
-  (c-name "gtk_submenu_placement_get_type")
-  (return-type "GType")
-)
-
 (define-function gtk_toolbar_style_get_type
   (c-name "gtk_toolbar_style_get_type")
   (return-type "GType")
@@ -26679,6 +26596,16 @@
   (return-type "GType")
 )
 
+(define-function gtk_wrap_allocation_mode_get_type
+  (c-name "gtk_wrap_allocation_mode_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_wrap_box_spreading_get_type
+  (c-name "gtk_wrap_box_spreading_get_type")
+  (return-type "GType")
+)
+
 (define-function gtk_file_chooser_action_get_type
   (c-name "gtk_file_chooser_action_get_type")
   (return-type "GType")
@@ -29515,6 +29442,143 @@
 
 
 
+;; From gtkwrapbox.h
+
+(define-function gtk_wrap_box_get_type
+  (c-name "gtk_wrap_box_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_wrap_box_new
+  (c-name "gtk_wrap_box_new")
+  (is-constructor-of "GtkWrapBox")
+  (return-type "GtkWidget*")
+  (parameters
+    '("GtkWrapAllocationMode" "mode")
+    '("GtkWrapBoxSpreading" "spreading")
+    '("guint" "horizontal_spacing")
+    '("guint" "vertical_spacing")
+  )
+)
+
+(define-method set_allocation_mode
+  (of-object "GtkWrapBox")
+  (c-name "gtk_wrap_box_set_allocation_mode")
+  (return-type "none")
+  (parameters
+    '("GtkWrapAllocationMode" "mode")
+  )
+)
+
+(define-method get_allocation_mode
+  (of-object "GtkWrapBox")
+  (c-name "gtk_wrap_box_get_allocation_mode")
+  (return-type "GtkWrapAllocationMode")
+)
+
+(define-method set_spreading
+  (of-object "GtkWrapBox")
+  (c-name "gtk_wrap_box_set_spreading")
+  (return-type "none")
+  (parameters
+    '("GtkWrapBoxSpreading" "spreading")
+  )
+)
+
+(define-method get_spreading
+  (of-object "GtkWrapBox")
+  (c-name "gtk_wrap_box_get_spreading")
+  (return-type "GtkWrapBoxSpreading")
+)
+
+(define-method set_vertical_spacing
+  (of-object "GtkWrapBox")
+  (c-name "gtk_wrap_box_set_vertical_spacing")
+  (return-type "none")
+  (parameters
+    '("guint" "spacing")
+  )
+)
+
+(define-method get_vertical_spacing
+  (of-object "GtkWrapBox")
+  (c-name "gtk_wrap_box_get_vertical_spacing")
+  (return-type "guint")
+)
+
+(define-method set_horizontal_spacing
+  (of-object "GtkWrapBox")
+  (c-name "gtk_wrap_box_set_horizontal_spacing")
+  (return-type "none")
+  (parameters
+    '("guint" "spacing")
+  )
+)
+
+(define-method get_horizontal_spacing
+  (of-object "GtkWrapBox")
+  (c-name "gtk_wrap_box_get_horizontal_spacing")
+  (return-type "guint")
+)
+
+(define-method set_minimum_line_children
+  (of-object "GtkWrapBox")
+  (c-name "gtk_wrap_box_set_minimum_line_children")
+  (return-type "none")
+  (parameters
+    '("guint" "n_children")
+  )
+)
+
+(define-method get_minimum_line_children
+  (of-object "GtkWrapBox")
+  (c-name "gtk_wrap_box_get_minimum_line_children")
+  (return-type "guint")
+)
+
+(define-method set_natural_line_children
+  (of-object "GtkWrapBox")
+  (c-name "gtk_wrap_box_set_natural_line_children")
+  (return-type "none")
+  (parameters
+    '("guint" "n_children")
+  )
+)
+
+(define-method get_natural_line_children
+  (of-object "GtkWrapBox")
+  (c-name "gtk_wrap_box_get_natural_line_children")
+  (return-type "guint")
+)
+
+(define-method insert_child
+  (of-object "GtkWrapBox")
+  (c-name "gtk_wrap_box_insert_child")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("gint" "index")
+    '("guint" "xpad")
+    '("guint" "ypad")
+    '("gboolean" "xexpand")
+    '("gboolean" "yexpand")
+    '("gboolean" "xfill")
+    '("gboolean" "yfill")
+  )
+)
+
+(define-method reorder_child
+  (of-object "GtkWrapBox")
+  (c-name "gtk_wrap_box_reorder_child")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("guint" "index")
+  )
+)
+
+
+
 ;; From gtkpagesetupunixdialog.h
 
 (define-function gtk_page_setup_unix_dialog_get_type
diff --git a/gtk/src/gtk_signals.defs b/gtk/src/gtk_signals.defs
index 50617d7..e67fabc 100644
--- a/gtk/src/gtk_signals.defs
+++ b/gtk/src/gtk_signals.defs
@@ -44709,3 +44709,302 @@
   (writable #t)
   (construct-only #f)
 )
+
+;; From GtkWrapBox
+
+(define-property orientation
+  (of-object "GtkWrapBox")
+  (prop-type "GParamEnum")
+  (docs "The orientation of the orientable")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property name
+  (of-object "GtkWrapBox")
+  (prop-type "GParamString")
+  (docs "The name of the widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property parent
+  (of-object "GtkWrapBox")
+  (prop-type "GParamObject")
+  (docs "The parent widget of this widget. Must be a Container widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property width-request
+  (of-object "GtkWrapBox")
+  (prop-type "GParamInt")
+  (docs "Override for width request of the widget, or -1 if natural request should be used")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property height-request
+  (of-object "GtkWrapBox")
+  (prop-type "GParamInt")
+  (docs "Override for height request of the widget, or -1 if natural request should be used")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property visible
+  (of-object "GtkWrapBox")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget is visible")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property sensitive
+  (of-object "GtkWrapBox")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget responds to input")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property app-paintable
+  (of-object "GtkWrapBox")
+  (prop-type "GParamBoolean")
+  (docs "Whether the application will paint directly on the widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property can-focus
+  (of-object "GtkWrapBox")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget can accept the input focus")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property has-focus
+  (of-object "GtkWrapBox")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget has the input focus")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property is-focus
+  (of-object "GtkWrapBox")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget is the focus widget within the toplevel")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property can-default
+  (of-object "GtkWrapBox")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget can be the default widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property has-default
+  (of-object "GtkWrapBox")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget is the default widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property receives-default
+  (of-object "GtkWrapBox")
+  (prop-type "GParamBoolean")
+  (docs "If TRUE, the widget will receive the default action when it is focused")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property composite-child
+  (of-object "GtkWrapBox")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget is part of a composite widget")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property style
+  (of-object "GtkWrapBox")
+  (prop-type "GParamObject")
+  (docs "The style of the widget, which contains information about how it will look (colors etc)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property events
+  (of-object "GtkWrapBox")
+  (prop-type "GParamFlags")
+  (docs "The event mask that decides what kind of GdkEvents this widget gets")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property extension-events
+  (of-object "GtkWrapBox")
+  (prop-type "GParamEnum")
+  (docs "The mask that decides what kind of extension events this widget gets")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property no-show-all
+  (of-object "GtkWrapBox")
+  (prop-type "GParamBoolean")
+  (docs "Whether gtk_widget_show_all() should not affect this widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property has-tooltip
+  (of-object "GtkWrapBox")
+  (prop-type "GParamBoolean")
+  (docs "Whether this widget has a tooltip")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property tooltip-markup
+  (of-object "GtkWrapBox")
+  (prop-type "GParamString")
+  (docs "The contents of the tooltip for this widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property tooltip-text
+  (of-object "GtkWrapBox")
+  (prop-type "GParamString")
+  (docs "The contents of the tooltip for this widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property window
+  (of-object "GtkWrapBox")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property double-buffered
+  (of-object "GtkWrapBox")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property border-width
+  (of-object "GtkWrapBox")
+  (prop-type "GParamUInt")
+  (docs "The width of the empty border outside the containers children")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property resize-mode
+  (of-object "GtkWrapBox")
+  (prop-type "GParamEnum")
+  (docs "Specify how resize events are handled")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property child
+  (of-object "GtkWrapBox")
+  (prop-type "GParamObject")
+  (docs "Can be used to add a new child to the container")
+  (readable #f)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property allocation-mode
+  (of-object "GtkWrapBox")
+  (prop-type "GParamEnum")
+  (docs "The allocation mode to use")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property spreading
+  (of-object "GtkWrapBox")
+  (prop-type "GParamEnum")
+  (docs "The spreading mode to use")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property horizontal-spacing
+  (of-object "GtkWrapBox")
+  (prop-type "GParamUInt")
+  (docs "The amount of horizontal space between two children")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property vertical-spacing
+  (of-object "GtkWrapBox")
+  (prop-type "GParamUInt")
+  (docs "The amount of vertical space between two children")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property minimum-line-children
+  (of-object "GtkWrapBox")
+  (prop-type "GParamUInt")
+  (docs "The minimum number of children to allocate consecutively in the given orientation.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property natural-line-children
+  (of-object "GtkWrapBox")
+  (prop-type "GParamUInt")
+  (docs "The maximum amount of children to request space for consecutively in the given orientation.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
diff --git a/gtk/src/wrapbox.ccg b/gtk/src/wrapbox.ccg
new file mode 100644
index 0000000..a455a67
--- /dev/null
+++ b/gtk/src/wrapbox.ccg
@@ -0,0 +1,35 @@
+// -*- c++ -*-
+/* $Id: wrapbox.ccg,v 1.6 2004/03/03 18:48:04 murrayc Exp $ */
+
+/*
+ *
+ * Copyright 2010 The gtkmm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+namespace Gtk
+{
+
+void WrapBox::append_child(Widget& widget, guint xpad, guint ypad, bool xexpand, bool yexpand,  bool xfill, bool yfill)
+{
+  insert_child(widget, -1, /* see the C documentation */
+    xpad, ypad, xexpand, yexpand, xfill, yfill);
+}
+
+} // namespace Gtk
diff --git a/gtk/src/wrapbox.hg b/gtk/src/wrapbox.hg
new file mode 100644
index 0000000..1124498
--- /dev/null
+++ b/gtk/src/wrapbox.hg
@@ -0,0 +1,83 @@
+/* Copyright (C) 2010 The gtkmm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <gtkmm/container.h>
+#include <gtkmm/toolitem.h>
+#include <gtkmm/orientable.h>
+#include <gtkmm/adjustment.h>
+#include <gtkmm/toolitemgroup.h>
+
+_DEFS(gtkmm,gtk)
+_PINCLUDE(gtkmm/private/container_p.h)
+
+namespace Gtk
+{
+
+_WRAP_ENUM(WrapAllocationMode, GtkWrapAllocationMode)
+_WRAP_ENUM(WrapBoxSpreading, GtkWrapBoxSpreading)
+
+/** TODO
+ *
+ * @newin{3,0}
+ *
+ * @ingroup Widgets
+ * @ingroup Containers
+ */
+class WrapBox
+: public Container //TODO: Also uses SizeRequest
+{
+  _CLASS_GTKOBJECT(WrapBox, GtkWrapBox, GTK_WRAP_BOX, Gtk::Container, GtkContainer)
+  _IMPLEMENTS_INTERFACE(Orientable)
+public:
+  _WRAP_CTOR(WrapBox(WrapAllocationMode mode = WRAP_ALLOCATE_FREE, WrapBoxSpreading spreading = WRAP_BOX_SPREAD_BEGIN, guint horizontal_spacing = 0, guint vertical_spacing = 0), gtk_wrap_box_new)
+
+  _WRAP_METHOD(void set_allocation_mode(WrapAllocationMode mode), gtk_wrap_box_set_allocation_mode)
+  _WRAP_METHOD(WrapAllocationMode get_allocation_mode() const, gtk_wrap_box_get_allocation_mode)
+
+  _WRAP_METHOD(void set_spreading(WrapBoxSpreading spreading), gtk_wrap_box_set_spreading)
+  _WRAP_METHOD(WrapBoxSpreading get_spreading() const, gtk_wrap_box_get_spreading)
+
+  _WRAP_METHOD(void set_vertical_spacing(guint spacing), gtk_wrap_box_set_vertical_spacing)
+  _WRAP_METHOD(guint get_vertical_spacing() const, gtk_wrap_box_get_vertical_spacing)
+
+  _WRAP_METHOD(void set_horizontal_spacing(guint spacing), gtk_wrap_box_set_horizontal_spacing)
+  _WRAP_METHOD(guint get_horizontal_spacing() const, gtk_wrap_box_get_horizontal_spacing)
+
+  _WRAP_METHOD(void set_minimum_line_children(guint n_children), gtk_wrap_box_set_minimum_line_children)
+  _WRAP_METHOD(guint get_minimum_line_children() const, gtk_wrap_box_get_minimum_line_children)
+
+  _WRAP_METHOD(void set_natural_line_children(guint n_children), gtk_wrap_box_set_natural_line_children)
+  _WRAP_METHOD(guint get_natural_line_children() const, gtk_wrap_box_get_natural_line_children)
+
+  //TODO: Use -1 for append().
+  _WRAP_METHOD(void insert_child(Widget& widget, int index, guint xpad  = 0, guint ypad = 0, bool xexpand = false, bool yexpand = false,  bool xfill = 0, bool yfill = 0), gtk_wrap_box_insert_child)
+
+  //TODO: Documentation
+  void append_child(Widget& widget, guint xpad  = 0, guint ypad = 0, bool xexpand = false, bool yexpand = false,  bool xfill = 0, bool yfill = 0);
+
+  _WRAP_METHOD(void reorder_child(Widget& widget, guint index), gtk_wrap_box_reorder_child)
+
+
+  _WRAP_PROPERTY("allocation-mode", WrapAllocationMode)
+  _WRAP_PROPERTY("spreading", WrapBoxSpreading)
+  _WRAP_PROPERTY("minimum-line-children", guint)
+  _WRAP_PROPERTY("natural-line-children", guint)
+  _WRAP_PROPERTY("vertical-spacing", guint)
+  _WRAP_PROPERTY("horizontal-spacing", guint)
+};
+
+} // namespace Gtk
diff --git a/tools/extra_defs_gen/generate_defs_gtk.cc b/tools/extra_defs_gen/generate_defs_gtk.cc
index 93b935d..d5a557a 100644
--- a/tools/extra_defs_gen/generate_defs_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_gtk.cc
@@ -194,7 +194,8 @@ int main(int argc, char** argv)
             << get_defs( GTK_TYPE_VIEWPORT )
             << get_defs( GTK_TYPE_VOLUME_BUTTON )
             << get_defs( GTK_TYPE_WIDGET )
-            << get_defs( GTK_TYPE_WINDOW );
+            << get_defs( GTK_TYPE_WINDOW )
+            << get_defs( GTK_TYPE_WRAP_BOX );
 
 
   return 0;
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index b308dec..5b27fef 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -145,6 +145,8 @@ _CONV_ENUM(Gtk,PrintCapabilities)
 _CONV_ENUM(Gtk,DragResult)
 _CONV_ENUM(Gtk,NumberUpLayout)
 _CONV_ENUM(Gtk,EntryIconPosition)
+_CONV_ENUM(Gtk,WrapAllocationMode)
+_CONV_ENUM(Gtk,WrapBoxSpreading)
 
 _CONVERSION(`GtkIconSize',`IconSize',`IconSize(static_cast<int>($3))')
 _CONVERSION(`GtkIconSize',`Gtk::IconSize',`Gtk::IconSize(static_cast<int>($3))')
@@ -668,4 +670,3 @@ _CONVERSION(`const Glib::RefPtr<Gio::InputStream>&',`GInputStream*',__CONVERT_CO
 
 
 _CONVERSION(`GtkDragResult',`DragResult',`($2)$3')
-



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