[gtkmm] Fix some gmmproc warnings, adding some TextBuffer methods.



commit 6b9517eaece16478a87679dc3456a70ebb56dc6f
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Sep 20 11:40:47 2010 +0200

    Fix some gmmproc warnings, adding some TextBuffer methods.
    
    * tools/extra_defs_gen/generate_defs_gtk.cc: Added interfaces because
      this now supports them.
    * gtk/src/gtk_signals.defs: Regenerated.
    * gtk/src/gtk_other.defs: Remove declarations that are now in
      the regular gtk_signals.defs.
    * gtk/src/gtk_extra_objects.defs: Added GtkPrintOperation for the docs.
    * gtk/src/entry.hg: Ignore the preedit-changed signal because it is
      for keybindings.
    * gtk/src/filechooser.hg: Remove the mention of the folder-mode property,
      which apparently never existed.
    * gtk/src/infobar.hg: Ignore the close signal because it is for keybindings.
    * gtk/src/textbuffer.hg: Added get_copy_target_list() and
      get_paste_target_list().
    * gtk/src/toolitem.hg: Ignore the deprecated set_tooltip signal.
    * gtk/src/toolpalette.hg: Ignore the set_scroll_adjustments signal because
      it seems to be internal.
    * gtk/src/treepath.hg: Ignore gtk_tree_path_get_indices_with_depth()
      because we don't need it.

 ChangeLog                                 |   35 +-
 gtk/src/entry.hg                          |   34 +-
 gtk/src/filechooser.hg                    |   20 +-
 gtk/src/gtk_extra_objects.defs            |    8 +-
 gtk/src/gtk_other.defs                    |  268 -
 gtk/src/gtk_signals.defs                  |12917 ++++++++++++++---------------
 gtk/src/infobar.hg                        |   32 +-
 gtk/src/textbuffer.hg                     |   34 +-
 gtk/src/toolitem.hg                       |    1 +
 gtk/src/toolpalette.hg                    |    5 +-
 gtk/src/treepath.hg                       |    2 +-
 tools/extra_defs_gen/generate_defs_gtk.cc |    5 +
 12 files changed, 6285 insertions(+), 7076 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 96755ae..4863845 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2010-09-20  Murray Cumming  <murrayc murrayc com>
+
+	Fix some gmmproc warnings, adding some TextBuffer methods.
+
+	* tools/extra_defs_gen/generate_defs_gtk.cc: Added interfaces because
+  this now supports them.
+	* gtk/src/gtk_signals.defs: Regenerated.
+	* gtk/src/gtk_other.defs: Remove declarations that are now in
+  the regular gtk_signals.defs.
+	* gtk/src/gtk_extra_objects.defs: Added GtkPrintOperation for the docs.
+	* gtk/src/entry.hg: Ignore the preedit-changed signal because it is
+  for keybindings.
+	* gtk/src/filechooser.hg: Remove the mention of the folder-mode property,
+  which apparently never existed.
+	* gtk/src/infobar.hg: Ignore the close signal because it is for keybindings.
+	* gtk/src/textbuffer.hg: Added get_copy_target_list() and
+  get_paste_target_list().
+	* gtk/src/toolitem.hg: Ignore the deprecated set_tooltip signal.
+	* gtk/src/toolpalette.hg: Ignore the set_scroll_adjustments signal because
+  it seems to be internal.
+	* gtk/src/treepath.hg: Ignore gtk_tree_path_get_indices_with_depth()
+  because we don't need it.
+
 2010-09-18  Murray Cumming  <murrayc murrayc com>
 
 	Editable: Use the renamed GtkEditable interface struct.
@@ -8,7 +31,7 @@
 
 	gtkmm: Widget: Add back size_allocate().
 
-	* gtk/src/widget.hg: Revert the recent removal of 
+	* gtk/src/widget.hg: Revert the recent removal of
 	size_allocate(), because it is not actually deprecated in GTK+ 3.
 
 2010-09-16  Murray Cumming  <murrayc murrayc com>
@@ -36,8 +59,8 @@
 
 	gdkmm: Visual: Wrapped remaining methods.
 
-	* gdk/src/visual.hg: Added get_visual_type(), get_depth(), get_byte_order(), 
-	get_colormap_size(), get_bits_per_rgb(), get_red_pixel_details(), 
+	* gdk/src/visual.hg: Added get_visual_type(), get_depth(), get_byte_order(),
+	get_colormap_size(), get_bits_per_rgb(), get_red_pixel_details(),
 	get_green_pixel_details(), get_blue_pixel_details().
 	* tools/m4/convert_gdk.m4: Added guint32& -> guint32* conversion.
 	* gdk/src/colormap.hg: Remove query_color(), removed from GTK+.
@@ -46,10 +69,10 @@
 
 	gdkmm: Display: Fix build error in get_protocol_for_disply().
 
-	* gdk/src/display.[hg|ccg]: get_protocol_for_display(): Remove the ifdef 
-	around this, because this remaining version is not win32-only. Remove the 
+	* gdk/src/display.[hg|ccg]: get_protocol_for_display(): Remove the ifdef
+	around this, because this remaining version is not win32-only. Remove the
 	 implementation for the win32-only version with no remaining declaration.
-	Remove the win32-only version of selection_send_notify() because it too 
+	Remove the win32-only version of selection_send_notify() because it too
 	existed only to maintain ABI in gtkmm 2.4.
 
 2010-09-15  Murray Cumming  <murrayc murrayc com>
diff --git a/gtk/src/entry.hg b/gtk/src/entry.hg
index 2b1f698..fa160f3 100644
--- a/gtk/src/entry.hg
+++ b/gtk/src/entry.hg
@@ -1,7 +1,7 @@
 /* $Id: entry.hg,v 1.12 2006/06/13 17:16:26 murrayc Exp $ */
 
 /* entry.h
- * 
+ *
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -42,7 +42,7 @@ _WRAP_ENUM(EntryIconPosition, GtkEntryIconPosition)
  * The Gtk::Entry widget is a single line text entry widget. A fairly large
  * set of key bindings are supported by default. If the entered text is
  * longer than the allocation of the widget, the widget will scroll so that
- * the cursor position is visible. 
+ * the cursor position is visible.
  *
  * The Entry widget looks like this:
  * @image html entry1.png
@@ -105,7 +105,7 @@ public:
   _WRAP_METHOD(const Adjustment* get_cursor_hadjustment() const, gtk_entry_get_cursor_hadjustment, refreturn, constversion)
 
   _WRAP_METHOD(void set_alignment(float xalign), gtk_entry_set_alignment)
-  _WRAP_METHOD(void set_alignment(Align xalign), gtk_entry_set_alignment) 
+  _WRAP_METHOD(void set_alignment(Align xalign), gtk_entry_set_alignment)
   _WRAP_METHOD(float get_alignment() const, gtk_entry_get_alignment)
 
   _WRAP_METHOD(void set_completion(const Glib::RefPtr<EntryCompletion>& completion), gtk_entry_set_completion)
@@ -122,11 +122,11 @@ public:
   _WRAP_METHOD_DOCS_ONLY(gtk_entry_set_icon_from_pixbuf)
   void set_icon_from_pixbuf(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY);
   _IGNORE(gtk_entry_set_icon_from_pixbuf)
-  
+
   _WRAP_METHOD_DOCS_ONLY(gtk_entry_set_icon_from_stock)
   void set_icon_from_stock(const StockID& stock_id, EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY);
   _IGNORE(gtk_entry_set_icon_from_stock)
-  
+
   _WRAP_METHOD_DOCS_ONLY(gtk_entry_set_icon_from_icon_name)
   void set_icon_from_icon_name(const Glib::ustring& icon_name, EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY);
   _IGNORE(gtk_entry_set_icon_from_icon_name)
@@ -134,7 +134,7 @@ public:
   _WRAP_METHOD_DOCS_ONLY(gtk_entry_set_icon_from_gicon)
   void set_icon_from_gicon(const Glib::RefPtr<Gio::Icon>& icon, EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY);
   _IGNORE(gtk_entry_set_icon_from_gicon)
-    
+
   _WRAP_METHOD(ImageType get_icon_storage_type(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_icon_storage_type)
   _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_icon_pixbuf(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY), gtk_entry_get_icon_pixbuf, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_icon_pixbuf(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_icon_pixbuf, refreturn, constversion)
@@ -151,28 +151,28 @@ public:
   _WRAP_METHOD(void set_icon_sensitive(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY, bool sensitive = true), gtk_entry_set_icon_sensitive)
   _WRAP_METHOD(bool get_icon_sensitive(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY), gtk_entry_get_icon_sensitive)
   _WRAP_METHOD(int get_icon_at_pos(int x, int y) const, gtk_entry_get_icon_at_pos)
-  
+
   _WRAP_METHOD_DOCS_ONLY(gtk_entry_set_icon_tooltip_text)
   void set_icon_tooltip_text(const Glib::ustring& tooltip, EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY);
-  _IGNORE(gtk_entry_set_icon_tooltip_text)  
-  
+  _IGNORE(gtk_entry_set_icon_tooltip_text)
+
   _WRAP_METHOD(Glib::ustring get_icon_tooltip_text(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_icon_tooltip_text)
-  
+
   _WRAP_METHOD_DOCS_ONLY(gtk_entry_set_icon_tooltip_markup)
   void set_icon_tooltip_markup(const Glib::ustring& tooltip, EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY);
-  _IGNORE(gtk_entry_set_icon_tooltip_markup) 
-  
+  _IGNORE(gtk_entry_set_icon_tooltip_markup)
+
   _WRAP_METHOD(Glib::ustring get_icon_tooltip_markup(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_icon_tooltip_markup)
-  
+
   _WRAP_METHOD_DOCS_ONLY(gtk_entry_set_icon_drag_source)
   void set_icon_drag_source(const Glib::RefPtr<TargetList>& target_list, Gdk::DragAction actions = Gdk::ACTION_COPY, EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY);
   _IGNORE(gtk_entry_set_icon_drag_source)
-    
+
   _WRAP_METHOD(int get_current_icon_drag_source(), gtk_entry_get_current_icon_drag_source)
 
   _WRAP_METHOD(Glib::RefPtr<Gdk::Window> get_icon_window(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY), gtk_entry_get_icon_window, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Gdk::Window> get_icon_window(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_icon_window, refreturn, constversion)
-  
+
   _WRAP_METHOD(bool im_context_filter_keypress(GdkEventKey* event), gtk_entry_im_context_filter_keypress)
   _WRAP_METHOD(void reset_im_context(), gtk_entry_reset_im_context)
 
@@ -187,7 +187,7 @@ public:
   // http://mail.gnome.org/archives/gtk-devel-list/2003-January/msg00108.html
   // "activate is probably about the only exception"
   _WRAP_SIGNAL(void activate(), "activate")
-  
+
   _WRAP_SIGNAL(void icon_release(EntryIconPosition icon_position, const GdkEventButton* event), "icon-release", no_default_handler)
   _WRAP_SIGNAL(void icon_press(EntryIconPosition icon_position, const GdkEventButton* event), "icon-press", no_default_handler)
 
@@ -198,6 +198,7 @@ public:
   _IGNORE_SIGNAL("paste_clipboard")
   _IGNORE_SIGNAL("toggle_overwrite")
   _IGNORE_SIGNAL("backspace")
+  _IGNORE_SIGNAL("preedit-changed")
 
   _WRAP_PROPERTY("buffer", Glib::RefPtr<EntryBuffer>)
   _WRAP_PROPERTY("cursor-position", int)
@@ -238,4 +239,3 @@ public:
 };
 
 } /* namespace Gtk */
-
diff --git a/gtk/src/filechooser.hg b/gtk/src/filechooser.hg
index 89e9768..eff4384 100644
--- a/gtk/src/filechooser.hg
+++ b/gtk/src/filechooser.hg
@@ -32,7 +32,7 @@ namespace Gtk
 _WRAP_ENUM(FileChooserAction, GtkFileChooserAction)
 _WRAP_ENUM(FileChooserConfirmation, GtkFileChooserConfirmation)
 
-//Note that GTK_FILE_SYSTEM_ERROR is not currently public GTK+ API and should 
+//Note that GTK_FILE_SYSTEM_ERROR is not currently public GTK+ API and should
 //never be instantiated by the GTK+ C API.
 
 /** Exception class for Gdk::FileChooser errors.
@@ -129,7 +129,7 @@ public:
 /* Preview widget
  */
   _WRAP_METHOD(void set_preview_widget(Gtk::Widget& preview_widget), gtk_file_chooser_set_preview_widget)
- 
+
   _WRAP_METHOD(Gtk::Widget* get_preview_widget(), gtk_file_chooser_get_preview_widget)
   _WRAP_METHOD(const Gtk::Widget* get_preview_widget() const, gtk_file_chooser_get_preview_widget, constversion)
 
@@ -160,13 +160,13 @@ public:
 
   _WRAP_METHOD(Glib::SListHandle< FileFilter* > list_filters(), gtk_file_chooser_list_filters)
   _WRAP_METHOD(Glib::SListHandle< const FileFilter* > list_filters() const, gtk_file_chooser_list_filters)
-  
+
 /* Current filter
  */
   _WRAP_METHOD(void set_filter(const FileFilter& filter), gtk_file_chooser_set_filter)
   _WRAP_METHOD(FileFilter* get_filter(), gtk_file_chooser_get_filter)
   _WRAP_METHOD(const FileFilter* get_filter() const, gtk_file_chooser_get_filter, constversion)
-  
+
 /* Per-application shortcut folders */
 
   _WRAP_METHOD(bool add_shortcut_folder(const std::string& folder), gtk_file_chooser_add_shortcut_folder, errthrow)
@@ -178,7 +178,7 @@ public:
   _WRAP_METHOD(bool remove_shortcut_folder_uri(const Glib::ustring& uri), gtk_file_chooser_remove_shortcut_folder_uri, errthrow)
   _WRAP_METHOD(Glib::SListHandle<Glib::ustring> list_shortcut_folder_uris() const, gtk_file_chooser_list_shortcut_folder_uris)
 
-  
+
   /** This signal is emitted when the current folder in a FileChooser
    * changes.  This can happen due to the user performing some action that
    * changes folders, such as selecting a bookmark or visiting a folder on the
@@ -192,7 +192,7 @@ public:
    * set_current_folder_uri(), get_current_folder_uri().
    */
   _WRAP_SIGNAL(void current_folder_changed(), "current_folder_changed", no_default_handler)
-  
+
   /** This signal is emitted when there is a change in the set of selected files
    * in a #GtkFileChooser.  This can happen when the user modifies the selection
    * with the mouse or the keyboard, or when explicitly calling functions to
@@ -208,7 +208,7 @@ public:
    * get_uris().
    */
   _WRAP_SIGNAL(void selection_changed(), "selection_changed", no_default_handler)
-  
+
   /** This signal is emitted when the preview in a file chooser should be
    * regenerated.  For example, this can happen when the currently selected file
    * changes.  You should use this signal if you want your file chooser to have
@@ -226,7 +226,7 @@ public:
    * set_use_preview_label(), get_preview_filename(), get_preview_uri().
    */
   _WRAP_SIGNAL(void update_preview(), "update_preview", no_default_handler)
-  
+
   /** This signal is emitted when the user "activates" a file in the file
    * chooser.  This can happen by double-clicking on a file in the file list, or
    * by pressing <keycap>Enter</keycap>.
@@ -242,9 +242,8 @@ public:
   _WRAP_SIGNAL(FileChooserConfirmation confirm_overwrite(), "confirm-overwrite", no_default_handler)
 
   _WRAP_PROPERTY("action", FileChooserAction)
-  //TODO: _WRAP_PROPERTY("file-system", FileSystem) //FileSystem is not really public API.
+  //TODO: _WRAP_PROPERTY("file-system-backend", FileSystem) //FileSystem is not really public API.
   _WRAP_PROPERTY("filter", FileFilter*)
-  _WRAP_PROPERTY("folder-mode", bool)
   _WRAP_PROPERTY("local-only", bool)
   _WRAP_PROPERTY("preview-widget", Widget*)
   _WRAP_PROPERTY("preview-widget-active", bool)
@@ -257,4 +256,3 @@ public:
 };
 
 } // namespace Gtk
-
diff --git a/gtk/src/gtk_extra_objects.defs b/gtk/src/gtk_extra_objects.defs
index 1c0c881..cb93182 100644
--- a/gtk/src/gtk_extra_objects.defs
+++ b/gtk/src/gtk_extra_objects.defs
@@ -1,8 +1,8 @@
 ; These define-object declarations were not generated by h2defs.py
-; because it looks for the SomethingClass declaration too, but that is often 
+; because it looks for the SomethingClass declaration too, but that is often
 ; hidden.
-; However, it is needed by the documentation generation, which needs to 
-; know what objects exist, so it can guess how to break apart C function names 
+; However, it is needed by the documentation generation, which needs to
+; know what objects exist, so it can guess how to break apart C function names
 ; that are mentioned in documentation text.
 ; (DocsParser.pm:substitute_function(), which uses GtkDefs.pm:lookup_object().)
 
@@ -58,6 +58,7 @@
   (in-module "Gtk")
   (c-name "GtkPrintSettings")
   (gtype-id "GTK_TYPE_PRINT_SETTINGS")
+)
 
 
 (define-object RecentFilter
@@ -95,4 +96,3 @@
   (c-name "GtkTreeRowReference")
   (gtype-id "GTK_TYPE_TREE_ROW_REFERENCE")
 )
-
diff --git a/gtk/src/gtk_other.defs b/gtk/src/gtk_other.defs
index 304a4f9..69d5b64 100644
--- a/gtk/src/gtk_other.defs
+++ b/gtk/src/gtk_other.defs
@@ -41,66 +41,6 @@
   (when "last")
 )
 
-; GtkTreeModel (written by hand because we can't instantiate an interface):
-
-(define-signal row_changed
-  (of-object "GtkTreeModel")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GtkTreePath*" "path")
-    '("GtkTreeIter*" "iter")
-  )
-)
-
-(define-signal row_inserted
-  (of-object "GtkTreeModel")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GtkTreePath*" "path")
-    '("GtkTreeIter*" "iter")
-  )
-)
-
-(define-signal row_has_child_toggled
-  (of-object "GtkTreeModel")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GtkTreePath*" "path")
-    '("GtkTreeIter*" "iter")
-  )
-)
-
-(define-signal row_deleted
-  (of-object "GtkTreeModel")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GtkTreePath*" "path")
-  )
-)
-
-(define-signal rows_reordered
-  (of-object "GtkTreeModel")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GtkTreePath*" "path")
-    '("GtkTreeIter*" "iter")
-    '("gint*" "new_order")
-  )
-)
-
-;; GtkTreeSortable (written by hand because we can't instantiate an interface):
-
-(define-signal sort_column_changed
-  (of-object "GtkTreeSortable")
-  (return-type "void")
-  (when "last")
-)
-
 ;; For some reason h2defs.py doesn't provide this:
 
 (define-function gtk_drag_get_data
@@ -165,215 +105,9 @@
   (construct-only #f)
 )
 
-; GtkFileChooser (written by hand because we can't instantiate an interface):
-
-(define-signal current_folder_changed
-  (of-object "GtkFileChooser")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal selection_changed
-  (of-object "GtkFileChooser")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal update_preview
-  (of-object "GtkFileChooser")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal file_activated
-  (of-object "GtkFileChooser")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal confirm-overwrite
-  (of-object "GtkFileChooser")
-  (return-type "GtkFileChooserConfirmation")
-  (when "last")
-)
-
-(define-property action
-  (of-object "GtkFileChooser")
-  (prop-type "GtkFileChooserAction")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property file-system
-  (of-object "GtkFileChooser")
-  (prop-type "GtkFileSystem")
-  (readable #f)
-  (writable #t)
-  (construct-only #t)
-)
-
-(define-property filter
-  (of-object "GtkFileChooser")
-  (prop-type "GtkFileFilter*")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
 
-(define-property folder-mode
-  (of-object "GtkFileChooser")
-  (prop-type "GParamBoolean")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
 
-(define-property local-only
-  (of-object "GtkFileChooser")
-  (prop-type "GParamBoolean")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
 
-(define-property preview-widget
-  (of-object "GtkFileChooser")
-  (prop-type "GtkWidget*")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property use-preview-label
-  (of-object "GtkFileChooser")
-  (prop-type "GParamBoolean")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property preview-widget-active
-  (of-object "GtkFileChooser")
-  (prop-type "GParamBoolean")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property extra-widget
-  (of-object "GtkFileChooser")
-  (prop-type "GtkWidget*")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property select-multiple
-  (of-object "GtkFileChooser")
-  (prop-type "GParamBoolean")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property show-hidden
-  (of-object "GtkFileChooser")
-  (prop-type "GParamBoolean")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property do-overwrite-confirmation
-  (of-object "GtkFileChooser")
-  (prop-type "GParamBoolean")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-; GtkRecentChooser (written by hand because we can't instantiate an interface):
-
-(define-property recent-manager
-  (of-object "GtkRecentChooser")
-  (prop-type "GtkRecentManager*")
-  (readable #f)
-  (writable #t)
-  (construct-only #t)
-)
-
-(define-property show-private
-  (of-object "GtkRecentChooser")
-  (prop-type "GParamBoolean")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property show-tips
-  (of-object "GtkRecentChooser")
-  (prop-type "GParamBoolean")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property show-icons
-  (of-object "GtkRecentChooser")
-  (prop-type "GParamBoolean")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property show-not-found
-  (of-object "GtkRecentChooser")
-  (prop-type "GParamBoolean")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property select-multiple
-  (of-object "GtkRecentChooser")
-  (prop-type "GParamBoolean")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property local-only
-  (of-object "GtkRecentChooser")
-  (prop-type "GParamBoolean")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property limit
-  (of-object "GtkRecentChooser")
-  (prop-type "GParamInt")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property sort-type
-  (of-object "GtkRecentChooser")
-  (prop-type "GParamEnum")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property filter
-  (of-object "GtkRecentChooser")
-  (prop-type "GtkRecentFilter*")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
 
 
 ;; From GtkPrintOperationPreview (TODO: vfuncs):
@@ -418,5 +152,3 @@
   (c-name "gtk_about_dialog_get_artists")
   (return-type "gchar-const-*-const-*")
 )
-
-
diff --git a/gtk/src/gtk_signals.defs b/gtk/src/gtk_signals.defs
index e67fabc..90cf68d 100644
--- a/gtk/src/gtk_signals.defs
+++ b/gtk/src/gtk_signals.defs
@@ -1,400 +1,15 @@
-;; From AtkObject
-
-(define-signal children-changed
-  (of-object "AtkObject")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("guint" "p0")
-    '("gpointer" "p1")
-  )
-)
-
-(define-signal focus-event
-  (of-object "AtkObject")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("gboolean" "p0")
-  )
-)
-
-(define-signal property-change
-  (of-object "AtkObject")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("gpointer" "p0")
-  )
-)
-
-(define-signal state-change
-  (of-object "AtkObject")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("const-gchar*" "p0")
-    '("gboolean" "p1")
-  )
-)
-
-(define-signal visible-data-changed
-  (of-object "AtkObject")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal active-descendant-changed
-  (of-object "AtkObject")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("gpointer" "p0")
-  )
-)
-
-(define-property accessible-name
-  (of-object "AtkObject")
-  (prop-type "GParamString")
-  (docs "Object instance's name formatted for assistive technology access")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property accessible-description
-  (of-object "AtkObject")
-  (prop-type "GParamString")
-  (docs "Description of an object, formatted for assistive technology access")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property accessible-parent
-  (of-object "AtkObject")
-  (prop-type "GParamObject")
-  (docs "Is used to notify that the parent has changed")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property accessible-value
-  (of-object "AtkObject")
-  (prop-type "GParamDouble")
-  (docs "Is used to notify that the value has changed")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property accessible-role
-  (of-object "AtkObject")
-  (prop-type "GParamInt")
-  (docs "The accessible role of this object")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property accessible-component-layer
-  (of-object "AtkObject")
-  (prop-type "GParamInt")
-  (docs "The accessible layer of this object")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property accessible-component-mdi-zorder
-  (of-object "AtkObject")
-  (prop-type "GParamInt")
-  (docs "The accessible MDI value of this object")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property accessible-table-caption
-  (of-object "AtkObject")
-  (prop-type "GParamString")
-  (docs "Is used to notify that the table caption has changed; this property should not be used. accessible-table-caption-object should be used instead")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property accessible-table-column-description
-  (of-object "AtkObject")
-  (prop-type "GParamString")
-  (docs "Is used to notify that the table column description has changed")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property accessible-table-column-header
-  (of-object "AtkObject")
-  (prop-type "GParamObject")
-  (docs "Is used to notify that the table column header has changed")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property accessible-table-row-description
-  (of-object "AtkObject")
-  (prop-type "GParamString")
-  (docs "Is used to notify that the table row description has changed")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property accessible-table-row-header
-  (of-object "AtkObject")
-  (prop-type "GParamObject")
-  (docs "Is used to notify that the table row header has changed")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property accessible-table-summary
-  (of-object "AtkObject")
-  (prop-type "GParamObject")
-  (docs "Is used to notify that the table summary has changed")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property accessible-table-caption-object
-  (of-object "AtkObject")
-  (prop-type "GParamObject")
-  (docs "Is used to notify that the table caption has changed")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property accessible-hypertext-nlinks
-  (of-object "AtkObject")
-  (prop-type "GParamInt")
-  (docs "The number of links which the current AtkHypertext has")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-;; From AtkComponent
-
-(define-signal bounds-changed
-  (of-object "AtkComponent")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("AtkRectangle*" "p0")
-  )
-)
-
-;; From AtkAction
-
-;; From AtkEditableText
-
-;; From AtkHyperlink
-
-(define-signal link-activated
-  (of-object "AtkHyperlink")
-  (return-type "void")
-  (when "last")
-)
-
-(define-property selected-link
-  (of-object "AtkHyperlink")
-  (prop-type "GParamBoolean")
-  (docs "Specifies whether the AtkHyperlink object is selected")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property number-of-anchors
-  (of-object "AtkHyperlink")
-  (prop-type "GParamInt")
-  (docs "The number of anchors associated with the AtkHyperlink object")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property end-index
-  (of-object "AtkHyperlink")
-  (prop-type "GParamInt")
-  (docs "The end index of the AtkHyperlink object")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property start-index
-  (of-object "AtkHyperlink")
-  (prop-type "GParamInt")
-  (docs "The start index of the AtkHyperlink object")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-;; From AtkHypertext
-
-(define-signal link-selected
-  (of-object "AtkHypertext")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("gint" "p0")
-  )
-)
-
-;; From AtkImage
-
-;; From AtkSelection
-
-(define-signal selection-changed
-  (of-object "AtkSelection")
-  (return-type "void")
-  (when "last")
-)
-
-;; From AtkTable
-
-(define-signal row-inserted
-  (of-object "AtkTable")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("gint" "p0")
-    '("gint" "p1")
-  )
-)
-
-(define-signal column-inserted
-  (of-object "AtkTable")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("gint" "p0")
-    '("gint" "p1")
-  )
-)
-
-(define-signal row-deleted
-  (of-object "AtkTable")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("gint" "p0")
-    '("gint" "p1")
-  )
-)
-
-(define-signal column-deleted
-  (of-object "AtkTable")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("gint" "p0")
-    '("gint" "p1")
-  )
-)
-
-(define-signal row-reordered
-  (of-object "AtkTable")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal column-reordered
-  (of-object "AtkTable")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal model-changed
-  (of-object "AtkTable")
-  (return-type "void")
-  (when "last")
-)
-
-;; From AtkText
-
-(define-signal text-changed
-  (of-object "AtkText")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("gint" "p0")
-    '("gint" "p1")
-  )
-)
+;; From GdkColormap
 
-(define-signal text-caret-moved
-  (of-object "AtkText")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("gint" "p0")
-  )
-)
+;; From GdkDragContext
 
-(define-signal text-selection-changed
-  (of-object "AtkText")
-  (return-type "void")
-  (when "last")
-)
+;; From GdkDisplay
 
-(define-signal text-attributes-changed
-  (of-object "AtkText")
+(define-signal opened
+  (of-object "GdkDisplay")
   (return-type "void")
   (when "last")
 )
 
-;; From AtkValue
-
-;; From AtkRegistry
-
-;; From AtkRelation
-
-(define-property relation-type
-  (of-object "AtkRelation")
-  (prop-type "GParamEnum")
-  (docs "The type of the relation")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property target
-  (of-object "AtkRelation")
-  (prop-type "GParamValueArray")
-  (docs "An array of the targets for the relation")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-;; From AtkRelationSet
-
-;; From AtkStateSet
-
-;; From GdkColormap
-
-;; From GdkDragContext
-
-;; From GdkDisplay
-
 (define-signal closed
   (of-object "GdkDisplay")
   (return-type "void")
@@ -426,10 +41,6 @@
 
 ;; From GdkDrawable
 
-;; From GdkGC
-
-;; From GdkImage
-
 ;; From GdkPixbuf
 
 (define-property colorspace
@@ -622,7 +233,7 @@
 
 (define-property cursor
   (of-object "GdkWindow")
-  (prop-type "GParamPointer")
+  (prop-type "GParamBoxed")
   (docs "Cursor")
   (readable #t)
   (writable #t)
@@ -631,15 +242,6 @@
 
 ;; From GtkAboutDialog
 
-(define-property user-data
-  (of-object "GtkAboutDialog")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkAboutDialog")
   (prop-type "GParamString")
@@ -841,7 +443,70 @@
 (define-property double-buffered
   (of-object "GtkAboutDialog")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkAboutDialog")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkAboutDialog")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkAboutDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkAboutDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkAboutDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkAboutDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkAboutDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -901,24 +566,6 @@
   (construct-only #f)
 )
 
-(define-property allow-shrink
-  (of-object "GtkAboutDialog")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property allow-grow
-  (of-object "GtkAboutDialog")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, users can expand the window beyond its minimum size")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property resizable
   (of-object "GtkAboutDialog")
   (prop-type "GParamBoolean")
@@ -1126,10 +773,10 @@
   (construct-only #f)
 )
 
-(define-property has-separator
+(define-property mnemonics-visible
   (of-object "GtkAboutDialog")
   (prop-type "GParamBoolean")
-  (docs "The dialog has a separator bar above its buttons")
+  (docs "Whether mnemonics are currently visible in this window")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -1261,6 +908,15 @@
   (construct-only #f)
 )
 
+(define-property license-type
+  (of-object "GtkAboutDialog")
+  (prop-type "GParamEnum")
+  (docs "The license type of the program")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GtkAccelGroup
 
 (define-signal accel-activate
@@ -1305,15 +961,6 @@
 
 ;; From GtkAccelLabel
 
-(define-property user-data
-  (of-object "GtkAccelLabel")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkAccelLabel")
   (prop-type "GParamString")
@@ -1515,7 +1162,70 @@
 (define-property double-buffered
   (of-object "GtkAccelLabel")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkAccelLabel")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkAccelLabel")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkAccelLabel")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkAccelLabel")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkAccelLabel")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkAccelLabel")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkAccelLabel")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -1898,7 +1608,6 @@
   (construct-only #f)
 )
 
-
 ;; From GtkActionGroup
 
 (define-signal connect-proxy
@@ -1968,19 +1677,19 @@
 
 ;; From GtkActivatable
 
-(define-property use-action-appearance
+(define-property related-action
   (of-object "GtkActivatable")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the related actions appearance properties")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property related-action
+(define-property use-action-appearance
   (of-object "GtkActivatable")
-  (prop-type "GParamObject")
-  (docs "The action this activatable will activate and receive updates from")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -2000,15 +1709,6 @@
   (when "first")
 )
 
-(define-property user-data
-  (of-object "GtkAdjustment")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property value
   (of-object "GtkAdjustment")
   (prop-type "GParamDouble")
@@ -2065,15 +1765,6 @@
 
 ;; From GtkAlignment
 
-(define-property user-data
-  (of-object "GtkAlignment")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkAlignment")
   (prop-type "GParamString")
@@ -2275,7 +1966,70 @@
 (define-property double-buffered
   (of-object "GtkAlignment")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkAlignment")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkAlignment")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkAlignment")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkAlignment")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkAlignment")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkAlignment")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkAlignment")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -2380,17 +2134,88 @@
   (construct-only #f)
 )
 
-;; From GtkArrow
+;; From GtkApplication
 
-(define-property user-data
-  (of-object "GtkArrow")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+(define-signal action
+  (of-object "GtkApplication")
+  (return-type "void")
+  (when "first")
+  (parameters
+    '("const-gchar*" "p0")
+  )
+)
+
+(define-signal activated
+  (of-object "GtkApplication")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GVariant" "p0")
+  )
+)
+
+(define-signal quit
+  (of-object "GtkApplication")
+  (return-type "gboolean")
+  (when "last")
+)
+
+(define-property application-id
+  (of-object "GtkApplication")
+  (prop-type "GParamString")
+  (docs "Identifier for this application")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property register
+  (of-object "GtkApplication")
+  (prop-type "GParamBoolean")
+  (docs "If false, do not ")
   (readable #t)
   (writable #t)
+  (construct-only #t)
+)
+
+(define-property default-quit
+  (of-object "GtkApplication")
+  (prop-type "GParamBoolean")
+  (docs "Exit the process by default")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property is-remote
+  (of-object "GtkApplication")
+  (prop-type "GParamBoolean")
+  (docs "Whether this application is a proxy for another process")
+  (readable #t)
+  (writable #f)
   (construct-only #f)
 )
 
+(define-property argv
+  (of-object "GtkApplication")
+  (prop-type "GParamVariant")
+  (docs "System argument vector with type signature aay")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property platform-data
+  (of-object "GtkApplication")
+  (prop-type "GParamVariant")
+  (docs "Environmental data, must have type signature a{sv}")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+;; From GtkArrow
+
 (define-property name
   (of-object "GtkArrow")
   (prop-type "GParamString")
@@ -2592,7 +2417,70 @@
 (define-property double-buffered
   (of-object "GtkArrow")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkArrow")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkArrow")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkArrow")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkArrow")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkArrow")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkArrow")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkArrow")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -2654,15 +2542,6 @@
 
 ;; From GtkAspectFrame
 
-(define-property user-data
-  (of-object "GtkAspectFrame")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkAspectFrame")
   (prop-type "GParamString")
@@ -2864,7 +2743,70 @@
 (define-property double-buffered
   (of-object "GtkAspectFrame")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkAspectFrame")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkAspectFrame")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkAspectFrame")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkAspectFrame")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkAspectFrame")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkAspectFrame")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkAspectFrame")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -2924,15 +2866,6 @@
   (construct-only #f)
 )
 
-(define-property shadow
-  (of-object "GtkAspectFrame")
-  (prop-type "GParamEnum")
-  (docs "Deprecated property, use shadow_type instead")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property shadow-type
   (of-object "GtkAspectFrame")
   (prop-type "GParamEnum")
@@ -2989,13 +2922,13 @@
 
 ;; From GtkAssistant
 
-(define-signal cancel
+(define-signal close
   (of-object "GtkAssistant")
   (return-type "void")
   (when "last")
 )
 
-(define-signal close
+(define-signal cancel
   (of-object "GtkAssistant")
   (return-type "void")
   (when "last")
@@ -3016,15 +2949,6 @@
   (when "last")
 )
 
-(define-property user-data
-  (of-object "GtkAssistant")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkAssistant")
   (prop-type "GParamString")
@@ -3226,7 +3150,70 @@
 (define-property double-buffered
   (of-object "GtkAssistant")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkAssistant")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkAssistant")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkAssistant")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkAssistant")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkAssistant")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkAssistant")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkAssistant")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -3286,24 +3273,6 @@
   (construct-only #f)
 )
 
-(define-property allow-shrink
-  (of-object "GtkAssistant")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property allow-grow
-  (of-object "GtkAssistant")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, users can expand the window beyond its minimum size")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property resizable
   (of-object "GtkAssistant")
   (prop-type "GParamBoolean")
@@ -3511,17 +3480,17 @@
   (construct-only #f)
 )
 
-;; From GtkBin
-
-(define-property user-data
-  (of-object "GtkBin")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+(define-property mnemonics-visible
+  (of-object "GtkAssistant")
+  (prop-type "GParamBoolean")
+  (docs "Whether mnemonics are currently visible in this window")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
+;; From GtkBin
+
 (define-property name
   (of-object "GtkBin")
   (prop-type "GParamString")
@@ -3723,7 +3692,70 @@
 (define-property double-buffered
   (of-object "GtkBin")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkBin")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkBin")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkBin")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkBin")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkBin")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkBin")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkBin")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -3767,15 +3799,6 @@
   (construct-only #f)
 )
 
-(define-property user-data
-  (of-object "GtkBox")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkBox")
   (prop-type "GParamString")
@@ -3977,7 +4000,70 @@
 (define-property double-buffered
   (of-object "GtkBox")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkBox")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkBox")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -4041,51 +4127,42 @@
 
 ;; From GtkButton
 
-(define-signal pressed
+(define-signal activate
   (of-object "GtkButton")
   (return-type "void")
   (when "first")
 )
 
-(define-signal released
+(define-signal pressed
   (of-object "GtkButton")
   (return-type "void")
   (when "first")
 )
 
-(define-signal clicked
+(define-signal released
   (of-object "GtkButton")
   (return-type "void")
   (when "first")
 )
 
-(define-signal enter
+(define-signal clicked
   (of-object "GtkButton")
   (return-type "void")
   (when "first")
 )
 
-(define-signal leave
+(define-signal enter
   (of-object "GtkButton")
   (return-type "void")
   (when "first")
 )
 
-(define-signal activate
+(define-signal leave
   (of-object "GtkButton")
   (return-type "void")
   (when "first")
 )
 
-(define-property use-action-appearance
-  (of-object "GtkButton")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the related actions appearance properties")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property related-action
   (of-object "GtkButton")
   (prop-type "GParamObject")
@@ -4095,10 +4172,10 @@
   (construct-only #f)
 )
 
-(define-property user-data
+(define-property use-action-appearance
   (of-object "GtkButton")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -4305,7 +4382,70 @@
 (define-property double-buffered
   (of-object "GtkButton")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -4430,15 +4570,6 @@
   (construct-only #f)
 )
 
-(define-property user-data
-  (of-object "GtkButtonBox")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkButtonBox")
   (prop-type "GParamString")
@@ -4640,7 +4771,70 @@
 (define-property double-buffered
   (of-object "GtkButtonBox")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkButtonBox")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkButtonBox")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkButtonBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkButtonBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkButtonBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkButtonBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkButtonBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -4694,7 +4888,7 @@
 (define-property layout-style
   (of-object "GtkButtonBox")
   (prop-type "GParamEnum")
-  (docs "How to layout the buttons in the box. Possible values are default, spread, edge, start and end")
+  (docs "How to lay out the buttons in the box. Possible values are: spread, edge, start and end")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -4744,15 +4938,6 @@
   (when "first")
 )
 
-(define-property user-data
-  (of-object "GtkCalendar")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkCalendar")
   (prop-type "GParamString")
@@ -4954,7 +5139,70 @@
 (define-property double-buffered
   (of-object "GtkCalendar")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkCalendar")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkCalendar")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkCalendar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkCalendar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkCalendar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkCalendar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkCalendar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -5052,15 +5300,6 @@
 
 ;; From GtkCheckButton
 
-(define-property use-action-appearance
-  (of-object "GtkCheckButton")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the related actions appearance properties")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property related-action
   (of-object "GtkCheckButton")
   (prop-type "GParamObject")
@@ -5070,10 +5309,10 @@
   (construct-only #f)
 )
 
-(define-property user-data
+(define-property use-action-appearance
   (of-object "GtkCheckButton")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -5280,7 +5519,70 @@
 (define-property double-buffered
   (of-object "GtkCheckButton")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkCheckButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkCheckButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkCheckButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkCheckButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkCheckButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkCheckButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkCheckButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -5397,7 +5699,7 @@
 (define-property active
   (of-object "GtkCheckButton")
   (prop-type "GParamBoolean")
-  (docs "If the toggle button should be pressed in or not")
+  (docs "If the toggle button should be pressed in")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -5429,15 +5731,6 @@
   (when "first")
 )
 
-(define-property use-action-appearance
-  (of-object "GtkCheckMenuItem")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the related actions appearance properties")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property related-action
   (of-object "GtkCheckMenuItem")
   (prop-type "GParamObject")
@@ -5447,10 +5740,10 @@
   (construct-only #f)
 )
 
-(define-property user-data
+(define-property use-action-appearance
   (of-object "GtkCheckMenuItem")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -5657,480 +5950,77 @@
 (define-property double-buffered
   (of-object "GtkCheckMenuItem")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property border-width
-  (of-object "GtkCheckMenuItem")
-  (prop-type "GParamUInt")
-  (docs "The width of the empty border outside the containers children")
+  (docs "Whether the widget is double buffered")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property resize-mode
+(define-property halign
   (of-object "GtkCheckMenuItem")
   (prop-type "GParamEnum")
-  (docs "Specify how resize events are handled")
+  (docs "How to position in extra horizontal space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property child
+(define-property valign
   (of-object "GtkCheckMenuItem")
-  (prop-type "GParamObject")
-  (docs "Can be used to add a new child to the container")
-  (readable #f)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property right-justified
-  (of-object "GtkCheckMenuItem")
-  (prop-type "GParamBoolean")
-  (docs "Sets whether the menu item appears justified at the right side of a menu bar")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property submenu
-  (of-object "GtkCheckMenuItem")
-  (prop-type "GParamObject")
-  (docs "The submenu attached to the menu item, or NULL if it has none")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property accel-path
-  (of-object "GtkCheckMenuItem")
-  (prop-type "GParamString")
-  (docs "Sets the accelerator path of the menu item")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property label
-  (of-object "GtkCheckMenuItem")
-  (prop-type "GParamString")
-  (docs "The text for the child label")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property use-underline
+(define-property margin-left
   (of-object "GtkCheckMenuItem")
-  (prop-type "GParamBoolean")
-  (docs "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property active
+(define-property margin-right
   (of-object "GtkCheckMenuItem")
-  (prop-type "GParamBoolean")
-  (docs "Whether the menu item is checked")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property inconsistent
+(define-property margin-top
   (of-object "GtkCheckMenuItem")
-  (prop-type "GParamBoolean")
-  (docs "Whether to display an 'inconsistent' state")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property always-show-image
-  (of-object "GtkToggleAction")
-  (prop-type "GParamBoolean")
-  (docs "Whether the image will always be shown")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property draw-as-radio
+(define-property margin-bottom
   (of-object "GtkCheckMenuItem")
-  (prop-type "GParamBoolean")
-  (docs "Whether the menu item looks like a radio menu item")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-;; From GtkCList
-
-(define-signal set-scroll-adjustments
-  (of-object "GtkCList")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GtkAdjustment*" "p0")
-    '("GtkAdjustment*" "p1")
-  )
-)
-
-(define-signal select-all
-  (of-object "GtkCList")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal unselect-all
-  (of-object "GtkCList")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal toggle-focus-row
-  (of-object "GtkCList")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal undo-selection
-  (of-object "GtkCList")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal start-selection
-  (of-object "GtkCList")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal end-selection
-  (of-object "GtkCList")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal toggle-add-mode
-  (of-object "GtkCList")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal extend-selection
-  (of-object "GtkCList")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GtkScrollType" "p0")
-    '("gfloat" "p1")
-    '("gboolean" "p2")
-  )
-)
-
-(define-signal scroll-vertical
-  (of-object "GtkCList")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GtkScrollType" "p0")
-    '("gfloat" "p1")
-  )
-)
-
-(define-signal scroll-horizontal
-  (of-object "GtkCList")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GtkScrollType" "p0")
-    '("gfloat" "p1")
-  )
-)
-
-(define-signal select-row
-  (of-object "GtkCList")
-  (return-type "void")
-  (when "first")
-  (parameters
-    '("gint" "p0")
-    '("gint" "p1")
-    '("GdkEvent*" "p2")
-  )
-)
-
-(define-signal unselect-row
-  (of-object "GtkCList")
-  (return-type "void")
-  (when "first")
-  (parameters
-    '("gint" "p0")
-    '("gint" "p1")
-    '("GdkEvent*" "p2")
-  )
-)
-
-(define-signal row-move
-  (of-object "GtkCList")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("gint" "p0")
-    '("gint" "p1")
-  )
-)
-
-(define-signal click-column
-  (of-object "GtkCList")
-  (return-type "void")
-  (when "first")
-  (parameters
-    '("gint" "p0")
-  )
-)
-
-(define-signal resize-column
-  (of-object "GtkCList")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("gint" "p0")
-    '("gint" "p1")
-  )
-)
-
-(define-signal abort-column-resize
-  (of-object "GtkCList")
-  (return-type "void")
-  (when "last")
-)
-
-(define-property user-data
-  (of-object "GtkCList")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property name
-  (of-object "GtkCList")
-  (prop-type "GParamString")
-  (docs "The name of the widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property parent
-  (of-object "GtkCList")
-  (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 "GtkCList")
   (prop-type "GParamInt")
-  (docs "Override for width request of the widget, or -1 if natural request should be used")
+  (docs "Pixels of extra space on the bottom side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property height-request
-  (of-object "GtkCList")
+(define-property margin
+  (of-object "GtkCheckMenuItem")
   (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 "GtkCList")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is visible")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property sensitive
-  (of-object "GtkCList")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget responds to input")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property app-paintable
-  (of-object "GtkCList")
-  (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 "GtkCList")
-  (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 "GtkCList")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget has the input focus")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property is-focus
-  (of-object "GtkCList")
-  (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 "GtkCList")
-  (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 "GtkCList")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is the default widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property receives-default
-  (of-object "GtkCList")
-  (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 "GtkCList")
-  (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 "GtkCList")
-  (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 "GtkCList")
-  (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 "GtkCList")
-  (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 "GtkCList")
-  (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 "GtkCList")
-  (prop-type "GParamBoolean")
-  (docs "Whether this widget has a tooltip")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property tooltip-markup
-  (of-object "GtkCList")
-  (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 "GtkCList")
-  (prop-type "GParamString")
-  (docs "The contents of the tooltip for this widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property window
-  (of-object "GtkCList")
-  (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 "GtkCList")
-  (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
 (define-property border-width
-  (of-object "GtkCList")
+  (of-object "GtkCheckMenuItem")
   (prop-type "GParamUInt")
   (docs "The width of the empty border outside the containers children")
   (readable #t)
@@ -6139,7 +6029,7 @@
 )
 
 (define-property resize-mode
-  (of-object "GtkCList")
+  (of-object "GtkCheckMenuItem")
   (prop-type "GParamEnum")
   (docs "Specify how resize events are handled")
   (readable #t)
@@ -6148,7 +6038,7 @@
 )
 
 (define-property child
-  (of-object "GtkCList")
+  (of-object "GtkCheckMenuItem")
   (prop-type "GParamObject")
   (docs "Can be used to add a new child to the container")
   (readable #f)
@@ -6156,73 +6046,73 @@
   (construct-only #f)
 )
 
-(define-property n-columns
-  (of-object "GtkCList")
-  (prop-type "GParamUInt")
-  (docs "")
+(define-property right-justified
+  (of-object "GtkCheckMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "Sets whether the menu item appears justified at the right side of a menu bar")
   (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
-(define-property shadow-type
-  (of-object "GtkCList")
-  (prop-type "GParamEnum")
-  (docs "")
+(define-property submenu
+  (of-object "GtkCheckMenuItem")
+  (prop-type "GParamObject")
+  (docs "The submenu attached to the menu item, or NULL if it has none")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property selection-mode
-  (of-object "GtkCList")
-  (prop-type "GParamEnum")
-  (docs "")
+(define-property accel-path
+  (of-object "GtkCheckMenuItem")
+  (prop-type "GParamString")
+  (docs "Sets the accelerator path of the menu item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property row-height
-  (of-object "GtkCList")
-  (prop-type "GParamUInt")
-  (docs "")
+(define-property label
+  (of-object "GtkCheckMenuItem")
+  (prop-type "GParamString")
+  (docs "The text for the child label")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property titles-active
-  (of-object "GtkCList")
+(define-property use-underline
+  (of-object "GtkCheckMenuItem")
   (prop-type "GParamBoolean")
-  (docs "")
+  (docs "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property reorderable
-  (of-object "GtkCList")
+(define-property active
+  (of-object "GtkCheckMenuItem")
   (prop-type "GParamBoolean")
-  (docs "")
+  (docs "Whether the menu item is checked")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property use-drag-icons
-  (of-object "GtkCList")
+(define-property inconsistent
+  (of-object "GtkCheckMenuItem")
   (prop-type "GParamBoolean")
-  (docs "")
+  (docs "Whether to display an 'inconsistent' state")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property sort-type
-  (of-object "GtkCList")
-  (prop-type "GParamEnum")
-  (docs "")
+(define-property draw-as-radio
+  (of-object "GtkCheckMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "Whether the menu item looks like a radio menu item")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -6248,15 +6138,6 @@
   )
 )
 
-(define-property user-data
-  (of-object "GtkCellRenderer")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property mode
   (of-object "GtkCellRenderer")
   (prop-type "GParamEnum")
@@ -6415,15 +6296,6 @@
   )
 )
 
-(define-property user-data
-  (of-object "GtkCellRendererAccel")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property mode
   (of-object "GtkCellRendererAccel")
   (prop-type "GParamEnum")
@@ -6589,7 +6461,7 @@
 (define-property single-paragraph-mode
   (of-object "GtkCellRendererAccel")
   (prop-type "GParamBoolean")
-  (docs "Whether or not to keep all text in a single paragraph")
+  (docs "Whether to keep all text in a single paragraph")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -6604,6 +6476,15 @@
   (construct-only #f)
 )
 
+(define-property max-width-chars
+  (of-object "GtkCellRendererAccel")
+  (prop-type "GParamInt")
+  (docs "The maximum width of the cell, in characters")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property wrap-width
   (of-object "GtkCellRendererAccel")
   (prop-type "GParamInt")
@@ -7003,15 +6884,6 @@
   )
 )
 
-(define-property user-data
-  (of-object "GtkCellRendererCombo")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property mode
   (of-object "GtkCellRendererCombo")
   (prop-type "GParamEnum")
@@ -7177,7 +7049,7 @@
 (define-property single-paragraph-mode
   (of-object "GtkCellRendererCombo")
   (prop-type "GParamBoolean")
-  (docs "Whether or not to keep all text in a single paragraph")
+  (docs "Whether to keep all text in a single paragraph")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -7192,6 +7064,15 @@
   (construct-only #f)
 )
 
+(define-property max-width-chars
+  (of-object "GtkCellRendererCombo")
+  (prop-type "GParamInt")
+  (docs "The maximum width of the cell, in characters")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property wrap-width
   (of-object "GtkCellRendererCombo")
   (prop-type "GParamInt")
@@ -7572,10 +7453,10 @@
 
 ;; From GtkCellRendererProgress
 
-(define-property user-data
+(define-property orientation
   (of-object "GtkCellRendererProgress")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamEnum")
+  (docs "The orientation of the orientable")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -7761,10 +7642,10 @@
   (construct-only #f)
 )
 
-(define-property orientation
+(define-property inverted
   (of-object "GtkCellRendererProgress")
-  (prop-type "GParamEnum")
-  (docs "Orientation and growth direction of the progress bar")
+  (prop-type "GParamBoolean")
+  (docs "Invert the direction in which the progress bar grows")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -7782,15 +7663,6 @@
   )
 )
 
-(define-property user-data
-  (of-object "GtkCellRendererText")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property mode
   (of-object "GtkCellRendererText")
   (prop-type "GParamEnum")
@@ -7956,7 +7828,7 @@
 (define-property single-paragraph-mode
   (of-object "GtkCellRendererText")
   (prop-type "GParamBoolean")
-  (docs "Whether or not to keep all text in a single paragraph")
+  (docs "Whether to keep all text in a single paragraph")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -7971,6 +7843,15 @@
   (construct-only #f)
 )
 
+(define-property max-width-chars
+  (of-object "GtkCellRendererText")
+  (prop-type "GParamInt")
+  (docs "The maximum width of the cell, in characters")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property wrap-width
   (of-object "GtkCellRendererText")
   (prop-type "GParamInt")
@@ -8333,15 +8214,6 @@
   )
 )
 
-(define-property user-data
-  (of-object "GtkCellRendererToggle")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property mode
   (of-object "GtkCellRendererToggle")
   (prop-type "GParamEnum")
@@ -8524,15 +8396,6 @@
 
 ;; From GtkCellRendererPixbuf
 
-(define-property user-data
-  (of-object "GtkCellRendererPixbuf")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property mode
   (of-object "GtkCellRendererPixbuf")
   (prop-type "GParamEnum")
@@ -8751,10 +8614,10 @@
 
 ;; From GtkCellRendererProgress
 
-(define-property user-data
+(define-property orientation
   (of-object "GtkCellRendererProgress")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamEnum")
+  (docs "The orientation of the orientable")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -8940,10 +8803,10 @@
   (construct-only #f)
 )
 
-(define-property orientation
+(define-property inverted
   (of-object "GtkCellRendererProgress")
-  (prop-type "GParamEnum")
-  (docs "Orientation and growth direction of the progress bar")
+  (prop-type "GParamBoolean")
+  (docs "Invert the direction in which the progress bar grows")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -8951,15 +8814,6 @@
 
 ;; From GtkCellRendererSpin
 
-(define-property user-data
-  (of-object "GtkCellRendererSpin")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property mode
   (of-object "GtkCellRendererSpin")
   (prop-type "GParamEnum")
@@ -9125,7 +8979,7 @@
 (define-property single-paragraph-mode
   (of-object "GtkCellRendererSpin")
   (prop-type "GParamBoolean")
-  (docs "Whether or not to keep all text in a single paragraph")
+  (docs "Whether to keep all text in a single paragraph")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -9140,6 +8994,15 @@
   (construct-only #f)
 )
 
+(define-property max-width-chars
+  (of-object "GtkCellRendererSpin")
+  (prop-type "GParamInt")
+  (docs "The maximum width of the cell, in characters")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property wrap-width
   (of-object "GtkCellRendererSpin")
   (prop-type "GParamInt")
@@ -9494,7 +9357,7 @@
 (define-property adjustment
   (of-object "GtkCellRendererSpin")
   (prop-type "GParamObject")
-  (docs "The adjustment that holds the value of the spinbutton.")
+  (docs "The adjustment that holds the value of the spin button")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -9520,15 +9383,6 @@
 
 ;; From GtkCellRendererSpinner
 
-(define-property user-data
-  (of-object "GtkCellRendererSpinner")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property mode
   (of-object "GtkCellRendererSpinner")
   (prop-type "GParamEnum")
@@ -9710,15 +9564,6 @@
   (when "first")
 )
 
-(define-property use-action-appearance
-  (of-object "GtkColorButton")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the related actions appearance properties")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property related-action
   (of-object "GtkColorButton")
   (prop-type "GParamObject")
@@ -9728,10 +9573,10 @@
   (construct-only #f)
 )
 
-(define-property user-data
+(define-property use-action-appearance
   (of-object "GtkColorButton")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -9938,7 +9783,70 @@
 (define-property double-buffered
   (of-object "GtkColorButton")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkColorButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkColorButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkColorButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkColorButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkColorButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkColorButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkColorButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -10055,7 +9963,7 @@
 (define-property use-alpha
   (of-object "GtkColorButton")
   (prop-type "GParamBoolean")
-  (docs "Whether or not to give the color an alpha value")
+  (docs "Whether to give the color an alpha value")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -10105,15 +10013,6 @@
   (construct-only #f)
 )
 
-(define-property user-data
-  (of-object "GtkColorSelection")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkColorSelection")
   (prop-type "GParamString")
@@ -10315,322 +10214,77 @@
 (define-property double-buffered
   (of-object "GtkColorSelection")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property border-width
+(define-property halign
   (of-object "GtkColorSelection")
-  (prop-type "GParamUInt")
-  (docs "The width of the empty border outside the containers children")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property resize-mode
+(define-property valign
   (of-object "GtkColorSelection")
   (prop-type "GParamEnum")
-  (docs "Specify how resize events are handled")
+  (docs "How to position in extra vertical space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property child
-  (of-object "GtkColorSelection")
-  (prop-type "GParamObject")
-  (docs "Can be used to add a new child to the container")
-  (readable #f)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property spacing
+(define-property margin-left
   (of-object "GtkColorSelection")
   (prop-type "GParamInt")
-  (docs "The amount of space between children")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property homogeneous
-  (of-object "GtkColorSelection")
-  (prop-type "GParamBoolean")
-  (docs "Whether the children should all be the same size")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property has-palette
-  (of-object "GtkColorSelection")
-  (prop-type "GParamBoolean")
-  (docs "Whether a palette should be used")
+  (docs "Pixels of extra space on the left side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property has-opacity-control
+(define-property margin-right
   (of-object "GtkColorSelection")
-  (prop-type "GParamBoolean")
-  (docs "Whether the color selector should allow setting opacity")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property current-color
+(define-property margin-top
   (of-object "GtkColorSelection")
-  (prop-type "GParamBoxed")
-  (docs "The current color")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property current-alpha
+(define-property margin-bottom
   (of-object "GtkColorSelection")
-  (prop-type "GParamUInt")
-  (docs "The current opacity value (0 fully transparent, 65535 fully opaque)")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-;; From GtkCombo
-
-(define-property orientation
-  (of-object "GtkCombo")
-  (prop-type "GParamEnum")
-  (docs "The orientation of the orientable")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property user-data
-  (of-object "GtkCombo")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property name
-  (of-object "GtkCombo")
-  (prop-type "GParamString")
-  (docs "The name of the widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property parent
-  (of-object "GtkCombo")
-  (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 "GtkCombo")
   (prop-type "GParamInt")
-  (docs "Override for width request of the widget, or -1 if natural request should be used")
+  (docs "Pixels of extra space on the bottom side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property height-request
-  (of-object "GtkCombo")
+(define-property margin
+  (of-object "GtkColorSelection")
   (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 "GtkCombo")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is visible")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property sensitive
-  (of-object "GtkCombo")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget responds to input")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property app-paintable
-  (of-object "GtkCombo")
-  (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 "GtkCombo")
-  (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 "GtkCombo")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget has the input focus")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property is-focus
-  (of-object "GtkCombo")
-  (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 "GtkCombo")
-  (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 "GtkCombo")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is the default widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property receives-default
-  (of-object "GtkCombo")
-  (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 "GtkCombo")
-  (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 "GtkCombo")
-  (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 "GtkCombo")
-  (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 "GtkCombo")
-  (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 "GtkCombo")
-  (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 "GtkCombo")
-  (prop-type "GParamBoolean")
-  (docs "Whether this widget has a tooltip")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property tooltip-markup
-  (of-object "GtkCombo")
-  (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 "GtkCombo")
-  (prop-type "GParamString")
-  (docs "The contents of the tooltip for this widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property window
-  (of-object "GtkCombo")
-  (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 "GtkCombo")
-  (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
 (define-property border-width
-  (of-object "GtkCombo")
+  (of-object "GtkColorSelection")
   (prop-type "GParamUInt")
   (docs "The width of the empty border outside the containers children")
   (readable #t)
@@ -10639,7 +10293,7 @@
 )
 
 (define-property resize-mode
-  (of-object "GtkCombo")
+  (of-object "GtkColorSelection")
   (prop-type "GParamEnum")
   (docs "Specify how resize events are handled")
   (readable #t)
@@ -10648,7 +10302,7 @@
 )
 
 (define-property child
-  (of-object "GtkCombo")
+  (of-object "GtkColorSelection")
   (prop-type "GParamObject")
   (docs "Can be used to add a new child to the container")
   (readable #f)
@@ -10657,7 +10311,7 @@
 )
 
 (define-property spacing
-  (of-object "GtkCombo")
+  (of-object "GtkColorSelection")
   (prop-type "GParamInt")
   (docs "The amount of space between children")
   (readable #t)
@@ -10666,7 +10320,7 @@
 )
 
 (define-property homogeneous
-  (of-object "GtkCombo")
+  (of-object "GtkColorSelection")
   (prop-type "GParamBoolean")
   (docs "Whether the children should all be the same size")
   (readable #t)
@@ -10674,46 +10328,37 @@
   (construct-only #f)
 )
 
-(define-property enable-arrow-keys
-  (of-object "GtkCombo")
-  (prop-type "GParamBoolean")
-  (docs "Whether the arrow keys move through the list of items")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property enable-arrows-always
-  (of-object "GtkCombo")
+(define-property has-palette
+  (of-object "GtkColorSelection")
   (prop-type "GParamBoolean")
-  (docs "Obsolete property, ignored")
+  (docs "Whether a palette should be used")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property case-sensitive
-  (of-object "GtkCombo")
+(define-property has-opacity-control
+  (of-object "GtkColorSelection")
   (prop-type "GParamBoolean")
-  (docs "Whether list item matching is case sensitive")
+  (docs "Whether the color selector should allow setting opacity")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property allow-empty
-  (of-object "GtkCombo")
-  (prop-type "GParamBoolean")
-  (docs "Whether an empty value may be entered in this field")
+(define-property current-color
+  (of-object "GtkColorSelection")
+  (prop-type "GParamBoxed")
+  (docs "The current color")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property value-in-list
-  (of-object "GtkCombo")
-  (prop-type "GParamBoolean")
-  (docs "Whether entered values must already be present in the list")
+(define-property current-alpha
+  (of-object "GtkColorSelection")
+  (prop-type "GParamUInt")
+  (docs "The current opacity value (0 fully transparent, 65535 fully opaque)")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -10748,10 +10393,10 @@
   )
 )
 
-(define-property user-data
+(define-property editing-canceled
   (of-object "GtkComboBox")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Indicates that editing has been canceled")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -10958,7 +10603,70 @@
 (define-property double-buffered
   (of-object "GtkComboBox")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkComboBox")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkComboBox")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkComboBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkComboBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkComboBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkComboBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkComboBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -11125,15 +10833,6 @@
   )
 )
 
-(define-property user-data
-  (of-object "GtkContainer")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkContainer")
   (prop-type "GParamString")
@@ -11335,317 +11034,77 @@
 (define-property double-buffered
   (of-object "GtkContainer")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property border-width
+(define-property halign
   (of-object "GtkContainer")
-  (prop-type "GParamUInt")
-  (docs "The width of the empty border outside the containers children")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property resize-mode
+(define-property valign
   (of-object "GtkContainer")
   (prop-type "GParamEnum")
-  (docs "Specify how resize events are handled")
+  (docs "How to position in extra vertical space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property child
+(define-property margin-left
   (of-object "GtkContainer")
-  (prop-type "GParamObject")
-  (docs "Can be used to add a new child to the container")
-  (readable #f)
-  (writable #t)
-  (construct-only #f)
-)
-
-;; From GtkCTree
-
-(define-signal tree-select-row
-  (of-object "GtkCTree")
-  (return-type "void")
-  (when "first")
-  (parameters
-    '("GtkCTreeNode" "p0")
-    '("gint" "p1")
-  )
-)
-
-(define-signal tree-unselect-row
-  (of-object "GtkCTree")
-  (return-type "void")
-  (when "first")
-  (parameters
-    '("GtkCTreeNode" "p0")
-    '("gint" "p1")
-  )
-)
-
-(define-signal tree-expand
-  (of-object "GtkCTree")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GtkCTreeNode" "p0")
-  )
-)
-
-(define-signal tree-collapse
-  (of-object "GtkCTree")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GtkCTreeNode" "p0")
-  )
-)
-
-(define-signal tree-move
-  (of-object "GtkCTree")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GtkCTreeNode" "p0")
-    '("GtkCTreeNode" "p1")
-    '("GtkCTreeNode" "p2")
-  )
-)
-
-(define-signal change-focus-row-expansion
-  (of-object "GtkCTree")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GtkCTreeExpansionType" "p0")
-  )
-)
-
-(define-property user-data
-  (of-object "GtkCTree")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property name
-  (of-object "GtkCTree")
-  (prop-type "GParamString")
-  (docs "The name of the widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property parent
-  (of-object "GtkCTree")
-  (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 "GtkCTree")
   (prop-type "GParamInt")
-  (docs "Override for width request of the widget, or -1 if natural request should be used")
+  (docs "Pixels of extra space on the left side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property height-request
-  (of-object "GtkCTree")
+(define-property margin-right
+  (of-object "GtkContainer")
   (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 "GtkCTree")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is visible")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property sensitive
-  (of-object "GtkCTree")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget responds to input")
+  (docs "Pixels of extra space on the right side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property app-paintable
-  (of-object "GtkCTree")
-  (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 "GtkCTree")
-  (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 "GtkCTree")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget has the input focus")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property is-focus
-  (of-object "GtkCTree")
-  (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 "GtkCTree")
-  (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 "GtkCTree")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is the default widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property receives-default
-  (of-object "GtkCTree")
-  (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 "GtkCTree")
-  (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 "GtkCTree")
-  (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 "GtkCTree")
-  (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 "GtkCTree")
-  (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 "GtkCTree")
-  (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 "GtkCTree")
-  (prop-type "GParamBoolean")
-  (docs "Whether this widget has a tooltip")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property tooltip-markup
-  (of-object "GtkCTree")
-  (prop-type "GParamString")
-  (docs "The contents of the tooltip for this widget")
+(define-property margin-top
+  (of-object "GtkContainer")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tooltip-text
-  (of-object "GtkCTree")
-  (prop-type "GParamString")
-  (docs "The contents of the tooltip for this widget")
+(define-property margin-bottom
+  (of-object "GtkContainer")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property window
-  (of-object "GtkCTree")
-  (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 "GtkCTree")
-  (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+(define-property margin
+  (of-object "GtkContainer")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
 (define-property border-width
-  (of-object "GtkCTree")
+  (of-object "GtkContainer")
   (prop-type "GParamUInt")
   (docs "The width of the empty border outside the containers children")
   (readable #t)
@@ -11654,7 +11113,7 @@
 )
 
 (define-property resize-mode
-  (of-object "GtkCTree")
+  (of-object "GtkContainer")
   (prop-type "GParamEnum")
   (docs "Specify how resize events are handled")
   (readable #t)
@@ -11663,7 +11122,7 @@
 )
 
 (define-property child
-  (of-object "GtkCTree")
+  (of-object "GtkContainer")
   (prop-type "GParamObject")
   (docs "Can be used to add a new child to the container")
   (readable #f)
@@ -11671,143 +11130,8 @@
   (construct-only #f)
 )
 
-(define-property shadow-type
-  (of-object "GtkCTree")
-  (prop-type "GParamEnum")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property selection-mode
-  (of-object "GtkCTree")
-  (prop-type "GParamEnum")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property row-height
-  (of-object "GtkCTree")
-  (prop-type "GParamUInt")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property titles-active
-  (of-object "GtkCTree")
-  (prop-type "GParamBoolean")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property reorderable
-  (of-object "GtkCTree")
-  (prop-type "GParamBoolean")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property use-drag-icons
-  (of-object "GtkCTree")
-  (prop-type "GParamBoolean")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property sort-type
-  (of-object "GtkCTree")
-  (prop-type "GParamEnum")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property n-columns
-  (of-object "GtkCTree")
-  (prop-type "GParamUInt")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
-)
-
-(define-property tree-column
-  (of-object "GtkCTree")
-  (prop-type "GParamUInt")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
-)
-
-(define-property indent
-  (of-object "GtkCTree")
-  (prop-type "GParamUInt")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property spacing
-  (of-object "GtkCTree")
-  (prop-type "GParamUInt")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property show-stub
-  (of-object "GtkCTree")
-  (prop-type "GParamBoolean")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property line-style
-  (of-object "GtkCTree")
-  (prop-type "GParamEnum")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property expander-style
-  (of-object "GtkCTree")
-  (prop-type "GParamEnum")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 ;; From GtkCellView
 
-(define-property user-data
-  (of-object "GtkCellView")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkCellView")
   (prop-type "GParamString")
@@ -12009,312 +11333,106 @@
 (define-property double-buffered
   (of-object "GtkCellView")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property background
-  (of-object "GtkCellView")
-  (prop-type "GParamString")
-  (docs "Background color as a string")
-  (readable #f)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property background-gdk
+(define-property halign
   (of-object "GtkCellView")
-  (prop-type "GParamBoxed")
-  (docs "Background color as a GdkColor")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property background-set
+(define-property valign
   (of-object "GtkCellView")
-  (prop-type "GParamBoolean")
-  (docs "Whether this tag affects the background color")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property model
+(define-property margin-left
   (of-object "GtkCellView")
-  (prop-type "GParamObject")
-  (docs "The model for cell view")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-;; From GtkCurve
-
-(define-signal curve-type-changed
-  (of-object "GtkCurve")
-  (return-type "void")
-  (when "first")
-)
-
-(define-property user-data
-  (of-object "GtkCurve")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property name
-  (of-object "GtkCurve")
-  (prop-type "GParamString")
-  (docs "The name of the widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property parent
-  (of-object "GtkCurve")
-  (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 "GtkCurve")
   (prop-type "GParamInt")
-  (docs "Override for width request of the widget, or -1 if natural request should be used")
+  (docs "Pixels of extra space on the left side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property height-request
-  (of-object "GtkCurve")
+(define-property margin-right
+  (of-object "GtkCellView")
   (prop-type "GParamInt")
-  (docs "Override for height request of the widget, or -1 if natural request should be used")
+  (docs "Pixels of extra space on the right side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property visible
-  (of-object "GtkCurve")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is visible")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property sensitive
-  (of-object "GtkCurve")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget responds to input")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property app-paintable
-  (of-object "GtkCurve")
-  (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 "GtkCurve")
-  (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 "GtkCurve")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget has the input focus")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property is-focus
-  (of-object "GtkCurve")
-  (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 "GtkCurve")
-  (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 "GtkCurve")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is the default widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property receives-default
-  (of-object "GtkCurve")
-  (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 "GtkCurve")
-  (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 "GtkCurve")
-  (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 "GtkCurve")
-  (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 "GtkCurve")
-  (prop-type "GParamEnum")
-  (docs "The mask that decides what kind of extension events this widget gets")
+(define-property margin-top
+  (of-object "GtkCellView")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property no-show-all
-  (of-object "GtkCurve")
-  (prop-type "GParamBoolean")
-  (docs "Whether gtk_widget_show_all() should not affect this widget")
+(define-property margin-bottom
+  (of-object "GtkCellView")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property has-tooltip
-  (of-object "GtkCurve")
-  (prop-type "GParamBoolean")
-  (docs "Whether this widget has a tooltip")
+(define-property margin
+  (of-object "GtkCellView")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tooltip-markup
-  (of-object "GtkCurve")
+(define-property background
+  (of-object "GtkCellView")
   (prop-type "GParamString")
-  (docs "The contents of the tooltip for this widget")
-  (readable #t)
+  (docs "Background color as a string")
+  (readable #f)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tooltip-text
-  (of-object "GtkCurve")
-  (prop-type "GParamString")
-  (docs "The contents of the tooltip for this widget")
+(define-property background-gdk
+  (of-object "GtkCellView")
+  (prop-type "GParamBoxed")
+  (docs "Background color as a GdkColor")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property window
-  (of-object "GtkCurve")
-  (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 "GtkCurve")
+(define-property background-set
+  (of-object "GtkCellView")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property curve-type
-  (of-object "GtkCurve")
-  (prop-type "GParamEnum")
-  (docs "Is this curve linear, spline interpolated, or free-form")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property min-x
-  (of-object "GtkCurve")
-  (prop-type "GParamFloat")
-  (docs "Minimum possible value for X")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property max-x
-  (of-object "GtkCurve")
-  (prop-type "GParamFloat")
-  (docs "Maximum possible X value")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property min-y
-  (of-object "GtkCurve")
-  (prop-type "GParamFloat")
-  (docs "Minimum possible value for Y")
+  (docs "Whether this tag affects the background color")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property max-y
-  (of-object "GtkCurve")
-  (prop-type "GParamFloat")
-  (docs "Maximum possible value for Y")
+(define-property model
+  (of-object "GtkCellView")
+  (prop-type "GParamObject")
+  (docs "The model for cell view")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -12337,15 +11455,6 @@
   (when "last")
 )
 
-(define-property user-data
-  (of-object "GtkDialog")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkDialog")
   (prop-type "GParamString")
@@ -12547,7 +11656,70 @@
 (define-property double-buffered
   (of-object "GtkDialog")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkDialog")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkDialog")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -12607,24 +11779,6 @@
   (construct-only #f)
 )
 
-(define-property allow-shrink
-  (of-object "GtkDialog")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property allow-grow
-  (of-object "GtkDialog")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, users can expand the window beyond its minimum size")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property resizable
   (of-object "GtkDialog")
   (prop-type "GParamBoolean")
@@ -12832,10 +11986,10 @@
   (construct-only #f)
 )
 
-(define-property has-separator
+(define-property mnemonics-visible
   (of-object "GtkDialog")
   (prop-type "GParamBoolean")
-  (docs "The dialog has a separator bar above its buttons")
+  (docs "Whether mnemonics are currently visible in this window")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -12843,15 +11997,6 @@
 
 ;; From GtkDrawingArea
 
-(define-property user-data
-  (of-object "GtkDrawingArea")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkDrawingArea")
   (prop-type "GParamString")
@@ -13053,7 +12198,70 @@
 (define-property double-buffered
   (of-object "GtkDrawingArea")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkDrawingArea")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkDrawingArea")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkDrawingArea")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkDrawingArea")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkDrawingArea")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkDrawingArea")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkDrawingArea")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -13165,6 +12373,15 @@
   )
 )
 
+(define-signal preedit-changed
+  (of-object "GtkEntry")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("const-gchar*" "p0")
+  )
+)
+
 (define-signal icon-press
   (of-object "GtkEntry")
   (return-type "void")
@@ -13185,10 +12402,10 @@
   )
 )
 
-(define-property user-data
+(define-property editing-canceled
   (of-object "GtkEntry")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Indicates that editing has been canceled")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -13395,7 +12612,70 @@
 (define-property double-buffered
   (of-object "GtkEntry")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkEntry")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkEntry")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkEntry")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkEntry")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkEntry")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkEntry")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkEntry")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -13566,7 +12846,7 @@
 (define-property invisible-char-set
   (of-object "GtkEntry")
   (prop-type "GParamBoolean")
-  (docs "Whether the invisible char has been set")
+  (docs "Whether the invisible character has been set")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -13882,17 +13162,58 @@
   (construct-only #f)
 )
 
-;; From GtkEventBox
+;; From GtkEntryBuffer
 
-(define-property user-data
-  (of-object "GtkEventBox")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+(define-signal inserted-text
+  (of-object "GtkEntryBuffer")
+  (return-type "void")
+  (when "first")
+  (parameters
+    '("guint" "p0")
+    '("const-gchar*" "p1")
+    '("guint" "p2")
+  )
+)
+
+(define-signal deleted-text
+  (of-object "GtkEntryBuffer")
+  (return-type "void")
+  (when "first")
+  (parameters
+    '("guint" "p0")
+    '("guint" "p1")
+  )
+)
+
+(define-property text
+  (of-object "GtkEntryBuffer")
+  (prop-type "GParamString")
+  (docs "The contents of the buffer")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property length
+  (of-object "GtkEntryBuffer")
+  (prop-type "GParamUInt")
+  (docs "Length of the text currently in the buffer")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property max-length
+  (of-object "GtkEntryBuffer")
+  (prop-type "GParamInt")
+  (docs "Maximum number of characters for this entry. Zero if no maximum")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
+;; From GtkEventBox
+
 (define-property name
   (of-object "GtkEventBox")
   (prop-type "GParamString")
@@ -14094,7 +13415,70 @@
 (define-property double-buffered
   (of-object "GtkEventBox")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkEventBox")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkEventBox")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkEventBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkEventBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkEventBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkEventBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkEventBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -14153,15 +13537,6 @@
   (when "last")
 )
 
-(define-property user-data
-  (of-object "GtkExpander")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkExpander")
   (prop-type "GParamString")
@@ -14363,7 +13738,70 @@
 (define-property double-buffered
   (of-object "GtkExpander")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkExpander")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkExpander")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkExpander")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkExpander")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkExpander")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkExpander")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkExpander")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -14450,63 +13888,87 @@
   (construct-only #f)
 )
 
-;; From GtkFileFilter
-
-(define-property user-data
-  (of-object "GtkFileFilter")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+(define-property label-fill
+  (of-object "GtkExpander")
+  (prop-type "GParamBoolean")
+  (docs "Whether the label widget should fill all available horizontal space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-;; From GtkFileChooserButton
+;; From GtkFileFilter
 
-(define-signal file-set
-  (of-object "GtkFileChooserButton")
+;; From GtkFileChooser
+
+(define-signal selection-changed
+  (of-object "GtkFileChooser")
   (return-type "void")
-  (when "first")
+  (when "last")
 )
 
-(define-property orientation
-  (of-object "GtkFileChooserButton")
+(define-signal current-folder-changed
+  (of-object "GtkFileChooser")
+  (return-type "void")
+  (when "last")
+)
+
+(define-signal update-preview
+  (of-object "GtkFileChooser")
+  (return-type "void")
+  (when "last")
+)
+
+(define-signal file-activated
+  (of-object "GtkFileChooser")
+  (return-type "void")
+  (when "last")
+)
+
+(define-signal confirm-overwrite
+  (of-object "GtkFileChooser")
+  (return-type "GtkFileChooserConfirmation")
+  (when "last")
+)
+
+(define-property action
+  (of-object "GtkFileChooser")
   (prop-type "GParamEnum")
-  (docs "The orientation of the orientable")
+  (docs "The type of operation that the file selector is performing")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property file-system-backend
-  (of-object "GtkFileChooserButton")
-  (prop-type "GParamString")
-  (docs "Name of file system backend to use")
-  (readable #f)
+(define-property create-folders
+  (of-object "GtkFileChooser")
+  (prop-type "GParamBoolean")
+  (docs "Whether a file chooser not in open mode will offer the user to create new folders.")
+  (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
-(define-property action
-  (of-object "GtkFileChooserButton")
-  (prop-type "GParamEnum")
-  (docs "The type of operation that the file selector is performing")
+(define-property do-overwrite-confirmation
+  (of-object "GtkFileChooser")
+  (prop-type "GParamBoolean")
+  (docs "Whether a file chooser in save mode will present an overwrite confirmation dialog if necessary.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property preview-widget
-  (of-object "GtkFileChooserButton")
+(define-property extra-widget
+  (of-object "GtkFileChooser")
   (prop-type "GParamObject")
-  (docs "Application supplied widget for custom previews.")
+  (docs "Application supplied widget for extra options.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
 (define-property filter
-  (of-object "GtkFileChooserButton")
+  (of-object "GtkFileChooser")
   (prop-type "GParamObject")
   (docs "The current filter for selecting which files are displayed")
   (readable #t)
@@ -14515,7 +13977,7 @@
 )
 
 (define-property local-only
-  (of-object "GtkFileChooserButton")
+  (of-object "GtkFileChooser")
   (prop-type "GParamBoolean")
   (docs "Whether the selected file(s) should be limited to local file: URLs")
   (readable #t)
@@ -14523,6 +13985,68 @@
   (construct-only #f)
 )
 
+(define-property preview-widget
+  (of-object "GtkFileChooser")
+  (prop-type "GParamObject")
+  (docs "Application supplied widget for custom previews.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property preview-widget-active
+  (of-object "GtkFileChooser")
+  (prop-type "GParamBoolean")
+  (docs "Whether the application supplied widget for custom previews should be shown.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property select-multiple
+  (of-object "GtkFileChooser")
+  (prop-type "GParamBoolean")
+  (docs "Whether to allow multiple files to be selected")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property show-hidden
+  (of-object "GtkFileChooser")
+  (prop-type "GParamBoolean")
+  (docs "Whether the hidden files and folders should be displayed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property use-preview-label
+  (of-object "GtkFileChooser")
+  (prop-type "GParamBoolean")
+  (docs "Whether to display a stock label with the name of the previewed file.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GtkFileChooserButton
+
+(define-signal file-set
+  (of-object "GtkFileChooserButton")
+  (return-type "void")
+  (when "first")
+)
+
+(define-property action
+  (of-object "GtkFileChooserButton")
+  (prop-type "GParamEnum")
+  (docs "The type of operation that the file selector is performing")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property create-folders
   (of-object "GtkFileChooserButton")
   (prop-type "GParamBoolean")
@@ -14532,6 +14056,15 @@
   (construct-only #f)
 )
 
+(define-property do-overwrite-confirmation
+  (of-object "GtkFileChooserButton")
+  (prop-type "GParamBoolean")
+  (docs "Whether a file chooser in save mode will present an overwrite confirmation dialog if necessary.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property extra-widget
   (of-object "GtkFileChooserButton")
   (prop-type "GParamObject")
@@ -14541,28 +14074,37 @@
   (construct-only #f)
 )
 
-(define-property select-multiple
+(define-property filter
   (of-object "GtkFileChooserButton")
-  (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple files to be selected")
+  (prop-type "GParamObject")
+  (docs "The current filter for selecting which files are displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-hidden
+(define-property local-only
   (of-object "GtkFileChooserButton")
   (prop-type "GParamBoolean")
-  (docs "Whether the hidden files and folders should be displayed")
+  (docs "Whether the selected file(s) should be limited to local file: URLs")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property use-preview-label
+(define-property orientation
   (of-object "GtkFileChooserButton")
-  (prop-type "GParamBoolean")
-  (docs "Whether to display a stock label with the name of the previewed file.")
+  (prop-type "GParamEnum")
+  (docs "The orientation of the orientable")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property preview-widget
+  (of-object "GtkFileChooserButton")
+  (prop-type "GParamObject")
+  (docs "Application supplied widget for custom previews.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -14577,19 +14119,28 @@
   (construct-only #f)
 )
 
-(define-property do-overwrite-confirmation
+(define-property select-multiple
   (of-object "GtkFileChooserButton")
   (prop-type "GParamBoolean")
-  (docs "Whether a file chooser in save mode will present an overwrite confirmation dialog if necessary.")
+  (docs "Whether to allow multiple files to be selected")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property user-data
+(define-property show-hidden
   (of-object "GtkFileChooserButton")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Whether the hidden files and folders should be displayed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property use-preview-label
+  (of-object "GtkFileChooserButton")
+  (prop-type "GParamBoolean")
+  (docs "Whether to display a stock label with the name of the previewed file.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -14796,7 +14347,70 @@
 (define-property double-buffered
   (of-object "GtkFileChooserButton")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkFileChooserButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkFileChooserButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkFileChooserButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkFileChooserButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkFileChooserButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkFileChooserButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkFileChooserButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -14885,15 +14499,6 @@
 
 ;; From GtkFileChooserDialog
 
-(define-property file-system-backend
-  (of-object "GtkFileChooserDialog")
-  (prop-type "GParamString")
-  (docs "Name of file system backend to use")
-  (readable #f)
-  (writable #t)
-  (construct-only #t)
-)
-
 (define-property action
   (of-object "GtkFileChooserDialog")
   (prop-type "GParamEnum")
@@ -14903,100 +14508,91 @@
   (construct-only #f)
 )
 
-(define-property preview-widget
-  (of-object "GtkFileChooserDialog")
-  (prop-type "GParamObject")
-  (docs "Application supplied widget for custom previews.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property filter
+(define-property create-folders
   (of-object "GtkFileChooserDialog")
-  (prop-type "GParamObject")
-  (docs "The current filter for selecting which files are displayed")
+  (prop-type "GParamBoolean")
+  (docs "Whether a file chooser not in open mode will offer the user to create new folders.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property local-only
+(define-property do-overwrite-confirmation
   (of-object "GtkFileChooserDialog")
   (prop-type "GParamBoolean")
-  (docs "Whether the selected file(s) should be limited to local file: URLs")
+  (docs "Whether a file chooser in save mode will present an overwrite confirmation dialog if necessary.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property create-folders
+(define-property extra-widget
   (of-object "GtkFileChooserDialog")
-  (prop-type "GParamBoolean")
-  (docs "Whether a file chooser not in open mode will offer the user to create new folders.")
+  (prop-type "GParamObject")
+  (docs "Application supplied widget for extra options.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property extra-widget
+(define-property filter
   (of-object "GtkFileChooserDialog")
   (prop-type "GParamObject")
-  (docs "Application supplied widget for extra options.")
+  (docs "The current filter for selecting which files are displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property select-multiple
+(define-property local-only
   (of-object "GtkFileChooserDialog")
   (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple files to be selected")
+  (docs "Whether the selected file(s) should be limited to local file: URLs")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-hidden
+(define-property preview-widget
   (of-object "GtkFileChooserDialog")
-  (prop-type "GParamBoolean")
-  (docs "Whether the hidden files and folders should be displayed")
+  (prop-type "GParamObject")
+  (docs "Application supplied widget for custom previews.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property use-preview-label
+(define-property preview-widget-active
   (of-object "GtkFileChooserDialog")
   (prop-type "GParamBoolean")
-  (docs "Whether to display a stock label with the name of the previewed file.")
+  (docs "Whether the application supplied widget for custom previews should be shown.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property preview-widget-active
+(define-property select-multiple
   (of-object "GtkFileChooserDialog")
   (prop-type "GParamBoolean")
-  (docs "Whether the application supplied widget for custom previews should be shown.")
+  (docs "Whether to allow multiple files to be selected")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property do-overwrite-confirmation
+(define-property show-hidden
   (of-object "GtkFileChooserDialog")
   (prop-type "GParamBoolean")
-  (docs "Whether a file chooser in save mode will present an overwrite confirmation dialog if necessary.")
+  (docs "Whether the hidden files and folders should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property user-data
+(define-property use-preview-label
   (of-object "GtkFileChooserDialog")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Whether to display a stock label with the name of the previewed file.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -15203,7 +14799,70 @@
 (define-property double-buffered
   (of-object "GtkFileChooserDialog")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkFileChooserDialog")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkFileChooserDialog")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkFileChooserDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkFileChooserDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkFileChooserDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkFileChooserDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkFileChooserDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -15263,24 +14922,6 @@
   (construct-only #f)
 )
 
-(define-property allow-shrink
-  (of-object "GtkFileChooserDialog")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property allow-grow
-  (of-object "GtkFileChooserDialog")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, users can expand the window beyond its minimum size")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property resizable
   (of-object "GtkFileChooserDialog")
   (prop-type "GParamBoolean")
@@ -15488,10 +15129,10 @@
   (construct-only #f)
 )
 
-(define-property has-separator
+(define-property mnemonics-visible
   (of-object "GtkFileChooserDialog")
   (prop-type "GParamBoolean")
-  (docs "The dialog has a separator bar above its buttons")
+  (docs "Whether mnemonics are currently visible in this window")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -15499,37 +15140,37 @@
 
 ;; From GtkFileChooserWidget
 
-(define-property orientation
+(define-property action
   (of-object "GtkFileChooserWidget")
   (prop-type "GParamEnum")
-  (docs "The orientation of the orientable")
+  (docs "The type of operation that the file selector is performing")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property file-system-backend
+(define-property create-folders
   (of-object "GtkFileChooserWidget")
-  (prop-type "GParamString")
-  (docs "Name of file system backend to use")
-  (readable #f)
+  (prop-type "GParamBoolean")
+  (docs "Whether a file chooser not in open mode will offer the user to create new folders.")
+  (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
-(define-property action
+(define-property do-overwrite-confirmation
   (of-object "GtkFileChooserWidget")
-  (prop-type "GParamEnum")
-  (docs "The type of operation that the file selector is performing")
+  (prop-type "GParamBoolean")
+  (docs "Whether a file chooser in save mode will present an overwrite confirmation dialog if necessary.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property preview-widget
+(define-property extra-widget
   (of-object "GtkFileChooserWidget")
   (prop-type "GParamObject")
-  (docs "Application supplied widget for custom previews.")
+  (docs "Application supplied widget for extra options.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -15553,73 +15194,55 @@
   (construct-only #f)
 )
 
-(define-property create-folders
+(define-property orientation
   (of-object "GtkFileChooserWidget")
-  (prop-type "GParamBoolean")
-  (docs "Whether a file chooser not in open mode will offer the user to create new folders.")
+  (prop-type "GParamEnum")
+  (docs "The orientation of the orientable")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property extra-widget
+(define-property preview-widget
   (of-object "GtkFileChooserWidget")
   (prop-type "GParamObject")
-  (docs "Application supplied widget for extra options.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property select-multiple
-  (of-object "GtkFileChooserWidget")
-  (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple files to be selected")
+  (docs "Application supplied widget for custom previews.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-hidden
+(define-property preview-widget-active
   (of-object "GtkFileChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether the hidden files and folders should be displayed")
+  (docs "Whether the application supplied widget for custom previews should be shown.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property use-preview-label
+(define-property select-multiple
   (of-object "GtkFileChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether to display a stock label with the name of the previewed file.")
+  (docs "Whether to allow multiple files to be selected")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property preview-widget-active
+(define-property show-hidden
   (of-object "GtkFileChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether the application supplied widget for custom previews should be shown.")
+  (docs "Whether the hidden files and folders should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property do-overwrite-confirmation
+(define-property use-preview-label
   (of-object "GtkFileChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether a file chooser in save mode will present an overwrite confirmation dialog if necessary.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property user-data
-  (of-object "GtkFileChooserWidget")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (docs "Whether to display a stock label with the name of the previewed file.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -15826,277 +15449,77 @@
 (define-property double-buffered
   (of-object "GtkFileChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property border-width
+(define-property halign
   (of-object "GtkFileChooserWidget")
-  (prop-type "GParamUInt")
-  (docs "The width of the empty border outside the containers children")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property resize-mode
+(define-property valign
   (of-object "GtkFileChooserWidget")
   (prop-type "GParamEnum")
-  (docs "Specify how resize events are handled")
+  (docs "How to position in extra vertical space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property child
-  (of-object "GtkFileChooserWidget")
-  (prop-type "GParamObject")
-  (docs "Can be used to add a new child to the container")
-  (readable #f)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property spacing
+(define-property margin-left
   (of-object "GtkFileChooserWidget")
   (prop-type "GParamInt")
-  (docs "The amount of space between children")
+  (docs "Pixels of extra space on the left side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property homogeneous
+(define-property margin-right
   (of-object "GtkFileChooserWidget")
-  (prop-type "GParamBoolean")
-  (docs "Whether the children should all be the same size")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-;; From GtkFileSelection
-
-(define-property user-data
-  (of-object "GtkFileSelection")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property name
-  (of-object "GtkFileSelection")
-  (prop-type "GParamString")
-  (docs "The name of the widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property parent
-  (of-object "GtkFileSelection")
-  (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 "GtkFileSelection")
   (prop-type "GParamInt")
-  (docs "Override for width request of the widget, or -1 if natural request should be used")
+  (docs "Pixels of extra space on the right side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property height-request
-  (of-object "GtkFileSelection")
+(define-property margin-top
+  (of-object "GtkFileChooserWidget")
   (prop-type "GParamInt")
-  (docs "Override for height request of the widget, or -1 if natural request should be used")
+  (docs "Pixels of extra space on the top side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property visible
-  (of-object "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is visible")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property sensitive
-  (of-object "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget responds to input")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property app-paintable
-  (of-object "GtkFileSelection")
-  (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 "GtkFileSelection")
-  (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 "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget has the input focus")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property is-focus
-  (of-object "GtkFileSelection")
-  (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 "GtkFileSelection")
-  (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 "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is the default widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property receives-default
-  (of-object "GtkFileSelection")
-  (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 "GtkFileSelection")
-  (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 "GtkFileSelection")
-  (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 "GtkFileSelection")
-  (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 "GtkFileSelection")
-  (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 "GtkFileSelection")
-  (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 "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "Whether this widget has a tooltip")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property tooltip-markup
-  (of-object "GtkFileSelection")
-  (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 "GtkFileSelection")
-  (prop-type "GParamString")
-  (docs "The contents of the tooltip for this widget")
+(define-property margin-bottom
+  (of-object "GtkFileChooserWidget")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property window
-  (of-object "GtkFileSelection")
-  (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 "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+(define-property margin
+  (of-object "GtkFileChooserWidget")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
 (define-property border-width
-  (of-object "GtkFileSelection")
+  (of-object "GtkFileChooserWidget")
   (prop-type "GParamUInt")
   (docs "The width of the empty border outside the containers children")
   (readable #t)
@@ -16105,7 +15528,7 @@
 )
 
 (define-property resize-mode
-  (of-object "GtkFileSelection")
+  (of-object "GtkFileChooserWidget")
   (prop-type "GParamEnum")
   (docs "Specify how resize events are handled")
   (readable #t)
@@ -16114,7 +15537,7 @@
 )
 
 (define-property child
-  (of-object "GtkFileSelection")
+  (of-object "GtkFileChooserWidget")
   (prop-type "GParamObject")
   (docs "Can be used to add a new child to the container")
   (readable #f)
@@ -16122,289 +15545,19 @@
   (construct-only #f)
 )
 
-(define-property type
-  (of-object "GtkFileSelection")
-  (prop-type "GParamEnum")
-  (docs "The type of the window")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
-)
-
-(define-property title
-  (of-object "GtkFileSelection")
-  (prop-type "GParamString")
-  (docs "The title of the window")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property role
-  (of-object "GtkFileSelection")
-  (prop-type "GParamString")
-  (docs "Unique identifier for the window to be used when restoring a session")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property allow-shrink
-  (of-object "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property allow-grow
-  (of-object "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, users can expand the window beyond its minimum size")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property resizable
-  (of-object "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, users can resize the window")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property modal
-  (of-object "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, the window is modal (other windows are not usable while this one is up)")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property window-position
-  (of-object "GtkFileSelection")
-  (prop-type "GParamEnum")
-  (docs "The initial position of the window")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property default-width
-  (of-object "GtkFileSelection")
-  (prop-type "GParamInt")
-  (docs "The default width of the window, used when initially showing the window")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property default-height
-  (of-object "GtkFileSelection")
+(define-property spacing
+  (of-object "GtkFileChooserWidget")
   (prop-type "GParamInt")
-  (docs "The default height of the window, used when initially showing the window")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property destroy-with-parent
-  (of-object "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "If this window should be destroyed when the parent is destroyed")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property icon
-  (of-object "GtkFileSelection")
-  (prop-type "GParamObject")
-  (docs "Icon for this window")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property icon-name
-  (of-object "GtkFileSelection")
-  (prop-type "GParamString")
-  (docs "Name of the themed icon for this window")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property screen
-  (of-object "GtkFileSelection")
-  (prop-type "GParamObject")
-  (docs "The screen where this window will be displayed")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property type-hint
-  (of-object "GtkFileSelection")
-  (prop-type "GParamEnum")
-  (docs "Hint to help the desktop environment understand what kind of window this is and how to treat it.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property skip-taskbar-hint
-  (of-object "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "TRUE if the window should not be in the task bar.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property skip-pager-hint
-  (of-object "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "TRUE if the window should not be in the pager.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property urgency-hint
-  (of-object "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "TRUE if the window should be brought to the user's attention.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property accept-focus
-  (of-object "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "TRUE if the window should receive the input focus.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property focus-on-map
-  (of-object "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "TRUE if the window should receive the input focus when mapped.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property decorated
-  (of-object "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "Whether the window should be decorated by the window manager")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property deletable
-  (of-object "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "Whether the window frame should have a close button")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property gravity
-  (of-object "GtkFileSelection")
-  (prop-type "GParamEnum")
-  (docs "The window gravity of the window")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property transient-for
-  (of-object "GtkFileSelection")
-  (prop-type "GParamObject")
-  (docs "The transient parent of the dialog")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property opacity
-  (of-object "GtkFileSelection")
-  (prop-type "GParamDouble")
-  (docs "The opacity of the window, from 0 to 1")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property is-active
-  (of-object "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "Whether the toplevel is the current active window")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property has-toplevel-focus
-  (of-object "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "Whether the input focus is within this GtkWindow")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property startup-id
-  (of-object "GtkFileSelection")
-  (prop-type "GParamString")
-  (docs "Unique startup identifier for the window used by startup-notification")
-  (readable #f)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property has-separator
-  (of-object "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "The dialog has a separator bar above its buttons")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property show-fileops
-  (of-object "GtkFileSelection")
-  (prop-type "GParamBoolean")
-  (docs "Whether buttons for creating/manipulating files should be displayed")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property filename
-  (of-object "GtkFileSelection")
-  (prop-type "GParamString")
-  (docs "The currently selected filename")
+  (docs "The amount of space between children")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property select-multiple
-  (of-object "GtkFileSelection")
+(define-property homogeneous
+  (of-object "GtkFileChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple files to be selected")
+  (docs "Whether the children should all be the same size")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -16412,15 +15565,6 @@
 
 ;; From GtkFixed
 
-(define-property user-data
-  (of-object "GtkFixed")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkFixed")
   (prop-type "GParamString")
@@ -16622,7 +15766,70 @@
 (define-property double-buffered
   (of-object "GtkFixed")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkFixed")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkFixed")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkFixed")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkFixed")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkFixed")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkFixed")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkFixed")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -16663,15 +15870,6 @@
   (when "first")
 )
 
-(define-property use-action-appearance
-  (of-object "GtkFontButton")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the related actions appearance properties")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property related-action
   (of-object "GtkFontButton")
   (prop-type "GParamObject")
@@ -16681,10 +15879,10 @@
   (construct-only #f)
 )
 
-(define-property user-data
+(define-property use-action-appearance
   (of-object "GtkFontButton")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -16891,7 +16089,70 @@
 (define-property double-buffered
   (of-object "GtkFontButton")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkFontButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkFontButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkFontButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkFontButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkFontButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkFontButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkFontButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -17070,15 +16331,6 @@
   (construct-only #f)
 )
 
-(define-property user-data
-  (of-object "GtkFontSelection")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkFontSelection")
   (prop-type "GParamString")
@@ -17280,7 +16532,70 @@
 (define-property double-buffered
   (of-object "GtkFontSelection")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkFontSelection")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkFontSelection")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkFontSelection")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkFontSelection")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkFontSelection")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkFontSelection")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkFontSelection")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -17340,15 +16655,6 @@
   (construct-only #f)
 )
 
-(define-property font
-  (of-object "GtkFontSelection")
-  (prop-type "GParamBoxed")
-  (docs "The GdkFont that is currently selected")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
 (define-property preview-text
   (of-object "GtkFontSelection")
   (prop-type "GParamString")
@@ -17360,15 +16666,6 @@
 
 ;; From GtkFontSelectionDialog
 
-(define-property user-data
-  (of-object "GtkFontSelectionDialog")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkFontSelectionDialog")
   (prop-type "GParamString")
@@ -17570,7 +16867,70 @@
 (define-property double-buffered
   (of-object "GtkFontSelectionDialog")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkFontSelectionDialog")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkFontSelectionDialog")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkFontSelectionDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkFontSelectionDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkFontSelectionDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkFontSelectionDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkFontSelectionDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -17630,24 +16990,6 @@
   (construct-only #f)
 )
 
-(define-property allow-shrink
-  (of-object "GtkFontSelectionDialog")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property allow-grow
-  (of-object "GtkFontSelectionDialog")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, users can expand the window beyond its minimum size")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property resizable
   (of-object "GtkFontSelectionDialog")
   (prop-type "GParamBoolean")
@@ -17855,10 +17197,10 @@
   (construct-only #f)
 )
 
-(define-property has-separator
+(define-property mnemonics-visible
   (of-object "GtkFontSelectionDialog")
   (prop-type "GParamBoolean")
-  (docs "The dialog has a separator bar above its buttons")
+  (docs "Whether mnemonics are currently visible in this window")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -17866,15 +17208,6 @@
 
 ;; From GtkFrame
 
-(define-property user-data
-  (of-object "GtkFrame")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkFrame")
   (prop-type "GParamString")
@@ -18076,7 +17409,70 @@
 (define-property double-buffered
   (of-object "GtkFrame")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkFrame")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkFrame")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkFrame")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkFrame")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkFrame")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkFrame")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkFrame")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -18136,15 +17532,6 @@
   (construct-only #f)
 )
 
-(define-property shadow
-  (of-object "GtkFrame")
-  (prop-type "GParamEnum")
-  (docs "Deprecated property, use shadow_type instead")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property shadow-type
   (of-object "GtkFrame")
   (prop-type "GParamEnum")
@@ -18183,15 +17570,6 @@
   )
 )
 
-(define-property user-data
-  (of-object "GtkHandleBox")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkHandleBox")
   (prop-type "GParamString")
@@ -18393,7 +17771,70 @@
 (define-property double-buffered
   (of-object "GtkHandleBox")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkHandleBox")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkHandleBox")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkHandleBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkHandleBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkHandleBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkHandleBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkHandleBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -18426,15 +17867,6 @@
   (construct-only #f)
 )
 
-(define-property shadow
-  (of-object "GtkHandleBox")
-  (prop-type "GParamEnum")
-  (docs "Deprecated property, use shadow_type instead")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property shadow-type
   (of-object "GtkHandleBox")
   (prop-type "GParamEnum")
@@ -18490,15 +17922,6 @@
 
 ;; From GtkImage
 
-(define-property user-data
-  (of-object "GtkImage")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkImage")
   (prop-type "GParamString")
@@ -18700,7 +18123,70 @@
 (define-property double-buffered
   (of-object "GtkImage")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkImage")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkImage")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkImage")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkImage")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkImage")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkImage")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkImage")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -18760,19 +18246,10 @@
   (construct-only #f)
 )
 
-(define-property image
-  (of-object "GtkImage")
-  (prop-type "GParamObject")
-  (docs "A GdkImage to display")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property mask
   (of-object "GtkImage")
   (prop-type "GParamObject")
-  (docs "Mask bitmap to use with GdkImage or GdkPixmap")
+  (docs "Mask bitmap to use with GdkPixmap")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -18861,15 +18338,6 @@
 
 ;; From GtkImageMenuItem
 
-(define-property use-action-appearance
-  (of-object "GtkImageMenuItem")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the related actions appearance properties")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property related-action
   (of-object "GtkImageMenuItem")
   (prop-type "GParamObject")
@@ -18879,10 +18347,10 @@
   (construct-only #f)
 )
 
-(define-property user-data
+(define-property use-action-appearance
   (of-object "GtkImageMenuItem")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -19089,7 +18557,70 @@
 (define-property double-buffered
   (of-object "GtkImageMenuItem")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -19229,15 +18760,6 @@
   (construct-only #f)
 )
 
-(define-property user-data
-  (of-object "GtkInfoBar")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkInfoBar")
   (prop-type "GParamString")
@@ -19439,304 +18961,77 @@
 (define-property double-buffered
   (of-object "GtkInfoBar")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property border-width
+(define-property halign
   (of-object "GtkInfoBar")
-  (prop-type "GParamUInt")
-  (docs "The width of the empty border outside the containers children")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property resize-mode
+(define-property valign
   (of-object "GtkInfoBar")
   (prop-type "GParamEnum")
-  (docs "Specify how resize events are handled")
+  (docs "How to position in extra vertical space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property child
-  (of-object "GtkInfoBar")
-  (prop-type "GParamObject")
-  (docs "Can be used to add a new child to the container")
-  (readable #f)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property spacing
+(define-property margin-left
   (of-object "GtkInfoBar")
   (prop-type "GParamInt")
-  (docs "The amount of space between children")
+  (docs "Pixels of extra space on the left side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property homogeneous
+(define-property margin-right
   (of-object "GtkInfoBar")
-  (prop-type "GParamBoolean")
-  (docs "Whether the children should all be the same size")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property message-type
+(define-property margin-top
   (of-object "GtkInfoBar")
-  (prop-type "GParamEnum")
-  (docs "The type of message")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-;; From GtkInputDialog
-
-(define-signal enable-device
-  (of-object "GtkInputDialog")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GdkDevice*" "p0")
-  )
-)
-
-(define-signal disable-device
-  (of-object "GtkInputDialog")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GdkDevice*" "p0")
-  )
-)
-
-(define-property user-data
-  (of-object "GtkInputDialog")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property name
-  (of-object "GtkInputDialog")
-  (prop-type "GParamString")
-  (docs "The name of the widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property parent
-  (of-object "GtkInputDialog")
-  (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 "GtkInputDialog")
   (prop-type "GParamInt")
-  (docs "Override for width request of the widget, or -1 if natural request should be used")
+  (docs "Pixels of extra space on the top side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property height-request
-  (of-object "GtkInputDialog")
+(define-property margin-bottom
+  (of-object "GtkInfoBar")
   (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 "GtkInputDialog")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is visible")
+  (docs "Pixels of extra space on the bottom side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property sensitive
-  (of-object "GtkInputDialog")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget responds to input")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property app-paintable
-  (of-object "GtkInputDialog")
-  (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 "GtkInputDialog")
-  (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 "GtkInputDialog")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget has the input focus")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property is-focus
-  (of-object "GtkInputDialog")
-  (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 "GtkInputDialog")
-  (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 "GtkInputDialog")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is the default widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property receives-default
-  (of-object "GtkInputDialog")
-  (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 "GtkInputDialog")
-  (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 "GtkInputDialog")
-  (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 "GtkInputDialog")
-  (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 "GtkInputDialog")
-  (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 "GtkInputDialog")
-  (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 "GtkInputDialog")
-  (prop-type "GParamBoolean")
-  (docs "Whether this widget has a tooltip")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property tooltip-markup
-  (of-object "GtkInputDialog")
-  (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 "GtkInputDialog")
-  (prop-type "GParamString")
-  (docs "The contents of the tooltip for this widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property window
-  (of-object "GtkInputDialog")
-  (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 "GtkInputDialog")
-  (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+(define-property margin
+  (of-object "GtkInfoBar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
 (define-property border-width
-  (of-object "GtkInputDialog")
+  (of-object "GtkInfoBar")
   (prop-type "GParamUInt")
   (docs "The width of the empty border outside the containers children")
   (readable #t)
@@ -19745,7 +19040,7 @@
 )
 
 (define-property resize-mode
-  (of-object "GtkInputDialog")
+  (of-object "GtkInfoBar")
   (prop-type "GParamEnum")
   (docs "Specify how resize events are handled")
   (readable #t)
@@ -19754,7 +19049,7 @@
 )
 
 (define-property child
-  (of-object "GtkInputDialog")
+  (of-object "GtkInfoBar")
   (prop-type "GParamObject")
   (docs "Can be used to add a new child to the container")
   (readable #f)
@@ -19762,262 +19057,28 @@
   (construct-only #f)
 )
 
-(define-property type
-  (of-object "GtkInputDialog")
-  (prop-type "GParamEnum")
-  (docs "The type of the window")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
-)
-
-(define-property title
-  (of-object "GtkInputDialog")
-  (prop-type "GParamString")
-  (docs "The title of the window")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property role
-  (of-object "GtkInputDialog")
-  (prop-type "GParamString")
-  (docs "Unique identifier for the window to be used when restoring a session")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property allow-shrink
-  (of-object "GtkInputDialog")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property allow-grow
-  (of-object "GtkInputDialog")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, users can expand the window beyond its minimum size")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property resizable
-  (of-object "GtkInputDialog")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, users can resize the window")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property modal
-  (of-object "GtkInputDialog")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, the window is modal (other windows are not usable while this one is up)")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property window-position
-  (of-object "GtkInputDialog")
-  (prop-type "GParamEnum")
-  (docs "The initial position of the window")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property default-width
-  (of-object "GtkInputDialog")
-  (prop-type "GParamInt")
-  (docs "The default width of the window, used when initially showing the window")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property default-height
-  (of-object "GtkInputDialog")
+(define-property spacing
+  (of-object "GtkInfoBar")
   (prop-type "GParamInt")
-  (docs "The default height of the window, used when initially showing the window")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property destroy-with-parent
-  (of-object "GtkInputDialog")
-  (prop-type "GParamBoolean")
-  (docs "If this window should be destroyed when the parent is destroyed")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property icon
-  (of-object "GtkInputDialog")
-  (prop-type "GParamObject")
-  (docs "Icon for this window")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property icon-name
-  (of-object "GtkInputDialog")
-  (prop-type "GParamString")
-  (docs "Name of the themed icon for this window")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property screen
-  (of-object "GtkInputDialog")
-  (prop-type "GParamObject")
-  (docs "The screen where this window will be displayed")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property type-hint
-  (of-object "GtkInputDialog")
-  (prop-type "GParamEnum")
-  (docs "Hint to help the desktop environment understand what kind of window this is and how to treat it.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property skip-taskbar-hint
-  (of-object "GtkInputDialog")
-  (prop-type "GParamBoolean")
-  (docs "TRUE if the window should not be in the task bar.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property skip-pager-hint
-  (of-object "GtkInputDialog")
-  (prop-type "GParamBoolean")
-  (docs "TRUE if the window should not be in the pager.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property urgency-hint
-  (of-object "GtkInputDialog")
-  (prop-type "GParamBoolean")
-  (docs "TRUE if the window should be brought to the user's attention.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property accept-focus
-  (of-object "GtkInputDialog")
-  (prop-type "GParamBoolean")
-  (docs "TRUE if the window should receive the input focus.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property focus-on-map
-  (of-object "GtkInputDialog")
-  (prop-type "GParamBoolean")
-  (docs "TRUE if the window should receive the input focus when mapped.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property decorated
-  (of-object "GtkInputDialog")
-  (prop-type "GParamBoolean")
-  (docs "Whether the window should be decorated by the window manager")
+  (docs "The amount of space between children")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property deletable
-  (of-object "GtkInputDialog")
+(define-property homogeneous
+  (of-object "GtkInfoBar")
   (prop-type "GParamBoolean")
-  (docs "Whether the window frame should have a close button")
+  (docs "Whether the children should all be the same size")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property gravity
-  (of-object "GtkInputDialog")
+(define-property message-type
+  (of-object "GtkInfoBar")
   (prop-type "GParamEnum")
-  (docs "The window gravity of the window")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property transient-for
-  (of-object "GtkInputDialog")
-  (prop-type "GParamObject")
-  (docs "The transient parent of the dialog")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property opacity
-  (of-object "GtkInputDialog")
-  (prop-type "GParamDouble")
-  (docs "The opacity of the window, from 0 to 1")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property is-active
-  (of-object "GtkInputDialog")
-  (prop-type "GParamBoolean")
-  (docs "Whether the toplevel is the current active window")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property has-toplevel-focus
-  (of-object "GtkInputDialog")
-  (prop-type "GParamBoolean")
-  (docs "Whether the input focus is within this GtkWindow")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property startup-id
-  (of-object "GtkInputDialog")
-  (prop-type "GParamString")
-  (docs "Unique startup identifier for the window used by startup-notification")
-  (readable #f)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property has-separator
-  (of-object "GtkInputDialog")
-  (prop-type "GParamBoolean")
-  (docs "The dialog has a separator bar above its buttons")
+  (docs "The type of message")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -20025,15 +19086,6 @@
 
 ;; From GtkInvisible
 
-(define-property user-data
-  (of-object "GtkInvisible")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkInvisible")
   (prop-type "GParamString")
@@ -20235,292 +19287,86 @@
 (define-property double-buffered
   (of-object "GtkInvisible")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property screen
+(define-property halign
   (of-object "GtkInvisible")
-  (prop-type "GParamObject")
-  (docs "The screen where this window will be displayed")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-;; From GtkItem
-
-(define-signal select
-  (of-object "GtkItem")
-  (return-type "void")
-  (when "first")
-)
-
-(define-signal deselect
-  (of-object "GtkItem")
-  (return-type "void")
-  (when "first")
-)
-
-(define-signal toggle
-  (of-object "GtkItem")
-  (return-type "void")
-  (when "first")
-)
-
-(define-property user-data
-  (of-object "GtkItem")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property name
-  (of-object "GtkItem")
-  (prop-type "GParamString")
-  (docs "The name of the widget")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property parent
-  (of-object "GtkItem")
-  (prop-type "GParamObject")
-  (docs "The parent widget of this widget. Must be a Container widget")
+(define-property valign
+  (of-object "GtkInvisible")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property width-request
-  (of-object "GtkItem")
+(define-property margin-left
+  (of-object "GtkInvisible")
   (prop-type "GParamInt")
-  (docs "Override for width request of the widget, or -1 if natural request should be used")
+  (docs "Pixels of extra space on the left side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property height-request
-  (of-object "GtkItem")
+(define-property margin-right
+  (of-object "GtkInvisible")
   (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 "GtkItem")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is visible")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property sensitive
-  (of-object "GtkItem")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget responds to input")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property app-paintable
-  (of-object "GtkItem")
-  (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 "GtkItem")
-  (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 "GtkItem")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget has the input focus")
+  (docs "Pixels of extra space on the right side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property is-focus
-  (of-object "GtkItem")
-  (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 "GtkItem")
-  (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 "GtkItem")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is the default widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property receives-default
-  (of-object "GtkItem")
-  (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 "GtkItem")
-  (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 "GtkItem")
-  (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 "GtkItem")
-  (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 "GtkItem")
-  (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 "GtkItem")
-  (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 "GtkItem")
-  (prop-type "GParamBoolean")
-  (docs "Whether this widget has a tooltip")
+(define-property margin-top
+  (of-object "GtkInvisible")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tooltip-markup
-  (of-object "GtkItem")
-  (prop-type "GParamString")
-  (docs "The contents of the tooltip for this widget")
+(define-property margin-bottom
+  (of-object "GtkInvisible")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tooltip-text
-  (of-object "GtkItem")
-  (prop-type "GParamString")
-  (docs "The contents of the tooltip for this widget")
+(define-property margin
+  (of-object "GtkInvisible")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property window
-  (of-object "GtkItem")
+(define-property screen
+  (of-object "GtkInvisible")
   (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 "GtkItem")
-  (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property border-width
-  (of-object "GtkItem")
-  (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 "GtkItem")
-  (prop-type "GParamEnum")
-  (docs "Specify how resize events are handled")
+  (docs "The screen where this window will be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property child
-  (of-object "GtkItem")
-  (prop-type "GParamObject")
-  (docs "Can be used to add a new child to the container")
-  (readable #f)
-  (writable #t)
-  (construct-only #f)
-)
-
 ;; From GtkIconView
 
-(define-signal selection-changed
-  (of-object "GtkIconView")
-  (return-type "void")
-  (when "first")
-)
-
 (define-signal set-scroll-adjustments
   (of-object "GtkIconView")
   (return-type "void")
@@ -20562,6 +19408,12 @@
   )
 )
 
+(define-signal selection-changed
+  (of-object "GtkIconView")
+  (return-type "void")
+  (when "first")
+)
+
 (define-signal select-cursor-item
   (of-object "GtkIconView")
   (return-type "void")
@@ -20580,15 +19432,6 @@
   (when "last")
 )
 
-(define-property user-data
-  (of-object "GtkIconView")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkIconView")
   (prop-type "GParamString")
@@ -20790,7 +19633,61 @@
 (define-property double-buffered
   (of-object "GtkIconView")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkIconView")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkIconView")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkIconView")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkIconView")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkIconView")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkIconView")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -20859,7 +19756,7 @@
   (construct-only #f)
 )
 
-(define-property orientation
+(define-property item-orientation
   (of-object "GtkIconView")
   (prop-type "GParamEnum")
   (docs "How the text and icon of each item are positioned relative to each other")
@@ -21001,15 +19898,6 @@
   )
 )
 
-(define-property user-data
-  (of-object "GtkLabel")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkLabel")
   (prop-type "GParamString")
@@ -21211,7 +20099,70 @@
 (define-property double-buffered
   (of-object "GtkLabel")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkLabel")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkLabel")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkLabel")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkLabel")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkLabel")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkLabel")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkLabel")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -21436,15 +20387,6 @@
   )
 )
 
-(define-property user-data
-  (of-object "GtkLayout")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkLayout")
   (prop-type "GParamString")
@@ -21646,7 +20588,70 @@
 (define-property double-buffered
   (of-object "GtkLayout")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkLayout")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkLayout")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkLayout")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkLayout")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkLayout")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkLayout")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkLayout")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -21717,15 +20722,6 @@
 
 ;; From GtkLinkButton
 
-(define-property use-action-appearance
-  (of-object "GtkLinkButton")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the related actions appearance properties")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property related-action
   (of-object "GtkLinkButton")
   (prop-type "GParamObject")
@@ -21735,10 +20731,10 @@
   (construct-only #f)
 )
 
-(define-property user-data
+(define-property use-action-appearance
   (of-object "GtkLinkButton")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -21945,7 +20941,70 @@
 (define-property double-buffered
   (of-object "GtkLinkButton")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkLinkButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkLinkButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkLinkButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkLinkButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkLinkButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkLinkButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkLinkButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -22077,370 +21136,19 @@
   (construct-only #f)
 )
 
-;; From GtkList
-
-(define-signal selection-changed
-  (of-object "GtkList")
-  (return-type "void")
-  (when "first")
-)
-
-(define-signal select-child
-  (of-object "GtkList")
-  (return-type "void")
-  (when "first")
-  (parameters
-    '("GtkWidget*" "p0")
-  )
-)
-
-(define-signal unselect-child
-  (of-object "GtkList")
-  (return-type "void")
-  (when "first")
-  (parameters
-    '("GtkWidget*" "p0")
-  )
-)
-
-(define-property user-data
-  (of-object "GtkList")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property name
-  (of-object "GtkList")
-  (prop-type "GParamString")
-  (docs "The name of the widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property parent
-  (of-object "GtkList")
-  (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 "GtkList")
-  (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 "GtkList")
-  (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 "GtkList")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is visible")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property sensitive
-  (of-object "GtkList")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget responds to input")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property app-paintable
-  (of-object "GtkList")
-  (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 "GtkList")
-  (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 "GtkList")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget has the input focus")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property is-focus
-  (of-object "GtkList")
-  (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 "GtkList")
-  (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 "GtkList")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is the default widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property receives-default
-  (of-object "GtkList")
-  (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 "GtkList")
-  (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 "GtkList")
-  (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 "GtkList")
-  (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 "GtkList")
-  (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 "GtkList")
-  (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 "GtkList")
-  (prop-type "GParamBoolean")
-  (docs "Whether this widget has a tooltip")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property tooltip-markup
-  (of-object "GtkList")
-  (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 "GtkList")
-  (prop-type "GParamString")
-  (docs "The contents of the tooltip for this widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property window
-  (of-object "GtkList")
-  (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 "GtkList")
-  (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property border-width
-  (of-object "GtkList")
-  (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 "GtkList")
-  (prop-type "GParamEnum")
-  (docs "Specify how resize events are handled")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property child
-  (of-object "GtkList")
-  (prop-type "GParamObject")
-  (docs "Can be used to add a new child to the container")
-  (readable #f)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property selection-mode
-  (of-object "GtkList")
-  (prop-type "GParamEnum")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-;; From GtkListItem
-
-(define-signal select-all
-  (of-object "GtkListItem")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal unselect-all
-  (of-object "GtkListItem")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal toggle-focus-row
-  (of-object "GtkListItem")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal undo-selection
-  (of-object "GtkListItem")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal start-selection
-  (of-object "GtkListItem")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal end-selection
-  (of-object "GtkListItem")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal toggle-add-mode
-  (of-object "GtkListItem")
-  (return-type "void")
-  (when "last")
-)
-
-(define-signal extend-selection
-  (of-object "GtkListItem")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GtkScrollType" "p0")
-    '("gfloat" "p1")
-    '("gboolean" "p2")
-  )
-)
-
-(define-signal scroll-vertical
-  (of-object "GtkListItem")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GtkScrollType" "p0")
-    '("gfloat" "p1")
-  )
-)
+;; From GtkMenu
 
-(define-signal scroll-horizontal
-  (of-object "GtkListItem")
+(define-signal move-scroll
+  (of-object "GtkMenu")
   (return-type "void")
   (when "last")
   (parameters
     '("GtkScrollType" "p0")
-    '("gfloat" "p1")
   )
 )
 
-(define-property user-data
-  (of-object "GtkListItem")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamString")
   (docs "The name of the widget")
   (readable #t)
@@ -22449,7 +21157,7 @@
 )
 
 (define-property parent
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamObject")
   (docs "The parent widget of this widget. Must be a Container widget")
   (readable #t)
@@ -22458,7 +21166,7 @@
 )
 
 (define-property width-request
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamInt")
   (docs "Override for width request of the widget, or -1 if natural request should be used")
   (readable #t)
@@ -22467,7 +21175,7 @@
 )
 
 (define-property height-request
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamInt")
   (docs "Override for height request of the widget, or -1 if natural request should be used")
   (readable #t)
@@ -22476,7 +21184,7 @@
 )
 
 (define-property visible
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamBoolean")
   (docs "Whether the widget is visible")
   (readable #t)
@@ -22485,7 +21193,7 @@
 )
 
 (define-property sensitive
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamBoolean")
   (docs "Whether the widget responds to input")
   (readable #t)
@@ -22494,7 +21202,7 @@
 )
 
 (define-property app-paintable
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamBoolean")
   (docs "Whether the application will paint directly on the widget")
   (readable #t)
@@ -22503,7 +21211,7 @@
 )
 
 (define-property can-focus
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamBoolean")
   (docs "Whether the widget can accept the input focus")
   (readable #t)
@@ -22512,7 +21220,7 @@
 )
 
 (define-property has-focus
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamBoolean")
   (docs "Whether the widget has the input focus")
   (readable #t)
@@ -22521,7 +21229,7 @@
 )
 
 (define-property is-focus
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamBoolean")
   (docs "Whether the widget is the focus widget within the toplevel")
   (readable #t)
@@ -22530,7 +21238,7 @@
 )
 
 (define-property can-default
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamBoolean")
   (docs "Whether the widget can be the default widget")
   (readable #t)
@@ -22539,7 +21247,7 @@
 )
 
 (define-property has-default
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamBoolean")
   (docs "Whether the widget is the default widget")
   (readable #t)
@@ -22548,7 +21256,7 @@
 )
 
 (define-property receives-default
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamBoolean")
   (docs "If TRUE, the widget will receive the default action when it is focused")
   (readable #t)
@@ -22557,7 +21265,7 @@
 )
 
 (define-property composite-child
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamBoolean")
   (docs "Whether the widget is part of a composite widget")
   (readable #t)
@@ -22566,7 +21274,7 @@
 )
 
 (define-property style
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamObject")
   (docs "The style of the widget, which contains information about how it will look (colors etc)")
   (readable #t)
@@ -22575,7 +21283,7 @@
 )
 
 (define-property events
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamFlags")
   (docs "The event mask that decides what kind of GdkEvents this widget gets")
   (readable #t)
@@ -22584,7 +21292,7 @@
 )
 
 (define-property extension-events
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamEnum")
   (docs "The mask that decides what kind of extension events this widget gets")
   (readable #t)
@@ -22593,7 +21301,7 @@
 )
 
 (define-property no-show-all
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamBoolean")
   (docs "Whether gtk_widget_show_all() should not affect this widget")
   (readable #t)
@@ -22602,7 +21310,7 @@
 )
 
 (define-property has-tooltip
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamBoolean")
   (docs "Whether this widget has a tooltip")
   (readable #t)
@@ -22611,7 +21319,7 @@
 )
 
 (define-property tooltip-markup
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamString")
   (docs "The contents of the tooltip for this widget")
   (readable #t)
@@ -22620,7 +21328,7 @@
 )
 
 (define-property tooltip-text
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamString")
   (docs "The contents of the tooltip for this widget")
   (readable #t)
@@ -22629,7 +21337,7 @@
 )
 
 (define-property window
-  (of-object "GtkListItem")
+  (of-object "GtkMenu")
   (prop-type "GParamObject")
   (docs "The widget's window if it is realized")
   (readable #t)
@@ -22638,263 +21346,72 @@
 )
 
 (define-property double-buffered
-  (of-object "GtkListItem")
-  (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property border-width
-  (of-object "GtkListItem")
-  (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 "GtkListItem")
-  (prop-type "GParamEnum")
-  (docs "Specify how resize events are handled")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property child
-  (of-object "GtkListItem")
-  (prop-type "GParamObject")
-  (docs "Can be used to add a new child to the container")
-  (readable #f)
-  (writable #t)
-  (construct-only #f)
-)
-
-;; From GtkMenu
-
-(define-signal move-scroll
-  (of-object "GtkMenu")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GtkScrollType" "p0")
-  )
-)
-
-(define-property user-data
-  (of-object "GtkMenu")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property name
-  (of-object "GtkMenu")
-  (prop-type "GParamString")
-  (docs "The name of the widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property parent
-  (of-object "GtkMenu")
-  (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 "GtkMenu")
-  (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 "GtkMenu")
-  (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 "GtkMenu")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is visible")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property sensitive
-  (of-object "GtkMenu")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget responds to input")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property app-paintable
-  (of-object "GtkMenu")
-  (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 "GtkMenu")
-  (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 "GtkMenu")
   (prop-type "GParamBoolean")
-  (docs "Whether the widget has the input focus")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property is-focus
-  (of-object "GtkMenu")
-  (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 "GtkMenu")
-  (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 "GtkMenu")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is the default widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property receives-default
-  (of-object "GtkMenu")
-  (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 "GtkMenu")
-  (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 "GtkMenu")
-  (prop-type "GParamObject")
-  (docs "The style of the widget, which contains information about how it will look (colors etc)")
+  (docs "Whether the widget is double buffered")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property events
+(define-property halign
   (of-object "GtkMenu")
-  (prop-type "GParamFlags")
-  (docs "The event mask that decides what kind of GdkEvents this widget gets")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property extension-events
+(define-property valign
   (of-object "GtkMenu")
   (prop-type "GParamEnum")
-  (docs "The mask that decides what kind of extension events this widget gets")
+  (docs "How to position in extra vertical space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property no-show-all
+(define-property margin-left
   (of-object "GtkMenu")
-  (prop-type "GParamBoolean")
-  (docs "Whether gtk_widget_show_all() should not affect this widget")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property has-tooltip
+(define-property margin-right
   (of-object "GtkMenu")
-  (prop-type "GParamBoolean")
-  (docs "Whether this widget has a tooltip")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tooltip-markup
+(define-property margin-top
   (of-object "GtkMenu")
-  (prop-type "GParamString")
-  (docs "The contents of the tooltip for this widget")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tooltip-text
+(define-property margin-bottom
   (of-object "GtkMenu")
-  (prop-type "GParamString")
-  (docs "The contents of the tooltip for this widget")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property window
-  (of-object "GtkMenu")
-  (prop-type "GParamObject")
-  (docs "The widget's window if it is realized")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property double-buffered
+(define-property margin
   (of-object "GtkMenu")
-  (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -23010,15 +21527,6 @@
 
 ;; From GtkMenuBar
 
-(define-property user-data
-  (of-object "GtkMenuBar")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkMenuBar")
   (prop-type "GParamString")
@@ -23220,7 +21728,70 @@
 (define-property double-buffered
   (of-object "GtkMenuBar")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkMenuBar")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkMenuBar")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkMenuBar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkMenuBar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkMenuBar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkMenuBar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkMenuBar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -23312,13 +21883,16 @@
   )
 )
 
-(define-property use-action-appearance
+(define-signal select
   (of-object "GtkMenuItem")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the related actions appearance properties")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+  (return-type "void")
+  (when "first")
+)
+
+(define-signal deselect
+  (of-object "GtkMenuItem")
+  (return-type "void")
+  (when "first")
 )
 
 (define-property related-action
@@ -23330,10 +21904,10 @@
   (construct-only #f)
 )
 
-(define-property user-data
+(define-property use-action-appearance
   (of-object "GtkMenuItem")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -23540,7 +22114,70 @@
 (define-property double-buffered
   (of-object "GtkMenuItem")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkMenuItem")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkMenuItem")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkMenuItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkMenuItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkMenuItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkMenuItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkMenuItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -23674,15 +22311,6 @@
   )
 )
 
-(define-property user-data
-  (of-object "GtkMenuShell")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkMenuShell")
   (prop-type "GParamString")
@@ -23884,7 +22512,70 @@
 (define-property double-buffered
   (of-object "GtkMenuShell")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkMenuShell")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkMenuShell")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkMenuShell")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkMenuShell")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkMenuShell")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkMenuShell")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkMenuShell")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -23934,15 +22625,6 @@
   (when "first")
 )
 
-(define-property use-action-appearance
-  (of-object "GtkMenuToolButton")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the related actions appearance properties")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property related-action
   (of-object "GtkMenuToolButton")
   (prop-type "GParamObject")
@@ -23952,10 +22634,10 @@
   (construct-only #f)
 )
 
-(define-property user-data
+(define-property use-action-appearance
   (of-object "GtkMenuToolButton")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -24162,7 +22844,70 @@
 (define-property double-buffered
   (of-object "GtkMenuToolButton")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkMenuToolButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkMenuToolButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkMenuToolButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkMenuToolButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkMenuToolButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkMenuToolButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkMenuToolButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -24287,15 +23032,6 @@
 
 ;; From GtkMessageDialog
 
-(define-property user-data
-  (of-object "GtkMessageDialog")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkMessageDialog")
   (prop-type "GParamString")
@@ -24497,7 +23233,70 @@
 (define-property double-buffered
   (of-object "GtkMessageDialog")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkMessageDialog")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkMessageDialog")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkMessageDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkMessageDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkMessageDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkMessageDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkMessageDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -24557,24 +23356,6 @@
   (construct-only #f)
 )
 
-(define-property allow-shrink
-  (of-object "GtkMessageDialog")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property allow-grow
-  (of-object "GtkMessageDialog")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, users can expand the window beyond its minimum size")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property resizable
   (of-object "GtkMessageDialog")
   (prop-type "GParamBoolean")
@@ -24782,10 +23563,10 @@
   (construct-only #f)
 )
 
-(define-property has-separator
+(define-property mnemonics-visible
   (of-object "GtkMessageDialog")
   (prop-type "GParamBoolean")
-  (docs "The dialog has a separator bar above its buttons")
+  (docs "Whether mnemonics are currently visible in this window")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -24854,17 +23635,17 @@
   (construct-only #f)
 )
 
-;; From GtkMisc
-
-(define-property user-data
-  (of-object "GtkMisc")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+(define-property message-area
+  (of-object "GtkMessageDialog")
+  (prop-type "GParamObject")
+  (docs "GtkVBox that holds the dialog's primary and secondary labels")
   (readable #t)
-  (writable #t)
+  (writable #f)
   (construct-only #f)
 )
 
+;; From GtkMisc
+
 (define-property name
   (of-object "GtkMisc")
   (prop-type "GParamString")
@@ -25066,7 +23847,70 @@
 (define-property double-buffered
   (of-object "GtkMisc")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkMisc")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkMisc")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkMisc")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkMisc")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkMisc")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkMisc")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkMisc")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -25110,15 +23954,6 @@
 
 ;; From GtkNotebook
 
-(define-signal move-focus-out
-  (of-object "GtkNotebook")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GtkDirectionType" "p0")
-  )
-)
-
 (define-signal switch-page
   (of-object "GtkNotebook")
   (return-type "void")
@@ -25156,6 +23991,15 @@
   )
 )
 
+(define-signal move-focus-out
+  (of-object "GtkNotebook")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GtkDirectionType" "p0")
+  )
+)
+
 (define-signal reorder-tab
   (of-object "GtkNotebook")
   (return-type "gboolean")
@@ -25207,15 +24051,6 @@
   )
 )
 
-(define-property user-data
-  (of-object "GtkNotebook")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkNotebook")
   (prop-type "GParamString")
@@ -25417,201 +24252,177 @@
 (define-property double-buffered
   (of-object "GtkNotebook")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property border-width
+(define-property halign
   (of-object "GtkNotebook")
-  (prop-type "GParamUInt")
-  (docs "The width of the empty border outside the containers children")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property resize-mode
+(define-property valign
   (of-object "GtkNotebook")
   (prop-type "GParamEnum")
-  (docs "Specify how resize events are handled")
+  (docs "How to position in extra vertical space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property child
-  (of-object "GtkNotebook")
-  (prop-type "GParamObject")
-  (docs "Can be used to add a new child to the container")
-  (readable #f)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property tab-pos
+(define-property margin-left
   (of-object "GtkNotebook")
-  (prop-type "GParamEnum")
-  (docs "Which side of the notebook holds the tabs")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-tabs
+(define-property margin-right
   (of-object "GtkNotebook")
-  (prop-type "GParamBoolean")
-  (docs "Whether tabs should be shown or not")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-border
+(define-property margin-top
   (of-object "GtkNotebook")
-  (prop-type "GParamBoolean")
-  (docs "Whether the border should be shown or not")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property scrollable
+(define-property margin-bottom
   (of-object "GtkNotebook")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, scroll arrows are added if there are too many tabs to fit")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tab-border
+(define-property margin
   (of-object "GtkNotebook")
-  (prop-type "GParamUInt")
-  (docs "Width of the border around the tab labels")
-  (readable #f)
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
+  (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tab-hborder
+(define-property border-width
   (of-object "GtkNotebook")
   (prop-type "GParamUInt")
-  (docs "Width of the horizontal border of tab labels")
+  (docs "The width of the empty border outside the containers children")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tab-vborder
+(define-property resize-mode
   (of-object "GtkNotebook")
-  (prop-type "GParamUInt")
-  (docs "Width of the vertical border of tab labels")
+  (prop-type "GParamEnum")
+  (docs "Specify how resize events are handled")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property page
+(define-property child
   (of-object "GtkNotebook")
-  (prop-type "GParamInt")
-  (docs "The index of the current page")
-  (readable #t)
+  (prop-type "GParamObject")
+  (docs "Can be used to add a new child to the container")
+  (readable #f)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property enable-popup
+(define-property tab-pos
   (of-object "GtkNotebook")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, pressing the right mouse button on the notebook pops up a menu that you can use to go to a page")
+  (prop-type "GParamEnum")
+  (docs "Which side of the notebook holds the tabs")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property group-id
+(define-property show-tabs
   (of-object "GtkNotebook")
-  (prop-type "GParamInt")
-  (docs "Group ID for tabs drag and drop")
+  (prop-type "GParamBoolean")
+  (docs "Whether tabs should be shown")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property group
+(define-property show-border
   (of-object "GtkNotebook")
-  (prop-type "GParamPointer")
-  (docs "Group for tabs drag and drop")
+  (prop-type "GParamBoolean")
+  (docs "Whether the border should be shown")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property homogeneous
+(define-property scrollable
   (of-object "GtkNotebook")
   (prop-type "GParamBoolean")
-  (docs "Whether tabs should have homogeneous sizes")
+  (docs "If TRUE, scroll arrows are added if there are too many tabs to fit")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-;; From GtkObject
-
-(define-signal destroy
-  (of-object "GtkObject")
-  (return-type "void")
-  (when "unknown")
-)
-
-(define-property user-data
-  (of-object "GtkObject")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+(define-property page
+  (of-object "GtkNotebook")
+  (prop-type "GParamInt")
+  (docs "The index of the current page")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-;; From GtkOptionMenu
-
-(define-signal changed
-  (of-object "GtkOptionMenu")
-  (return-type "void")
-  (when "last")
-)
-
-(define-property use-action-appearance
-  (of-object "GtkOptionMenu")
+(define-property enable-popup
+  (of-object "GtkNotebook")
   (prop-type "GParamBoolean")
-  (docs "Whether to use the related actions appearance properties")
+  (docs "If TRUE, pressing the right mouse button on the notebook pops up a menu that you can use to go to a page")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property related-action
-  (of-object "GtkOptionMenu")
-  (prop-type "GParamObject")
-  (docs "The action this activatable will activate and receive updates from")
+(define-property group
+  (of-object "GtkNotebook")
+  (prop-type "GParamPointer")
+  (docs "Group for tabs drag and drop")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property user-data
-  (of-object "GtkOptionMenu")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+;; From GtkObject
+
+(define-signal destroy
+  (of-object "GtkObject")
+  (return-type "void")
+  (when "unknown")
 )
 
+;; From GtkOffscreenWindow
+
 (define-property name
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamString")
   (docs "The name of the widget")
   (readable #t)
@@ -25620,7 +24431,7 @@
 )
 
 (define-property parent
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamObject")
   (docs "The parent widget of this widget. Must be a Container widget")
   (readable #t)
@@ -25629,7 +24440,7 @@
 )
 
 (define-property width-request
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamInt")
   (docs "Override for width request of the widget, or -1 if natural request should be used")
   (readable #t)
@@ -25638,7 +24449,7 @@
 )
 
 (define-property height-request
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamInt")
   (docs "Override for height request of the widget, or -1 if natural request should be used")
   (readable #t)
@@ -25647,7 +24458,7 @@
 )
 
 (define-property visible
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamBoolean")
   (docs "Whether the widget is visible")
   (readable #t)
@@ -25656,7 +24467,7 @@
 )
 
 (define-property sensitive
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamBoolean")
   (docs "Whether the widget responds to input")
   (readable #t)
@@ -25665,7 +24476,7 @@
 )
 
 (define-property app-paintable
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamBoolean")
   (docs "Whether the application will paint directly on the widget")
   (readable #t)
@@ -25674,7 +24485,7 @@
 )
 
 (define-property can-focus
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamBoolean")
   (docs "Whether the widget can accept the input focus")
   (readable #t)
@@ -25683,7 +24494,7 @@
 )
 
 (define-property has-focus
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamBoolean")
   (docs "Whether the widget has the input focus")
   (readable #t)
@@ -25692,7 +24503,7 @@
 )
 
 (define-property is-focus
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamBoolean")
   (docs "Whether the widget is the focus widget within the toplevel")
   (readable #t)
@@ -25701,7 +24512,7 @@
 )
 
 (define-property can-default
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamBoolean")
   (docs "Whether the widget can be the default widget")
   (readable #t)
@@ -25710,7 +24521,7 @@
 )
 
 (define-property has-default
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamBoolean")
   (docs "Whether the widget is the default widget")
   (readable #t)
@@ -25719,7 +24530,7 @@
 )
 
 (define-property receives-default
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamBoolean")
   (docs "If TRUE, the widget will receive the default action when it is focused")
   (readable #t)
@@ -25728,7 +24539,7 @@
 )
 
 (define-property composite-child
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamBoolean")
   (docs "Whether the widget is part of a composite widget")
   (readable #t)
@@ -25737,7 +24548,7 @@
 )
 
 (define-property style
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamObject")
   (docs "The style of the widget, which contains information about how it will look (colors etc)")
   (readable #t)
@@ -25746,7 +24557,7 @@
 )
 
 (define-property events
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamFlags")
   (docs "The event mask that decides what kind of GdkEvents this widget gets")
   (readable #t)
@@ -25755,7 +24566,7 @@
 )
 
 (define-property extension-events
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamEnum")
   (docs "The mask that decides what kind of extension events this widget gets")
   (readable #t)
@@ -25764,7 +24575,7 @@
 )
 
 (define-property no-show-all
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamBoolean")
   (docs "Whether gtk_widget_show_all() should not affect this widget")
   (readable #t)
@@ -25773,7 +24584,7 @@
 )
 
 (define-property has-tooltip
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamBoolean")
   (docs "Whether this widget has a tooltip")
   (readable #t)
@@ -25782,7 +24593,7 @@
 )
 
 (define-property tooltip-markup
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamString")
   (docs "The contents of the tooltip for this widget")
   (readable #t)
@@ -25791,7 +24602,7 @@
 )
 
 (define-property tooltip-text
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamString")
   (docs "The contents of the tooltip for this widget")
   (readable #t)
@@ -25800,7 +24611,7 @@
 )
 
 (define-property window
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamObject")
   (docs "The widget's window if it is realized")
   (readable #t)
@@ -25809,16 +24620,79 @@
 )
 
 (define-property double-buffered
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
 (define-property border-width
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamUInt")
   (docs "The width of the empty border outside the containers children")
   (readable #t)
@@ -25827,7 +24701,7 @@
 )
 
 (define-property resize-mode
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamEnum")
   (docs "Specify how resize events are handled")
   (readable #t)
@@ -25836,7 +24710,7 @@
 )
 
 (define-property child
-  (of-object "GtkOptionMenu")
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamObject")
   (docs "Can be used to add a new child to the container")
   (readable #f)
@@ -25844,91 +24718,244 @@
   (construct-only #f)
 )
 
-(define-property label
-  (of-object "GtkOptionMenu")
+(define-property type
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamEnum")
+  (docs "The type of the window")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property title
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamString")
-  (docs "Text of the label widget inside the button, if the button contains a label widget")
+  (docs "The title of the window")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property image
-  (of-object "GtkOptionMenu")
+(define-property role
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamString")
+  (docs "Unique identifier for the window to be used when restoring a session")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property resizable
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamBoolean")
+  (docs "If TRUE, users can resize the window")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property modal
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamBoolean")
+  (docs "If TRUE, the window is modal (other windows are not usable while this one is up)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property window-position
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamEnum")
+  (docs "The initial position of the window")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property default-width
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamInt")
+  (docs "The default width of the window, used when initially showing the window")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property default-height
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamInt")
+  (docs "The default height of the window, used when initially showing the window")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property destroy-with-parent
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamBoolean")
+  (docs "If this window should be destroyed when the parent is destroyed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property icon
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamObject")
-  (docs "Child widget to appear next to the button text")
+  (docs "Icon for this window")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property relief
-  (of-object "GtkOptionMenu")
+(define-property icon-name
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamString")
+  (docs "Name of the themed icon for this window")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property screen
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamObject")
+  (docs "The screen where this window will be displayed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property type-hint
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamEnum")
-  (docs "The border relief style")
+  (docs "Hint to help the desktop environment understand what kind of window this is and how to treat it.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property use-underline
-  (of-object "GtkOptionMenu")
+(define-property skip-taskbar-hint
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamBoolean")
-  (docs "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key")
+  (docs "TRUE if the window should not be in the task bar.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property use-stock
-  (of-object "GtkOptionMenu")
+(define-property skip-pager-hint
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamBoolean")
-  (docs "If set, the label is used to pick a stock item instead of being displayed")
+  (docs "TRUE if the window should not be in the pager.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property focus-on-click
-  (of-object "GtkOptionMenu")
+(define-property urgency-hint
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamBoolean")
-  (docs "Whether the button grabs focus when it is clicked with the mouse")
+  (docs "TRUE if the window should be brought to the user's attention.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property xalign
-  (of-object "GtkOptionMenu")
-  (prop-type "GParamFloat")
-  (docs "Horizontal position of child in available space. 0.0 is left aligned, 1.0 is right aligned")
+(define-property accept-focus
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamBoolean")
+  (docs "TRUE if the window should receive the input focus.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property yalign
-  (of-object "GtkOptionMenu")
-  (prop-type "GParamFloat")
-  (docs "Vertical position of child in available space. 0.0 is top aligned, 1.0 is bottom aligned")
+(define-property focus-on-map
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamBoolean")
+  (docs "TRUE if the window should receive the input focus when mapped.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property image-position
-  (of-object "GtkOptionMenu")
+(define-property decorated
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamBoolean")
+  (docs "Whether the window should be decorated by the window manager")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property deletable
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamBoolean")
+  (docs "Whether the window frame should have a close button")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property gravity
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamEnum")
-  (docs "The position of the image relative to the text")
+  (docs "The window gravity of the window")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property menu
-  (of-object "GtkOptionMenu")
+(define-property transient-for
+  (of-object "GtkOffscreenWindow")
   (prop-type "GParamObject")
-  (docs "The menu of options")
+  (docs "The transient parent of the dialog")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property opacity
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamDouble")
+  (docs "The opacity of the window, from 0 to 1")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property is-active
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamBoolean")
+  (docs "Whether the toplevel is the current active window")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property has-toplevel-focus
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamBoolean")
+  (docs "Whether the input focus is within this GtkWindow")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property startup-id
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamString")
+  (docs "Unique startup identifier for the window used by startup-notification")
+  (readable #f)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property mnemonics-visible
+  (of-object "GtkOffscreenWindow")
+  (prop-type "GParamBoolean")
+  (docs "Whether mnemonics are currently visible in this window")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -26001,15 +25028,6 @@
   (construct-only #f)
 )
 
-(define-property user-data
-  (of-object "GtkPaned")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkPaned")
   (prop-type "GParamString")
@@ -26211,326 +25229,135 @@
 (define-property double-buffered
   (of-object "GtkPaned")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property border-width
+(define-property halign
   (of-object "GtkPaned")
-  (prop-type "GParamUInt")
-  (docs "The width of the empty border outside the containers children")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property resize-mode
+(define-property valign
   (of-object "GtkPaned")
   (prop-type "GParamEnum")
-  (docs "Specify how resize events are handled")
+  (docs "How to position in extra vertical space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property child
-  (of-object "GtkPaned")
-  (prop-type "GParamObject")
-  (docs "Can be used to add a new child to the container")
-  (readable #f)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property position
+(define-property margin-left
   (of-object "GtkPaned")
   (prop-type "GParamInt")
-  (docs "Position of paned separator in pixels (0 means all the way to the left/top)")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property position-set
-  (of-object "GtkPaned")
-  (prop-type "GParamBoolean")
-  (docs "TRUE if the Position property should be used")
+  (docs "Pixels of extra space on the left side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property min-position
+(define-property margin-right
   (of-object "GtkPaned")
   (prop-type "GParamInt")
-  (docs "Smallest possible value for the 'position' property")
+  (docs "Pixels of extra space on the right side")
   (readable #t)
-  (writable #f)
+  (writable #t)
   (construct-only #f)
 )
 
-(define-property max-position
+(define-property margin-top
   (of-object "GtkPaned")
   (prop-type "GParamInt")
-  (docs "Largest possible value for the 'position' property")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-;; From GtkPixmap
-
-(define-property user-data
-  (of-object "GtkPixmap")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property name
-  (of-object "GtkPixmap")
-  (prop-type "GParamString")
-  (docs "The name of the widget")
+  (docs "Pixels of extra space on the top side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property parent
-  (of-object "GtkPixmap")
-  (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 "GtkPixmap")
+(define-property margin-bottom
+  (of-object "GtkPaned")
   (prop-type "GParamInt")
-  (docs "Override for width request of the widget, or -1 if natural request should be used")
+  (docs "Pixels of extra space on the bottom side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property height-request
-  (of-object "GtkPixmap")
+(define-property margin
+  (of-object "GtkPaned")
   (prop-type "GParamInt")
-  (docs "Override for height request of the widget, or -1 if natural request should be used")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property visible
-  (of-object "GtkPixmap")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is visible")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property sensitive
-  (of-object "GtkPixmap")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget responds to input")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property app-paintable
-  (of-object "GtkPixmap")
-  (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 "GtkPixmap")
-  (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 "GtkPixmap")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget has the input focus")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property is-focus
-  (of-object "GtkPixmap")
-  (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 "GtkPixmap")
-  (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 "GtkPixmap")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is the default widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property receives-default
-  (of-object "GtkPixmap")
-  (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 "GtkPixmap")
-  (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 "GtkPixmap")
-  (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 "GtkPixmap")
-  (prop-type "GParamFlags")
-  (docs "The event mask that decides what kind of GdkEvents this widget gets")
+(define-property border-width
+  (of-object "GtkPaned")
+  (prop-type "GParamUInt")
+  (docs "The width of the empty border outside the containers children")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property extension-events
-  (of-object "GtkPixmap")
+(define-property resize-mode
+  (of-object "GtkPaned")
   (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 "GtkPixmap")
-  (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 "GtkPixmap")
-  (prop-type "GParamBoolean")
-  (docs "Whether this widget has a tooltip")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property tooltip-markup
-  (of-object "GtkPixmap")
-  (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 "GtkPixmap")
-  (prop-type "GParamString")
-  (docs "The contents of the tooltip for this widget")
+  (docs "Specify how resize events are handled")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property window
-  (of-object "GtkPixmap")
+(define-property child
+  (of-object "GtkPaned")
   (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 "GtkPixmap")
-  (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
-  (readable #t)
+  (docs "Can be used to add a new child to the container")
+  (readable #f)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property xalign
-  (of-object "GtkPixmap")
-  (prop-type "GParamFloat")
-  (docs "The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL layouts.")
+(define-property position
+  (of-object "GtkPaned")
+  (prop-type "GParamInt")
+  (docs "Position of paned separator in pixels (0 means all the way to the left/top)")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property yalign
-  (of-object "GtkPixmap")
-  (prop-type "GParamFloat")
-  (docs "The vertical alignment, from 0 (top) to 1 (bottom)")
+(define-property position-set
+  (of-object "GtkPaned")
+  (prop-type "GParamBoolean")
+  (docs "TRUE if the Position property should be used")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property xpad
-  (of-object "GtkPixmap")
+(define-property min-position
+  (of-object "GtkPaned")
   (prop-type "GParamInt")
-  (docs "The amount of space to add on the left and right of the widget, in pixels")
+  (docs "Smallest possible value for the 'position' property")
   (readable #t)
-  (writable #t)
+  (writable #f)
   (construct-only #f)
 )
 
-(define-property ypad
-  (of-object "GtkPixmap")
+(define-property max-position
+  (of-object "GtkPaned")
   (prop-type "GParamInt")
-  (docs "The amount of space to add on the top and bottom of the widget, in pixels")
+  (docs "Largest possible value for the 'position' property")
   (readable #t)
-  (writable #t)
+  (writable #f)
   (construct-only #f)
 )
 
@@ -26542,15 +25369,6 @@
   (when "last")
 )
 
-(define-property user-data
-  (of-object "GtkPlug")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkPlug")
   (prop-type "GParamString")
@@ -26752,7 +25570,70 @@
 (define-property double-buffered
   (of-object "GtkPlug")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkPlug")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkPlug")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkPlug")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkPlug")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkPlug")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkPlug")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkPlug")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -26812,24 +25693,6 @@
   (construct-only #f)
 )
 
-(define-property allow-shrink
-  (of-object "GtkPlug")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property allow-grow
-  (of-object "GtkPlug")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, users can expand the window beyond its minimum size")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property resizable
   (of-object "GtkPlug")
   (prop-type "GParamBoolean")
@@ -27037,251 +25900,33 @@
   (construct-only #f)
 )
 
-(define-property embedded
-  (of-object "GtkPlug")
-  (prop-type "GParamBoolean")
-  (docs "Whether or not the plug is embedded")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property socket-window
+(define-property mnemonics-visible
   (of-object "GtkPlug")
-  (prop-type "GParamObject")
-  (docs "The window of the socket the plug is embedded in")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-;; From GtkPreview
-
-(define-property user-data
-  (of-object "GtkPreview")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property name
-  (of-object "GtkPreview")
-  (prop-type "GParamString")
-  (docs "The name of the widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property parent
-  (of-object "GtkPreview")
-  (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 "GtkPreview")
-  (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 "GtkPreview")
-  (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 "GtkPreview")
   (prop-type "GParamBoolean")
-  (docs "Whether the widget is visible")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property sensitive
-  (of-object "GtkPreview")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget responds to input")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property app-paintable
-  (of-object "GtkPreview")
-  (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 "GtkPreview")
-  (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 "GtkPreview")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget has the input focus")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property is-focus
-  (of-object "GtkPreview")
-  (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 "GtkPreview")
-  (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 "GtkPreview")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is the default widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property receives-default
-  (of-object "GtkPreview")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, the widget will receive the default action when it is focused")
+  (docs "Whether mnemonics are currently visible in this window")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property composite-child
-  (of-object "GtkPreview")
+(define-property embedded
+  (of-object "GtkPlug")
   (prop-type "GParamBoolean")
-  (docs "Whether the widget is part of a composite widget")
+  (docs "Whether the plug is embedded")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property style
-  (of-object "GtkPreview")
-  (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 "GtkPreview")
-  (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 "GtkPreview")
-  (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 "GtkPreview")
-  (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 "GtkPreview")
-  (prop-type "GParamBoolean")
-  (docs "Whether this widget has a tooltip")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property tooltip-markup
-  (of-object "GtkPreview")
-  (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 "GtkPreview")
-  (prop-type "GParamString")
-  (docs "The contents of the tooltip for this widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property window
-  (of-object "GtkPreview")
+(define-property socket-window
+  (of-object "GtkPlug")
   (prop-type "GParamObject")
-  (docs "The widget's window if it is realized")
+  (docs "The window of the socket the plug is embedded in")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property double-buffered
-  (of-object "GtkPreview")
-  (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property expand
-  (of-object "GtkPreview")
-  (prop-type "GParamBoolean")
-  (docs "Whether the preview widget should take up the entire space it is allocated")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 ;; From GtkPrinter
 
 (define-signal details-acquired
@@ -27685,7 +26330,7 @@
 (define-property has-selection
   (of-object "GtkPrintOperation")
   (prop-type "GParamBoolean")
-  (docs "TRUE if a selecion exists.")
+  (docs "TRUE if a selection exists.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -27732,15 +26377,6 @@
 
 ;; From GtkPageSetupUnixDialog
 
-(define-property user-data
-  (of-object "GtkPageSetupUnixDialog")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkPageSetupUnixDialog")
   (prop-type "GParamString")
@@ -27942,7 +26578,70 @@
 (define-property double-buffered
   (of-object "GtkPageSetupUnixDialog")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkPageSetupUnixDialog")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkPageSetupUnixDialog")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkPageSetupUnixDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkPageSetupUnixDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkPageSetupUnixDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkPageSetupUnixDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkPageSetupUnixDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -28002,24 +26701,6 @@
   (construct-only #f)
 )
 
-(define-property allow-shrink
-  (of-object "GtkPageSetupUnixDialog")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property allow-grow
-  (of-object "GtkPageSetupUnixDialog")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, users can expand the window beyond its minimum size")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property resizable
   (of-object "GtkPageSetupUnixDialog")
   (prop-type "GParamBoolean")
@@ -28227,10 +26908,10 @@
   (construct-only #f)
 )
 
-(define-property has-separator
+(define-property mnemonics-visible
   (of-object "GtkPageSetupUnixDialog")
   (prop-type "GParamBoolean")
-  (docs "The dialog has a separator bar above its buttons")
+  (docs "Whether mnemonics are currently visible in this window")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -28238,15 +26919,6 @@
 
 ;; From GtkPrintUnixDialog
 
-(define-property user-data
-  (of-object "GtkPrintUnixDialog")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkPrintUnixDialog")
   (prop-type "GParamString")
@@ -28448,7 +27120,70 @@
 (define-property double-buffered
   (of-object "GtkPrintUnixDialog")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkPrintUnixDialog")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkPrintUnixDialog")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkPrintUnixDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkPrintUnixDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkPrintUnixDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkPrintUnixDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkPrintUnixDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -28508,24 +27243,6 @@
   (construct-only #f)
 )
 
-(define-property allow-shrink
-  (of-object "GtkPrintUnixDialog")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property allow-grow
-  (of-object "GtkPrintUnixDialog")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, users can expand the window beyond its minimum size")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property resizable
   (of-object "GtkPrintUnixDialog")
   (prop-type "GParamBoolean")
@@ -28733,10 +27450,10 @@
   (construct-only #f)
 )
 
-(define-property has-separator
+(define-property mnemonics-visible
   (of-object "GtkPrintUnixDialog")
   (prop-type "GParamBoolean")
-  (docs "The dialog has a separator bar above its buttons")
+  (docs "Whether mnemonics are currently visible in this window")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -28814,266 +27531,35 @@
   (construct-only #f)
 )
 
-;; From GtkProgress
-
-(define-property user-data
-  (of-object "GtkProgress")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property name
-  (of-object "GtkProgress")
-  (prop-type "GParamString")
-  (docs "The name of the widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property parent
-  (of-object "GtkProgress")
-  (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 "GtkProgress")
-  (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 "GtkProgress")
-  (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 "GtkProgress")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is visible")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property sensitive
-  (of-object "GtkProgress")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget responds to input")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property app-paintable
-  (of-object "GtkProgress")
-  (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 "GtkProgress")
-  (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 "GtkProgress")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget has the input focus")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property is-focus
-  (of-object "GtkProgress")
-  (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 "GtkProgress")
-  (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 "GtkProgress")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is the default widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property receives-default
-  (of-object "GtkProgress")
-  (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 "GtkProgress")
-  (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 "GtkProgress")
-  (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 "GtkProgress")
-  (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 "GtkProgress")
-  (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 "GtkProgress")
-  (prop-type "GParamBoolean")
-  (docs "Whether gtk_widget_show_all() should not affect this widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
+;; From GtkPrintSettings
 
-(define-property has-tooltip
-  (of-object "GtkProgress")
-  (prop-type "GParamBoolean")
-  (docs "Whether this widget has a tooltip")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property tooltip-markup
-  (of-object "GtkProgress")
-  (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 "GtkProgress")
-  (prop-type "GParamString")
-  (docs "The contents of the tooltip for this widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property window
-  (of-object "GtkProgress")
-  (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 "GtkProgress")
-  (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property activity-mode
-  (of-object "GtkProgress")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, the GtkProgress is in activity mode, meaning that it signals something is happening, but not how much of the activity is finished. This is used when you're doing something but don't know how long it will take.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property show-text
-  (of-object "GtkProgress")
-  (prop-type "GParamBoolean")
-  (docs "Whether the progress is shown as text.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
+;; From GtkPrintOperationPreview
 
-(define-property text-xalign
-  (of-object "GtkProgress")
-  (prop-type "GParamFloat")
-  (docs "The horizontal text alignment, from 0 (left) to 1 (right). Reversed for RTL layouts.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal ready
+  (of-object "GtkPrintOperationPreview")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GtkPrintContext*" "p0")
+  )
 )
 
-(define-property text-yalign
-  (of-object "GtkProgress")
-  (prop-type "GParamFloat")
-  (docs "The vertical text alignment, from 0 (top) to 1 (bottom).")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal got-page-size
+  (of-object "GtkPrintOperationPreview")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GtkPrintContext*" "p0")
+    '("GtkPageSetup*" "p1")
+  )
 )
 
 ;; From GtkProgressBar
 
-(define-property user-data
+(define-property orientation
   (of-object "GtkProgressBar")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamEnum")
+  (docs "The orientation of the orientable")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29280,133 +27766,124 @@
 (define-property double-buffered
   (of-object "GtkProgressBar")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property activity-mode
-  (of-object "GtkProgressBar")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, the GtkProgress is in activity mode, meaning that it signals something is happening, but not how much of the activity is finished. This is used when you're doing something but don't know how long it will take.")
+  (docs "Whether the widget is double buffered")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-text
+(define-property halign
   (of-object "GtkProgressBar")
-  (prop-type "GParamBoolean")
-  (docs "Whether the progress is shown as text.")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property text-xalign
+(define-property valign
   (of-object "GtkProgressBar")
-  (prop-type "GParamFloat")
-  (docs "The horizontal text alignment, from 0 (left) to 1 (right). Reversed for RTL layouts.")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property text-yalign
+(define-property margin-left
   (of-object "GtkProgressBar")
-  (prop-type "GParamFloat")
-  (docs "The vertical text alignment, from 0 (top) to 1 (bottom).")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property fraction
+(define-property margin-right
   (of-object "GtkProgressBar")
-  (prop-type "GParamDouble")
-  (docs "The fraction of total work that has been completed")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property pulse-step
+(define-property margin-top
   (of-object "GtkProgressBar")
-  (prop-type "GParamDouble")
-  (docs "The fraction of total progress to move the bouncing block when pulsed")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property orientation
+(define-property margin-bottom
   (of-object "GtkProgressBar")
-  (prop-type "GParamEnum")
-  (docs "Orientation and growth direction of the progress bar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property text
+(define-property margin
   (of-object "GtkProgressBar")
-  (prop-type "GParamString")
-  (docs "Text to be displayed in the progress bar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property ellipsize
+(define-property fraction
   (of-object "GtkProgressBar")
-  (prop-type "GParamEnum")
-  (docs "The preferred place to ellipsize the string, if the progress bar does not have enough room to display the entire string, if at all.")
+  (prop-type "GParamDouble")
+  (docs "The fraction of total work that has been completed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property adjustment
+(define-property pulse-step
   (of-object "GtkProgressBar")
-  (prop-type "GParamObject")
-  (docs "The GtkAdjustment connected to the progress bar (Deprecated)")
+  (prop-type "GParamDouble")
+  (docs "The fraction of total progress to move the bouncing block when pulsed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property bar-style
+(define-property inverted
   (of-object "GtkProgressBar")
-  (prop-type "GParamEnum")
-  (docs "Specifies the visual style of the bar in percentage mode (Deprecated)")
+  (prop-type "GParamBoolean")
+  (docs "Invert the direction in which the progress bar grows")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property activity-step
+(define-property text
   (of-object "GtkProgressBar")
-  (prop-type "GParamUInt")
-  (docs "The increment used for each iteration in activity mode (Deprecated)")
+  (prop-type "GParamString")
+  (docs "Text to be displayed in the progress bar")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property activity-blocks
+(define-property show-text
   (of-object "GtkProgressBar")
-  (prop-type "GParamUInt")
-  (docs "The number of blocks which can fit in the progress bar area in activity mode (Deprecated)")
+  (prop-type "GParamBoolean")
+  (docs "Whether the progress is shown as text.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property discrete-blocks
+(define-property ellipsize
   (of-object "GtkProgressBar")
-  (prop-type "GParamUInt")
-  (docs "The number of discrete blocks in a progress bar (when shown in the discrete style)")
+  (prop-type "GParamEnum")
+  (docs "The preferred place to ellipsize the string, if the progress bar does not have enough room to display the entire string, if at all.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29420,15 +27897,6 @@
   (when "first")
 )
 
-(define-property use-action-appearance
-  (of-object "GtkRadioButton")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the related actions appearance properties")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property related-action
   (of-object "GtkRadioButton")
   (prop-type "GParamObject")
@@ -29438,10 +27906,10 @@
   (construct-only #f)
 )
 
-(define-property user-data
+(define-property use-action-appearance
   (of-object "GtkRadioButton")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29648,7 +28116,70 @@
 (define-property double-buffered
   (of-object "GtkRadioButton")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkRadioButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkRadioButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkRadioButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkRadioButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkRadioButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkRadioButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkRadioButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29765,7 +28296,7 @@
 (define-property active
   (of-object "GtkRadioButton")
   (prop-type "GParamBoolean")
-  (docs "If the toggle button should be pressed in or not")
+  (docs "If the toggle button should be pressed in")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29800,15 +28331,6 @@
 
 ;; From GtkRadioToolButton
 
-(define-property use-action-appearance
-  (of-object "GtkRadioToolButton")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the related actions appearance properties")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property related-action
   (of-object "GtkRadioToolButton")
   (prop-type "GParamObject")
@@ -29818,10 +28340,10 @@
   (construct-only #f)
 )
 
-(define-property user-data
+(define-property use-action-appearance
   (of-object "GtkRadioToolButton")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -30028,7 +28550,70 @@
 (define-property double-buffered
   (of-object "GtkRadioToolButton")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkRadioToolButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkRadioToolButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkRadioToolButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkRadioToolButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkRadioToolButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkRadioToolButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkRadioToolButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -30145,7 +28730,7 @@
 (define-property active
   (of-object "GtkRadioToolButton")
   (prop-type "GParamBoolean")
-  (docs "If the toggle button should be pressed in or not")
+  (docs "If the toggle button should be pressed in")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -30306,6 +28891,15 @@
   (construct-only #f)
 )
 
+(define-property always-show-image
+  (of-object "GtkRadioAction")
+  (prop-type "GParamBoolean")
+  (docs "Whether the image will always be shown")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property draw-as-radio
   (of-object "GtkRadioAction")
   (prop-type "GParamBoolean")
@@ -30318,7 +28912,7 @@
 (define-property active
   (of-object "GtkRadioAction")
   (prop-type "GParamBoolean")
-  (docs "If the toggle action should be active in or not")
+  (docs "Whether the toggle action should be active")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -30359,15 +28953,6 @@
   (when "first")
 )
 
-(define-property use-action-appearance
-  (of-object "GtkRadioMenuItem")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the related actions appearance properties")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property related-action
   (of-object "GtkRadioMenuItem")
   (prop-type "GParamObject")
@@ -30377,10 +28962,10 @@
   (construct-only #f)
 )
 
-(define-property user-data
+(define-property use-action-appearance
   (of-object "GtkRadioMenuItem")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -30587,7 +29172,70 @@
 (define-property double-buffered
   (of-object "GtkRadioMenuItem")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkRadioMenuItem")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkRadioMenuItem")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkRadioMenuItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkRadioMenuItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkRadioMenuItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkRadioMenuItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkRadioMenuItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -30746,15 +29394,6 @@
   (construct-only #f)
 )
 
-(define-property user-data
-  (of-object "GtkRange")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkRange")
   (prop-type "GParamString")
@@ -30956,7 +29595,70 @@
 (define-property double-buffered
   (of-object "GtkRange")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkRange")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkRange")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkRange")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkRange")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkRange")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkRange")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkRange")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -31036,19 +29738,28 @@
 
 ;; From GtkRecentAction
 
-(define-property show-private
+(define-property filter
   (of-object "GtkRecentAction")
-  (prop-type "GParamBoolean")
-  (docs "Whether the private items should be displayed")
+  (prop-type "GParamObject")
+  (docs "The current filter for selecting which resources are displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-not-found
+(define-property limit
+  (of-object "GtkRecentAction")
+  (prop-type "GParamInt")
+  (docs "The maximum number of items to be displayed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property local-only
   (of-object "GtkRecentAction")
   (prop-type "GParamBoolean")
-  (docs "Whether the items pointing to unavailable resources should be displayed")
+  (docs "Whether the selected resource(s) should be limited to local file: URIs")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -31063,46 +29774,37 @@
   (construct-only #t)
 )
 
-(define-property show-icons
+(define-property select-multiple
   (of-object "GtkRecentAction")
   (prop-type "GParamBoolean")
-  (docs "Whether there should be an icon near the item")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property filter
-  (of-object "GtkRecentAction")
-  (prop-type "GParamObject")
-  (docs "The current filter for selecting which resources are displayed")
+  (docs "Whether to allow multiple items to be selected")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property local-only
+(define-property show-icons
   (of-object "GtkRecentAction")
   (prop-type "GParamBoolean")
-  (docs "Whether the selected resource(s) should be limited to local file: URIs")
+  (docs "Whether there should be an icon near the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property sort-type
+(define-property show-not-found
   (of-object "GtkRecentAction")
-  (prop-type "GParamEnum")
-  (docs "The sorting order of the items displayed")
+  (prop-type "GParamBoolean")
+  (docs "Whether the items pointing to unavailable resources should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property select-multiple
+(define-property show-private
   (of-object "GtkRecentAction")
   (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple items to be selected")
+  (docs "Whether the private items should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -31117,10 +29819,10 @@
   (construct-only #f)
 )
 
-(define-property limit
+(define-property sort-type
   (of-object "GtkRecentAction")
-  (prop-type "GParamInt")
-  (docs "The maximum number of items to be displayed")
+  (prop-type "GParamEnum")
+  (docs "The sorting order of the items displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -31261,6 +29963,15 @@
   (construct-only #f)
 )
 
+(define-property always-show-image
+  (of-object "GtkRecentAction")
+  (prop-type "GParamBoolean")
+  (docs "Whether the image will always be shown")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property show-numbers
   (of-object "GtkRecentAction")
   (prop-type "GParamBoolean")
@@ -31272,31 +29983,40 @@
 
 ;; From GtkRecentChooser
 
-(define-signal selection-changed
+(define-signal item-activated
   (of-object "GtkRecentChooser")
   (return-type "void")
   (when "last")
 )
 
-(define-signal item-activated
+(define-signal selection-changed
   (of-object "GtkRecentChooser")
   (return-type "void")
   (when "last")
 )
 
-(define-property show-private
+(define-property filter
   (of-object "GtkRecentChooser")
-  (prop-type "GParamBoolean")
-  (docs "Whether the private items should be displayed")
+  (prop-type "GParamObject")
+  (docs "The current filter for selecting which resources are displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-not-found
+(define-property limit
+  (of-object "GtkRecentChooser")
+  (prop-type "GParamInt")
+  (docs "The maximum number of items to be displayed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property local-only
   (of-object "GtkRecentChooser")
   (prop-type "GParamBoolean")
-  (docs "Whether the items pointing to unavailable resources should be displayed")
+  (docs "Whether the selected resource(s) should be limited to local file: URIs")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -31311,46 +30031,37 @@
   (construct-only #t)
 )
 
-(define-property show-icons
+(define-property select-multiple
   (of-object "GtkRecentChooser")
   (prop-type "GParamBoolean")
-  (docs "Whether there should be an icon near the item")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property filter
-  (of-object "GtkRecentChooser")
-  (prop-type "GParamObject")
-  (docs "The current filter for selecting which resources are displayed")
+  (docs "Whether to allow multiple items to be selected")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property local-only
+(define-property show-icons
   (of-object "GtkRecentChooser")
   (prop-type "GParamBoolean")
-  (docs "Whether the selected resource(s) should be limited to local file: URIs")
+  (docs "Whether there should be an icon near the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property sort-type
+(define-property show-not-found
   (of-object "GtkRecentChooser")
-  (prop-type "GParamEnum")
-  (docs "The sorting order of the items displayed")
+  (prop-type "GParamBoolean")
+  (docs "Whether the items pointing to unavailable resources should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property select-multiple
+(define-property show-private
   (of-object "GtkRecentChooser")
   (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple items to be selected")
+  (docs "Whether the private items should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -31365,10 +30076,10 @@
   (construct-only #f)
 )
 
-(define-property limit
+(define-property sort-type
   (of-object "GtkRecentChooser")
-  (prop-type "GParamInt")
-  (docs "The maximum number of items to be displayed")
+  (prop-type "GParamEnum")
+  (docs "The sorting order of the items displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -31376,19 +30087,28 @@
 
 ;; From GtkRecentChooserMenu
 
-(define-property show-private
+(define-property filter
   (of-object "GtkRecentChooserMenu")
-  (prop-type "GParamBoolean")
-  (docs "Whether the private items should be displayed")
+  (prop-type "GParamObject")
+  (docs "The current filter for selecting which resources are displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-not-found
+(define-property limit
+  (of-object "GtkRecentChooserMenu")
+  (prop-type "GParamInt")
+  (docs "The maximum number of items to be displayed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property local-only
   (of-object "GtkRecentChooserMenu")
   (prop-type "GParamBoolean")
-  (docs "Whether the items pointing to unavailable resources should be displayed")
+  (docs "Whether the selected resource(s) should be limited to local file: URIs")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -31403,55 +30123,46 @@
   (construct-only #t)
 )
 
-(define-property show-icons
-  (of-object "GtkRecentChooserMenu")
-  (prop-type "GParamBoolean")
-  (docs "Whether there should be an icon near the item")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property filter
+(define-property related-action
   (of-object "GtkRecentChooserMenu")
   (prop-type "GParamObject")
-  (docs "The current filter for selecting which resources are displayed")
+  (docs "The action this activatable will activate and receive updates from")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property local-only
+(define-property select-multiple
   (of-object "GtkRecentChooserMenu")
   (prop-type "GParamBoolean")
-  (docs "Whether the selected resource(s) should be limited to local file: URIs")
+  (docs "Whether to allow multiple items to be selected")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property sort-type
+(define-property show-icons
   (of-object "GtkRecentChooserMenu")
-  (prop-type "GParamEnum")
-  (docs "The sorting order of the items displayed")
+  (prop-type "GParamBoolean")
+  (docs "Whether there should be an icon near the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property select-multiple
+(define-property show-not-found
   (of-object "GtkRecentChooserMenu")
   (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple items to be selected")
+  (docs "Whether the items pointing to unavailable resources should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property use-action-appearance
+(define-property show-private
   (of-object "GtkRecentChooserMenu")
   (prop-type "GParamBoolean")
-  (docs "Whether to use the related actions appearance properties")
+  (docs "Whether the private items should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -31466,28 +30177,19 @@
   (construct-only #f)
 )
 
-(define-property related-action
-  (of-object "GtkRecentChooserMenu")
-  (prop-type "GParamObject")
-  (docs "The action this activatable will activate and receive updates from")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property limit
+(define-property sort-type
   (of-object "GtkRecentChooserMenu")
-  (prop-type "GParamInt")
-  (docs "The maximum number of items to be displayed")
+  (prop-type "GParamEnum")
+  (docs "The sorting order of the items displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property user-data
+(define-property use-action-appearance
   (of-object "GtkRecentChooserMenu")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -31694,7 +30396,70 @@
 (define-property double-buffered
   (of-object "GtkRecentChooserMenu")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkRecentChooserMenu")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkRecentChooserMenu")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkRecentChooserMenu")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkRecentChooserMenu")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkRecentChooserMenu")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkRecentChooserMenu")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkRecentChooserMenu")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -31819,28 +30584,37 @@
 
 ;; From GtkRecentChooserWidget
 
-(define-property orientation
+(define-property filter
   (of-object "GtkRecentChooserWidget")
-  (prop-type "GParamEnum")
-  (docs "The orientation of the orientable")
+  (prop-type "GParamObject")
+  (docs "The current filter for selecting which resources are displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-private
+(define-property limit
   (of-object "GtkRecentChooserWidget")
-  (prop-type "GParamBoolean")
-  (docs "Whether the private items should be displayed")
+  (prop-type "GParamInt")
+  (docs "The maximum number of items to be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-not-found
+(define-property local-only
   (of-object "GtkRecentChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether the items pointing to unavailable resources should be displayed")
+  (docs "Whether the selected resource(s) should be limited to local file: URIs")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property orientation
+  (of-object "GtkRecentChooserWidget")
+  (prop-type "GParamEnum")
+  (docs "The orientation of the orientable")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -31855,46 +30629,37 @@
   (construct-only #t)
 )
 
-(define-property show-icons
+(define-property select-multiple
   (of-object "GtkRecentChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether there should be an icon near the item")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property filter
-  (of-object "GtkRecentChooserWidget")
-  (prop-type "GParamObject")
-  (docs "The current filter for selecting which resources are displayed")
+  (docs "Whether to allow multiple items to be selected")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property local-only
+(define-property show-icons
   (of-object "GtkRecentChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether the selected resource(s) should be limited to local file: URIs")
+  (docs "Whether there should be an icon near the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property sort-type
+(define-property show-not-found
   (of-object "GtkRecentChooserWidget")
-  (prop-type "GParamEnum")
-  (docs "The sorting order of the items displayed")
+  (prop-type "GParamBoolean")
+  (docs "Whether the items pointing to unavailable resources should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property select-multiple
+(define-property show-private
   (of-object "GtkRecentChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple items to be selected")
+  (docs "Whether the private items should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -31909,19 +30674,10 @@
   (construct-only #f)
 )
 
-(define-property limit
-  (of-object "GtkRecentChooserWidget")
-  (prop-type "GParamInt")
-  (docs "The maximum number of items to be displayed")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property user-data
+(define-property sort-type
   (of-object "GtkRecentChooserWidget")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamEnum")
+  (docs "The sorting order of the items displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -32128,7 +30884,70 @@
 (define-property double-buffered
   (of-object "GtkRecentChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkRecentChooserWidget")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkRecentChooserWidget")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkRecentChooserWidget")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkRecentChooserWidget")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkRecentChooserWidget")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkRecentChooserWidget")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkRecentChooserWidget")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -32181,15 +31000,6 @@
 
 ;; From GtkRecentFilter
 
-(define-property user-data
-  (of-object "GtkRecentFilter")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 ;; From GtkRecentManager
 
 (define-signal changed
@@ -32227,15 +31037,6 @@
   (construct-only #f)
 )
 
-(define-property user-data
-  (of-object "GtkRuler")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkRuler")
   (prop-type "GParamString")
@@ -32437,7 +31238,70 @@
 (define-property double-buffered
   (of-object "GtkRuler")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkRuler")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkRuler")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkRuler")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkRuler")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkRuler")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkRuler")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkRuler")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -32508,15 +31372,6 @@
   (construct-only #f)
 )
 
-(define-property user-data
-  (of-object "GtkScale")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkScale")
   (prop-type "GParamString")
@@ -32718,7 +31573,70 @@
 (define-property double-buffered
   (of-object "GtkScale")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkScale")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkScale")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkScale")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkScale")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkScale")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkScale")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkScale")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -32846,15 +31764,6 @@
   (when "last")
 )
 
-(define-property use-action-appearance
-  (of-object "GtkScaleButton")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the related actions appearance properties")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property orientation
   (of-object "GtkScaleButton")
   (prop-type "GParamEnum")
@@ -32873,10 +31782,10 @@
   (construct-only #f)
 )
 
-(define-property user-data
+(define-property use-action-appearance
   (of-object "GtkScaleButton")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -33083,7 +31992,70 @@
 (define-property double-buffered
   (of-object "GtkScaleButton")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkScaleButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkScaleButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkScaleButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkScaleButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkScaleButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkScaleButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkScaleButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -33244,15 +32216,6 @@
   (construct-only #f)
 )
 
-(define-property user-data
-  (of-object "GtkScrollbar")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkScrollbar")
   (prop-type "GParamString")
@@ -33454,7 +32417,70 @@
 (define-property double-buffered
   (of-object "GtkScrollbar")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkScrollbar")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkScrollbar")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkScrollbar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkScrollbar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkScrollbar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkScrollbar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkScrollbar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -33534,16 +32560,6 @@
 
 ;; From GtkScrolledWindow
 
-(define-signal scroll-child
-  (of-object "GtkScrolledWindow")
-  (return-type "gboolean")
-  (when "last")
-  (parameters
-    '("GtkScrollType" "p0")
-    '("gboolean" "p1")
-  )
-)
-
 (define-signal move-focus-out
   (of-object "GtkScrolledWindow")
   (return-type "void")
@@ -33553,13 +32569,14 @@
   )
 )
 
-(define-property user-data
+(define-signal scroll-child
   (of-object "GtkScrolledWindow")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+  (return-type "gboolean")
+  (when "last")
+  (parameters
+    '("GtkScrollType" "p0")
+    '("gboolean" "p1")
+  )
 )
 
 (define-property name
@@ -33763,7 +32780,70 @@
 (define-property double-buffered
   (of-object "GtkScrolledWindow")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkScrolledWindow")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkScrolledWindow")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkScrolledWindow")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkScrolledWindow")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkScrolledWindow")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkScrolledWindow")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkScrolledWindow")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -33870,15 +32950,6 @@
   (construct-only #f)
 )
 
-(define-property user-data
-  (of-object "GtkSeparator")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkSeparator")
   (prop-type "GParamString")
@@ -34080,23 +33151,77 @@
 (define-property double-buffered
   (of-object "GtkSeparator")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-;; From GtkSeparatorToolItem
+(define-property halign
+  (of-object "GtkSeparator")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
 
-(define-property use-action-appearance
-  (of-object "GtkSeparatorToolItem")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the related actions appearance properties")
+(define-property valign
+  (of-object "GtkSeparator")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
+(define-property margin-left
+  (of-object "GtkSeparator")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkSeparator")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkSeparator")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkSeparator")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkSeparator")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GtkSeparatorToolItem
+
 (define-property related-action
   (of-object "GtkSeparatorToolItem")
   (prop-type "GParamObject")
@@ -34106,10 +33231,10 @@
   (construct-only #f)
 )
 
-(define-property user-data
+(define-property use-action-appearance
   (of-object "GtkSeparatorToolItem")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -34316,7 +33441,70 @@
 (define-property double-buffered
   (of-object "GtkSeparatorToolItem")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkSeparatorToolItem")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkSeparatorToolItem")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkSeparatorToolItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkSeparatorToolItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkSeparatorToolItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkSeparatorToolItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkSeparatorToolItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -34855,46 +34043,46 @@
   (construct-only #f)
 )
 
-(define-property gtk-auto-mnemonics
+(define-property gtk-toolbar-style
   (of-object "GtkSettings")
-  (prop-type "GParamBoolean")
-  (docs "Whether mnemonics should be automatically shown and hidden when the user presses the mnemonic activator.")
+  (prop-type "GParamEnum")
+  (docs "Whether default toolbars have text only, text and icons, icons only, etc.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property gtk-button-images
+(define-property gtk-toolbar-icon-size
   (of-object "GtkSettings")
-  (prop-type "GParamBoolean")
-  (docs "Whether images should be shown on buttons")
+  (prop-type "GParamEnum")
+  (docs "The size of icons in default toolbars.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property gtk-toolbar-style
+(define-property gtk-auto-mnemonics
   (of-object "GtkSettings")
-  (prop-type "GParamEnum")
-  (docs "Whether default toolbars have text only, text and icons, icons only, etc.")
+  (prop-type "GParamBoolean")
+  (docs "Whether mnemonics should be automatically shown and hidden when the user presses the mnemonic activator.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property gtk-toolbar-icon-size
+(define-property gtk-application-prefer-dark-theme
   (of-object "GtkSettings")
-  (prop-type "GParamEnum")
-  (docs "Size of icons in default toolbars")
+  (prop-type "GParamBoolean")
+  (docs "Whether the application prefers to have a dark theme.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property gtk-label-select-on-focus
+(define-property gtk-button-images
   (of-object "GtkSettings")
   (prop-type "GParamBoolean")
-  (docs "Whether to select the contents of a selectable label when it is focused")
+  (docs "Whether images should be shown on buttons")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -34938,6 +34126,8 @@
   (construct-only #f)
 )
 
+;; From GtkSizeRequest
+
 ;; From GtkSocket
 
 (define-signal plug-added
@@ -34952,15 +34142,6 @@
   (when "last")
 )
 
-(define-property user-data
-  (of-object "GtkSocket")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkSocket")
   (prop-type "GParamString")
@@ -35162,7 +34343,70 @@
 (define-property double-buffered
   (of-object "GtkSocket")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkSocket")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkSocket")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkSocket")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkSocket")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkSocket")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkSocket")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkSocket")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -35197,15 +34441,6 @@
 
 ;; From GtkSpinner
 
-(define-property user-data
-  (of-object "GtkSpinner")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkSpinner")
   (prop-type "GParamString")
@@ -35407,235 +34642,70 @@
 (define-property double-buffered
   (of-object "GtkSpinner")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property active
-  (of-object "GtkSpinner")
-  (prop-type "GParamBoolean")
-  (docs "Whether the spinner is active")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-
-;; From GtkSpinner
-
-(define-property user-data
-  (of-object "GtkSpinner")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (docs "Whether the widget is double buffered")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property name
+(define-property halign
   (of-object "GtkSpinner")
-  (prop-type "GParamString")
-  (docs "The name of the widget")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property parent
+(define-property valign
   (of-object "GtkSpinner")
-  (prop-type "GParamObject")
-  (docs "The parent widget of this widget. Must be a Container widget")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property width-request
+(define-property margin-left
   (of-object "GtkSpinner")
   (prop-type "GParamInt")
-  (docs "Override for width request of the widget, or -1 if natural request should be used")
+  (docs "Pixels of extra space on the left side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property height-request
+(define-property margin-right
   (of-object "GtkSpinner")
   (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 "GtkSpinner")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is visible")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property sensitive
-  (of-object "GtkSpinner")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget responds to input")
+  (docs "Pixels of extra space on the right side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property app-paintable
+(define-property margin-top
   (of-object "GtkSpinner")
-  (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 "GtkSpinner")
-  (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 "GtkSpinner")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget has the input focus")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property is-focus
-  (of-object "GtkSpinner")
-  (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 "GtkSpinner")
-  (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 "GtkSpinner")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is the default widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property receives-default
-  (of-object "GtkSpinner")
-  (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 "GtkSpinner")
-  (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 "GtkSpinner")
-  (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 "GtkSpinner")
-  (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 "GtkSpinner")
-  (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 "GtkSpinner")
-  (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 "GtkSpinner")
-  (prop-type "GParamBoolean")
-  (docs "Whether this widget has a tooltip")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property tooltip-markup
-  (of-object "GtkSpinner")
-  (prop-type "GParamString")
-  (docs "The contents of the tooltip for this widget")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property tooltip-text
+(define-property margin-bottom
   (of-object "GtkSpinner")
-  (prop-type "GParamString")
-  (docs "The contents of the tooltip for this widget")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property window
-  (of-object "GtkSpinner")
-  (prop-type "GParamObject")
-  (docs "The widget's window if it is realized")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property double-buffered
+(define-property margin
   (of-object "GtkSpinner")
-  (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -35697,15 +34767,6 @@
   (construct-only #f)
 )
 
-(define-property user-data
-  (of-object "GtkSpinButton")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkSpinButton")
   (prop-type "GParamString")
@@ -35907,7 +34968,70 @@
 (define-property double-buffered
   (of-object "GtkSpinButton")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkSpinButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkSpinButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkSpinButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkSpinButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkSpinButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkSpinButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkSpinButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -36078,7 +35202,7 @@
 (define-property invisible-char-set
   (of-object "GtkSpinButton")
   (prop-type "GParamBoolean")
-  (docs "Whether the invisible char has been set")
+  (docs "Whether the invisible character has been set")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -36285,7 +35409,7 @@
 (define-property adjustment
   (of-object "GtkSpinButton")
   (prop-type "GParamObject")
-  (docs "The adjustment that holds the value of the spinbutton")
+  (docs "The adjustment that holds the value of the spin button")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -36385,15 +35509,6 @@
   (construct-only #f)
 )
 
-(define-property user-data
-  (of-object "GtkStatusbar")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkStatusbar")
   (prop-type "GParamString")
@@ -36595,7 +35710,70 @@
 (define-property double-buffered
   (of-object "GtkStatusbar")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkStatusbar")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkStatusbar")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkStatusbar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkStatusbar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkStatusbar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkStatusbar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkStatusbar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -36796,7 +35974,7 @@
 (define-property visible
   (of-object "GtkStatusIcon")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the status icon is visible")
+  (docs "Whether the status icon is visible")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -36814,21 +35992,12 @@
 (define-property embedded
   (of-object "GtkStatusIcon")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the status icon is embedded")
+  (docs "Whether the status icon is embedded")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property blinking
-  (of-object "GtkStatusIcon")
-  (prop-type "GParamBoolean")
-  (docs "Whether or not the status icon is blinking")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property has-tooltip
   (of-object "GtkStatusIcon")
   (prop-type "GParamBoolean")
@@ -36881,15 +36050,6 @@
 
 ;; From GtkTable
 
-(define-property user-data
-  (of-object "GtkTable")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkTable")
   (prop-type "GParamString")
@@ -37091,7 +36251,70 @@
 (define-property double-buffered
   (of-object "GtkTable")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkTable")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkTable")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkTable")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkTable")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkTable")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkTable")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkTable")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -37171,15 +36394,6 @@
 
 ;; From GtkTearoffMenuItem
 
-(define-property use-action-appearance
-  (of-object "GtkTearoffMenuItem")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the related actions appearance properties")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property related-action
   (of-object "GtkTearoffMenuItem")
   (prop-type "GParamObject")
@@ -37189,10 +36403,10 @@
   (construct-only #f)
 )
 
-(define-property user-data
+(define-property use-action-appearance
   (of-object "GtkTearoffMenuItem")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -37399,402 +36613,140 @@
 (define-property double-buffered
   (of-object "GtkTearoffMenuItem")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property border-width
-  (of-object "GtkTearoffMenuItem")
-  (prop-type "GParamUInt")
-  (docs "The width of the empty border outside the containers children")
+  (docs "Whether the widget is double buffered")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property resize-mode
+(define-property halign
   (of-object "GtkTearoffMenuItem")
   (prop-type "GParamEnum")
-  (docs "Specify how resize events are handled")
+  (docs "How to position in extra horizontal space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property child
-  (of-object "GtkTearoffMenuItem")
-  (prop-type "GParamObject")
-  (docs "Can be used to add a new child to the container")
-  (readable #f)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property right-justified
+(define-property valign
   (of-object "GtkTearoffMenuItem")
-  (prop-type "GParamBoolean")
-  (docs "Sets whether the menu item appears justified at the right side of a menu bar")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property submenu
+(define-property margin-left
   (of-object "GtkTearoffMenuItem")
-  (prop-type "GParamObject")
-  (docs "The submenu attached to the menu item, or NULL if it has none")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property accel-path
+(define-property margin-right
   (of-object "GtkTearoffMenuItem")
-  (prop-type "GParamString")
-  (docs "Sets the accelerator path of the menu item")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property label
+(define-property margin-top
   (of-object "GtkTearoffMenuItem")
-  (prop-type "GParamString")
-  (docs "The text for the child label")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property use-underline
+(define-property margin-bottom
   (of-object "GtkTearoffMenuItem")
-  (prop-type "GParamBoolean")
-  (docs "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-;; From GtkTipsQuery
-
-(define-signal start-query
-  (of-object "GtkTipsQuery")
-  (return-type "void")
-  (when "first")
-)
-
-(define-signal stop-query
-  (of-object "GtkTipsQuery")
-  (return-type "void")
-  (when "first")
-)
-
-(define-signal widget-entered
-  (of-object "GtkTipsQuery")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GtkWidget*" "p0")
-    '("const-gchar*" "p1")
-    '("const-gchar*" "p2")
-  )
-)
-
-(define-signal widget-selected
-  (of-object "GtkTipsQuery")
-  (return-type "gboolean")
-  (when "last")
-  (parameters
-    '("GtkWidget*" "p0")
-    '("const-gchar*" "p1")
-    '("const-gchar*" "p2")
-    '("GdkEvent*" "p3")
-  )
-)
-
-(define-property user-data
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property name
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamString")
-  (docs "The name of the widget")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property parent
-  (of-object "GtkTipsQuery")
-  (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 "GtkTipsQuery")
   (prop-type "GParamInt")
-  (docs "Override for width request of the widget, or -1 if natural request should be used")
+  (docs "Pixels of extra space on the bottom side")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property height-request
-  (of-object "GtkTipsQuery")
+(define-property margin
+  (of-object "GtkTearoffMenuItem")
   (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 "GtkTipsQuery")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is visible")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property sensitive
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget responds to input")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property app-paintable
-  (of-object "GtkTipsQuery")
-  (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 "GtkTipsQuery")
-  (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 "GtkTipsQuery")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget has the input focus")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property is-focus
-  (of-object "GtkTipsQuery")
-  (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 "GtkTipsQuery")
-  (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 "GtkTipsQuery")
-  (prop-type "GParamBoolean")
-  (docs "Whether the widget is the default widget")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property receives-default
-  (of-object "GtkTipsQuery")
-  (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 "GtkTipsQuery")
-  (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 "GtkTipsQuery")
-  (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 "GtkTipsQuery")
-  (prop-type "GParamFlags")
-  (docs "The event mask that decides what kind of GdkEvents this widget gets")
+(define-property border-width
+  (of-object "GtkTearoffMenuItem")
+  (prop-type "GParamUInt")
+  (docs "The width of the empty border outside the containers children")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property extension-events
-  (of-object "GtkTipsQuery")
+(define-property resize-mode
+  (of-object "GtkTearoffMenuItem")
   (prop-type "GParamEnum")
-  (docs "The mask that decides what kind of extension events this widget gets")
+  (docs "Specify how resize events are handled")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property no-show-all
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamBoolean")
-  (docs "Whether gtk_widget_show_all() should not affect this widget")
-  (readable #t)
+(define-property child
+  (of-object "GtkTearoffMenuItem")
+  (prop-type "GParamObject")
+  (docs "Can be used to add a new child to the container")
+  (readable #f)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property has-tooltip
-  (of-object "GtkTipsQuery")
+(define-property right-justified
+  (of-object "GtkTearoffMenuItem")
   (prop-type "GParamBoolean")
-  (docs "Whether this widget has a tooltip")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property tooltip-markup
-  (of-object "GtkTipsQuery")
-  (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 "GtkTipsQuery")
-  (prop-type "GParamString")
-  (docs "The contents of the tooltip for this widget")
+  (docs "Sets whether the menu item appears justified at the right side of a menu bar")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property window
-  (of-object "GtkTipsQuery")
+(define-property submenu
+  (of-object "GtkTearoffMenuItem")
   (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 "GtkTipsQuery")
-  (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property xalign
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamFloat")
-  (docs "The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL layouts.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property yalign
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamFloat")
-  (docs "The vertical alignment, from 0 (top) to 1 (bottom)")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property xpad
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamInt")
-  (docs "The amount of space to add on the left and right of the widget, in pixels")
+  (docs "The submenu attached to the menu item, or NULL if it has none")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property ypad
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamInt")
-  (docs "The amount of space to add on the top and bottom of the widget, in pixels")
+(define-property accel-path
+  (of-object "GtkTearoffMenuItem")
+  (prop-type "GParamString")
+  (docs "Sets the accelerator path of the menu item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
 (define-property label
-  (of-object "GtkTipsQuery")
+  (of-object "GtkTearoffMenuItem")
   (prop-type "GParamString")
-  (docs "The text of the label")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property attributes
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamBoxed")
-  (docs "A list of style attributes to apply to the text of the label")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property use-markup
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamBoolean")
-  (docs "The text of the label includes XML markup. See pango_parse_markup()")
+  (docs "The text for the child label")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
 (define-property use-underline
-  (of-object "GtkTipsQuery")
+  (of-object "GtkTearoffMenuItem")
   (prop-type "GParamBoolean")
   (docs "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key")
   (readable #t)
@@ -37802,177 +36754,6 @@
   (construct-only #f)
 )
 
-(define-property justify
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamEnum")
-  (docs "The alignment of the lines in the text of the label relative to each other. This does NOT affect the alignment of the label within its allocation. See GtkMisc::xalign for that")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property pattern
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamString")
-  (docs "A string with _ characters in positions correspond to characters in the text to underline")
-  (readable #f)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property wrap
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamBoolean")
-  (docs "If set, wrap lines if the text becomes too wide")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property wrap-mode
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamEnum")
-  (docs "If wrap is set, controls how linewrapping is done")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property selectable
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamBoolean")
-  (docs "Whether the label text can be selected with the mouse")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property mnemonic-keyval
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamUInt")
-  (docs "The mnemonic accelerator key for this label")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property mnemonic-widget
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamObject")
-  (docs "The widget to be activated when the label's mnemonic key is pressed")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property cursor-position
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamInt")
-  (docs "The current position of the insertion cursor in chars")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property selection-bound
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamInt")
-  (docs "The position of the opposite end of the selection from the cursor in chars")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property ellipsize
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamEnum")
-  (docs "The preferred place to ellipsize the string, if the label does not have enough room to display the entire string")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property width-chars
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamInt")
-  (docs "The desired width of the label, in characters")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property single-line-mode
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamBoolean")
-  (docs "Whether the label is in single line mode")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property angle
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamDouble")
-  (docs "Angle at which the label is rotated")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property max-width-chars
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamInt")
-  (docs "The desired maximum width of the label, in characters")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property track-visited-links
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamBoolean")
-  (docs "Whether visited links should be tracked")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property emit-always
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamBoolean")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property caller
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamObject")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property label-inactive
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamString")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property label-no-tip
-  (of-object "GtkTipsQuery")
-  (prop-type "GParamString")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 ;; From GtkToggleButton
 
 (define-signal toggled
@@ -37981,15 +36762,6 @@
   (when "first")
 )
 
-(define-property use-action-appearance
-  (of-object "GtkToggleButton")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the related actions appearance properties")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property related-action
   (of-object "GtkToggleButton")
   (prop-type "GParamObject")
@@ -37999,10 +36771,10 @@
   (construct-only #f)
 )
 
-(define-property user-data
+(define-property use-action-appearance
   (of-object "GtkToggleButton")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -38209,7 +36981,70 @@
 (define-property double-buffered
   (of-object "GtkToggleButton")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkToggleButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkToggleButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkToggleButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkToggleButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkToggleButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkToggleButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkToggleButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -38326,7 +37161,7 @@
 (define-property active
   (of-object "GtkToggleButton")
   (prop-type "GParamBoolean")
-  (docs "If the toggle button should be pressed in or not")
+  (docs "If the toggle button should be pressed in")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -38399,15 +37234,6 @@
   (construct-only #f)
 )
 
-(define-property user-data
-  (of-object "GtkToolbar")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkToolbar")
   (prop-type "GParamString")
@@ -38609,7 +37435,70 @@
 (define-property double-buffered
   (of-object "GtkToolbar")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkToolbar")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkToolbar")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkToolbar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkToolbar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkToolbar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkToolbar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkToolbar")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -38660,15 +37549,6 @@
   (construct-only #f)
 )
 
-(define-property tooltips
-  (of-object "GtkToolbar")
-  (prop-type "GParamBoolean")
-  (docs "If the tooltips of the toolbar should be active or not")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property icon-size
   (of-object "GtkToolbar")
   (prop-type "GParamInt")
@@ -38701,26 +37581,6 @@
   (when "last")
 )
 
-(define-signal set-tooltip
-  (of-object "GtkToolItem")
-  (return-type "gboolean")
-  (when "last")
-  (parameters
-    '("GtkTooltips*" "p0")
-    '("const-gchar*" "p1")
-    '("const-gchar*" "p2")
-  )
-)
-
-(define-property use-action-appearance
-  (of-object "GtkToolItem")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the related actions appearance properties")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property related-action
   (of-object "GtkToolItem")
   (prop-type "GParamObject")
@@ -38730,10 +37590,10 @@
   (construct-only #f)
 )
 
-(define-property user-data
+(define-property use-action-appearance
   (of-object "GtkToolItem")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -38940,7 +37800,70 @@
 (define-property double-buffered
   (of-object "GtkToolItem")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkToolItem")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkToolItem")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkToolItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkToolItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkToolItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkToolItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkToolItem")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -39000,18 +37923,8 @@
   (construct-only #f)
 )
 
-
 ;; From GtkToolItemGroup
 
-(define-property user-data
-  (of-object "GtkToolItemGroup")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkToolItemGroup")
   (prop-type "GParamString")
@@ -39213,7 +38126,70 @@
 (define-property double-buffered
   (of-object "GtkToolItemGroup")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkToolItemGroup")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkToolItemGroup")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkToolItemGroup")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkToolItemGroup")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkToolItemGroup")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkToolItemGroup")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkToolItemGroup")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -39267,7 +38243,7 @@
 (define-property collapsed
   (of-object "GtkToolItemGroup")
   (prop-type "GParamBoolean")
-  (docs "Wether the group has been collapsed and items are hidden")
+  (docs "Whether the group has been collapsed and items are hidden")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -39312,15 +38288,6 @@
   (construct-only #f)
 )
 
-(define-property user-data
-  (of-object "GtkToolPalette")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkToolPalette")
   (prop-type "GParamString")
@@ -39522,7 +38489,70 @@
 (define-property double-buffered
   (of-object "GtkToolPalette")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkToolPalette")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkToolPalette")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkToolPalette")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkToolPalette")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkToolPalette")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkToolPalette")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkToolPalette")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -39590,15 +38620,6 @@
   (when "first")
 )
 
-(define-property use-action-appearance
-  (of-object "GtkToolButton")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use the related actions appearance properties")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property related-action
   (of-object "GtkToolButton")
   (prop-type "GParamObject")
@@ -39608,10 +38629,10 @@
   (construct-only #f)
 )
 
-(define-property user-data
+(define-property use-action-appearance
   (of-object "GtkToolButton")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -39818,7 +38839,70 @@
 (define-property double-buffered
   (of-object "GtkToolButton")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkToolButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkToolButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkToolButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkToolButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkToolButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkToolButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkToolButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -40181,24 +39265,6 @@
   (construct-only #f)
 )
 
-(define-property background-stipple
-  (of-object "GtkTextTag")
-  (prop-type "GParamObject")
-  (docs "Bitmap to use as a mask when drawing the text background")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property foreground-stipple
-  (of-object "GtkTextTag")
-  (prop-type "GParamObject")
-  (docs "Bitmap to use as a mask when drawing the text foreground")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property font
   (of-object "GtkTextTag")
   (prop-type "GParamString")
@@ -40487,24 +39553,6 @@
   (construct-only #f)
 )
 
-(define-property background-stipple-set
-  (of-object "GtkTextTag")
-  (prop-type "GParamBoolean")
-  (docs "Whether this tag affects the background stipple")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property foreground-stipple-set
-  (of-object "GtkTextTag")
-  (prop-type "GParamBoolean")
-  (docs "Whether this tag affects the foreground stipple")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property family-set
   (of-object "GtkTextTag")
   (prop-type "GParamBoolean")
@@ -40783,16 +39831,6 @@
   )
 )
 
-(define-signal page-horizontally
-  (of-object "GtkTextView")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("gint" "p0")
-    '("gboolean" "p1")
-  )
-)
-
 (define-signal move-viewport
   (of-object "GtkTextView")
   (return-type "void")
@@ -40882,15 +39920,6 @@
   )
 )
 
-(define-property user-data
-  (of-object "GtkTextView")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkTextView")
   (prop-type "GParamString")
@@ -41092,7 +40121,70 @@
 (define-property double-buffered
   (of-object "GtkTextView")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkTextView")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkTextView")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkTextView")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkTextView")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkTextView")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkTextView")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkTextView")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -41403,6 +40495,15 @@
   (construct-only #f)
 )
 
+(define-property always-show-image
+  (of-object "GtkToggleAction")
+  (prop-type "GParamBoolean")
+  (docs "Whether the image will always be shown")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property draw-as-radio
   (of-object "GtkToggleAction")
   (prop-type "GParamBoolean")
@@ -41415,7 +40516,7 @@
 (define-property active
   (of-object "GtkToggleAction")
   (prop-type "GParamBoolean")
-  (docs "If the toggle action should be active in or not")
+  (docs "Whether the toggle action should be active")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -41447,15 +40548,6 @@
   (construct-only #f)
 )
 
-(define-property user-data
-  (of-object "GtkToggleToolButton")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkToggleToolButton")
   (prop-type "GParamString")
@@ -41657,7 +40749,70 @@
 (define-property double-buffered
   (of-object "GtkToggleToolButton")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkToggleToolButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkToggleToolButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkToggleToolButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkToggleToolButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkToggleToolButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkToggleToolButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkToggleToolButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -41774,7 +40929,7 @@
 (define-property active
   (of-object "GtkToggleToolButton")
   (prop-type "GParamBoolean")
-  (docs "If the toggle button should be pressed in or not")
+  (docs "If the toggle button should be pressed in")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -41782,17 +40937,6 @@
 
 ;; From GtkTooltip
 
-;; From GtkTooltips
-
-(define-property user-data
-  (of-object "GtkTooltips")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 ;; From GtkTreeSelection
 
 (define-signal changed
@@ -41803,26 +40947,27 @@
 
 ;; From GtkTreeModel
 
-(define-signal row-inserted
+(define-signal row-changed
   (of-object "GtkTreeModel")
   (return-type "void")
-  (when "first")
+  (when "last")
   (parameters
     '("GtkTreePath*" "p0")
     '("GtkTreeIter*" "p1")
   )
 )
 
-(define-signal row-deleted
+(define-signal row-inserted
   (of-object "GtkTreeModel")
   (return-type "void")
   (when "first")
   (parameters
     '("GtkTreePath*" "p0")
+    '("GtkTreeIter*" "p1")
   )
 )
 
-(define-signal row-changed
+(define-signal row-has-child-toggled
   (of-object "GtkTreeModel")
   (return-type "void")
   (when "last")
@@ -41832,13 +40977,12 @@
   )
 )
 
-(define-signal row-has-child-toggled
+(define-signal row-deleted
   (of-object "GtkTreeModel")
   (return-type "void")
-  (when "last")
+  (when "first")
   (parameters
     '("GtkTreePath*" "p0")
-    '("GtkTreeIter*" "p1")
   )
 )
 
@@ -41849,7 +40993,7 @@
   (parameters
     '("GtkTreePath*" "p0")
     '("GtkTreeIter*" "p1")
-    '("gpointer" "p2")
+    '("gint*" "p2")
   )
 )
 
@@ -42009,15 +41153,6 @@
   (when "last")
 )
 
-(define-property user-data
-  (of-object "GtkTreeView")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkTreeView")
   (prop-type "GParamString")
@@ -42219,7 +41354,70 @@
 (define-property double-buffered
   (of-object "GtkTreeView")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkTreeView")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkTreeView")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkTreeView")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkTreeView")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkTreeView")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkTreeView")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkTreeView")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -42431,15 +41629,6 @@
   (when "last")
 )
 
-(define-property user-data
-  (of-object "GtkTreeViewColumn")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property visible
   (of-object "GtkTreeViewColumn")
   (prop-type "GParamBoolean")
@@ -42678,15 +41867,6 @@
   )
 )
 
-(define-property user-data
-  (of-object "GtkViewport")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkViewport")
   (prop-type "GParamString")
@@ -42888,7 +42068,70 @@
 (define-property double-buffered
   (of-object "GtkViewport")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkViewport")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkViewport")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkViewport")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkViewport")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkViewport")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkViewport")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkViewport")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -42977,15 +42220,6 @@
   (construct-only #f)
 )
 
-(define-property user-data
-  (of-object "GtkVolumeButton")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkVolumeButton")
   (prop-type "GParamString")
@@ -43187,7 +42421,70 @@
 (define-property double-buffered
   (of-object "GtkVolumeButton")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkVolumeButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkVolumeButton")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkVolumeButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkVolumeButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkVolumeButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkVolumeButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkVolumeButton")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -43952,15 +43249,6 @@
   )
 )
 
-(define-property user-data
-  (of-object "GtkWidget")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkWidget")
   (prop-type "GParamString")
@@ -44162,7 +43450,70 @@
 (define-property double-buffered
   (of-object "GtkWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkWidget")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkWidget")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkWidget")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkWidget")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkWidget")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkWidget")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkWidget")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -44206,15 +43557,6 @@
   (when "first")
 )
 
-(define-property user-data
-  (of-object "GtkWindow")
-  (prop-type "GParamPointer")
-  (docs "Anonymous User Data Pointer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property name
   (of-object "GtkWindow")
   (prop-type "GParamString")
@@ -44416,7 +43758,70 @@
 (define-property double-buffered
   (of-object "GtkWindow")
   (prop-type "GParamBoolean")
-  (docs "Whether or not the widget is double buffered")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkWindow")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkWindow")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkWindow")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkWindow")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkWindow")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkWindow")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkWindow")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -44476,24 +43881,6 @@
   (construct-only #f)
 )
 
-(define-property allow-shrink
-  (of-object "GtkWindow")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property allow-grow
-  (of-object "GtkWindow")
-  (prop-type "GParamBoolean")
-  (docs "If TRUE, users can expand the window beyond its minimum size")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property resizable
   (of-object "GtkWindow")
   (prop-type "GParamBoolean")
@@ -44928,6 +44315,69 @@
   (construct-only #f)
 )
 
+(define-property halign
+  (of-object "GtkWrapBox")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkWrapBox")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkWrapBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkWrapBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkWrapBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkWrapBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkWrapBox")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property border-width
   (of-object "GtkWrapBox")
   (prop-type "GParamUInt")
@@ -45008,3 +44458,4 @@
   (writable #t)
   (construct-only #f)
 )
+
diff --git a/gtk/src/infobar.hg b/gtk/src/infobar.hg
index 90f9c00..cc3e4f8 100644
--- a/gtk/src/infobar.hg
+++ b/gtk/src/infobar.hg
@@ -30,21 +30,21 @@ namespace Gtk
 
 //TODO: Derive from Gtk::Buildable when we can break ABI.
 
-/** This widget that can be used to show messages to the user without showing a dialog. 
- * It is often temporarily shown at the top or bottom of a document. In contrast to 
- * Dialog, which has a horizontal action area at the bottom, InfoBar has a vertical 
+/** This widget that can be used to show messages to the user without showing a dialog.
+ * It is often temporarily shown at the top or bottom of a document. In contrast to
+ * Dialog, which has a horizontal action area at the bottom, InfoBar has a vertical
  * action area at the side.
  *
- * The API is very similar to Dialog, allowing you to add buttons to the action 
- * area with add_button(). The sensitivity of action widgets can be controlled 
- * with set_response_sensitive(). To add widgets to the main content area, use 
+ * The API is very similar to Dialog, allowing you to add buttons to the action
+ * area with add_button(). The sensitivity of action widgets can be controlled
+ * with set_response_sensitive(). To add widgets to the main content area, use
  * get_content_area() and add your widgets to the container.
  *
- * Similar to MessageDialog, the contents can by classified as error message, 
- * warning, informational message, etc, by using set_message_type(). This 
- * determines the background color of the message area. 
+ * Similar to MessageDialog, the contents can by classified as error message,
+ * warning, informational message, etc, by using set_message_type(). This
+ * determines the background color of the message area.
  *
- * The InfoBar widget looks like 
+ * The InfoBar widget looks like
  * @image html infobar1.png
  *
  * @newin{2,18}
@@ -64,15 +64,15 @@ public:
 //TODO: What types are these widgets really?
   _WRAP_METHOD(Widget* get_action_area(), gtk_info_bar_get_action_area)
   _WRAP_METHOD(const Widget* get_action_area() const, gtk_info_bar_get_action_area)
-  
+
   _WRAP_METHOD(Widget* get_content_area(), gtk_info_bar_get_content_area)
   _WRAP_METHOD(const Widget* get_content_area() const, gtk_info_bar_get_content_area)
 
   _WRAP_METHOD(void add_action_widget(Widget& child, int response_id), gtk_info_bar_add_action_widget)
-  
+
   _WRAP_METHOD(Button* add_button(const Glib::ustring& button_text, int response_id), gtk_info_bar_add_button)
   _WRAP_METHOD(Button* add_button(const Gtk::StockID& stock_id, int response_id), gtk_info_bar_add_button)
-    
+
   _IGNORE(gtk_info_bar_add_buttons)
   _WRAP_METHOD(void set_response_sensitive(int response_id, bool setting = true), gtk_info_bar_set_response_sensitive)
   _WRAP_METHOD(void set_default_response(int response_id), gtk_info_bar_set_default_response)
@@ -81,13 +81,13 @@ public:
 
   _WRAP_METHOD(void set_message_type(MessageType message_type), gtk_info_bar_set_message_type)
   _WRAP_METHOD(MessageType get_message_type() const, gtk_info_bar_get_message_type)
-  
 
-  //ignored: key-binding signal: _WRAP_SIGNAL(void close(), "close")
+
+  _IGNORE_SIGNAL("close")
+
   _WRAP_SIGNAL(void response(int response_id), "response")
 
   _WRAP_PROPERTY("message-type", MessageType)
 };
 
 } // namespace Gtk
-
diff --git a/gtk/src/textbuffer.hg b/gtk/src/textbuffer.hg
index e994c42..42958b1 100644
--- a/gtk/src/textbuffer.hg
+++ b/gtk/src/textbuffer.hg
@@ -116,7 +116,7 @@ public:
   _IGNORE(gtk_text_buffer_set_text)
 
   //TODO: Make all insert() methods have the same return type:
-  
+
   /** Inserts @a text at position @a pos.
    * Emits the "insert_text" signal; insertion actually occurs in the default handler for the signal.
    * The @a pos iterator is invalidated when insertion occurs (because the buffer contents change).
@@ -221,7 +221,7 @@ public:
    */
   iterator insert(const iterator& pos, const iterator& range_begin, const iterator& range_end);
   _IGNORE(gtk_text_buffer_insert_range)
- 
+
   /** Same as insert_range(), but does nothing if the insertion point isn't editable.
    *
    * The @a default_editable parameter indicates whether the text is editable at @a pos if no tags enclosing @a pos affect editability.
@@ -261,7 +261,7 @@ public:
    * @param text_end The end of the UTF8 character array.
    * @param tags A standard C++ container of @link Gtk::TextTag Gtk::TextBuffer::Tags endlink 
    * @result Whether text was actually inserted
-   */                          
+   */
   iterator insert_with_tags(const iterator& pos, const char* text_begin, const char* text_end,
                             const Glib::ArrayHandle< Glib::RefPtr<Tag> >& tags);
 
@@ -284,7 +284,7 @@ public:
    * @param text_end The end of the UTF8 character array.
    * @param tag_names A standard C++ container of tag names.
    * @result Whether text was actually inserted
-   */                                   
+   */
   iterator insert_with_tags_by_name(const iterator& pos, const char* text_begin, const char* text_end,
                                     const Glib::StringArrayHandle& tag_names);
 
@@ -319,9 +319,9 @@ public:
    * combining accents are involved, more than one character can
    * be deleted, and when precomposed character and accent combinations
    * are involved, less than one character will be deleted.
-   * 
-   * Because the buffer is modified, all outstanding iterators become 
-   * invalid after calling this method; however, this method returns 
+   *
+   * Because the buffer is modified, all outstanding iterators become
+   * invalid after calling this method; however, this method returns
    * a valid iterator that points to the location where text was deleted.
    *
    * @param iter A position in the buffer.
@@ -380,7 +380,7 @@ public:
    * @param where Location to place mark.
    * @param left_gravity Whether the mark has left gravity.
    * @return The new Gtk::TextMark object.
-   */ 
+   */
   Glib::RefPtr<Mark> create_mark(const iterator& where, bool left_gravity = true);
 
   _WRAP_METHOD(void move_mark(const Glib::RefPtr<Mark>& mark, const iterator& where), gtk_text_buffer_move_mark)
@@ -456,14 +456,13 @@ public:
   _WRAP_METHOD(bool erase_selection(bool interactive = true, bool default_editable = true), gtk_text_buffer_delete_selection)
 
   _WRAP_METHOD(void select_range(const iterator& ins, const iterator& bound), gtk_text_buffer_select_range)
-  
+
 /* Called to specify atomic user actions, used to implement undo */
   _WRAP_METHOD(void begin_user_action(), gtk_text_buffer_begin_user_action)
   _WRAP_METHOD(void end_user_action(), gtk_text_buffer_end_user_action)
 
-//TODO:
-  //_WRAP_METHOD(GtkTargetList * gtk_text_buffer_get_copy_target_list() const, gtk_text_buffer_get_copy_target_list)
-  //_WRAP_METHOD(GtkTargetList * gtk_text_buffer_get_paste_target_list() const, gtk_text_buffer_get_paste_target_list)
+  _WRAP_METHOD(Glib::RefPtr<TargetList> get_copy_target_list() const, gtk_text_buffer_get_copy_target_list, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<TargetList> get_paste_target_list() const, gtk_text_buffer_get_paste_target_list, refreturn)
 
 //TODO: I have commented these out for now because I don't understand what the register_buffer and content_buffer are. murrayc.
  //TODO: Documentation.
@@ -530,10 +529,10 @@ _CONVERSION(`const char*',`const Glib::ustring&',`Glib::ustring(p1, p1 + p2)')
 #m4 _CONVERSION(`GdkPixbuf*',`const Glib::RefPtr<Gdk::Pixbuf>&', Glib::wrap($3, true))
   _WRAP_SIGNAL(void insert_pixbuf(const TextBuffer::iterator& pos, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf), "insert_pixbuf")
   _WRAP_SIGNAL(void insert_child_anchor(const TextBuffer::iterator& pos, const Glib::RefPtr<ChildAnchor>& anchor), "insert_child_anchor")
-  
-  /** The delete_range signal is emitted to delete a range from 
+
+  /** The delete_range signal is emitted to delete a range from
    * a TextBuffer. Note that your handler must not invalidate the
-   * @a start and @a end iters (or has to revalidate them), if it runs before the 
+   * @a start and @a end iters (or has to revalidate them), if it runs before the
    * default handler. There is no need to keep the iters valid in handlers
    * which run after the default handler but
    * those don't have access to the deleted text.
@@ -542,8 +541,8 @@ _CONVERSION(`const char*',`const Glib::ustring&',`Glib::ustring(p1, p1 + p2)')
    * @param end the end of the range to be deleted.
    */
   _WRAP_SIGNAL(void erase(const TextBuffer::iterator& start, const TextBuffer::iterator& end), "delete_range")
-  
-  
+
+
   _WRAP_SIGNAL(void changed(), "changed")
   _WRAP_SIGNAL(void modified_changed(), "modified_changed")
   _WRAP_SIGNAL(void mark_set(const TextBuffer::iterator& location, const Glib::RefPtr<TextBuffer::Mark>& mark), "mark_set")
@@ -565,4 +564,3 @@ _CONVERSION(`const char*',`const Glib::ustring&',`Glib::ustring(p1, p1 + p2)')
 };
 
 } // namespace Gtk
-
diff --git a/gtk/src/toolitem.hg b/gtk/src/toolitem.hg
index 0bdc984..6c2dd19 100644
--- a/gtk/src/toolitem.hg
+++ b/gtk/src/toolitem.hg
@@ -129,6 +129,7 @@ public:
   _WRAP_SIGNAL(void toolbar_reconfigured(), toolbar_reconfigured)
 
   //_WRAP_SIGNAL(bool set_tooltip(Tooltips* tooltips, const Glib::ustring& tip_text, const Glib::ustring& tip_private), set_tooltip, deprecated) //TODO: Implement deprecated for _WRAP_SIGNAL() to avoid hand-coding this:
+  _IGNORE_SIGNAL(set_tooltip)
 
   _WRAP_PROPERTY("visible_horizontal", bool)
   _WRAP_PROPERTY("visible_vertical", bool)
diff --git a/gtk/src/toolpalette.hg b/gtk/src/toolpalette.hg
index 1a64847..05fedb5 100644
--- a/gtk/src/toolpalette.hg
+++ b/gtk/src/toolpalette.hg
@@ -97,8 +97,9 @@ public:
   _WRAP_METHOD(static TargetEntry get_drag_target_item(), gtk_tool_palette_get_drag_target_item)
   _WRAP_METHOD(static TargetEntry get_drag_target_group(), gtk_tool_palette_get_drag_target_group)
 
-  //TODO: Ignore this? It's in many widgets and seems internal.
-  //Ignore action signal: _WRAP_SIGNAL(void set_scroll_adjustments(Adjustment* hadjustment, Adjustment* vadjustment), "set-scroll-adjustments")
+  //Ignore the set_scroll_adjustment signal. It's in many widgets and seems internal.
+  //_WRAP_SIGNAL(void set_scroll_adjustments(Adjustment* hadjustment, Adjustment* vadjustment), "set-scroll-adjustments")
+  _IGNORE_SIGNAL(set_scroll_adjustments)
 
   _WRAP_PROPERTY("icon-size", IconSize)
   _WRAP_PROPERTY("icon-size-set", bool)
diff --git a/gtk/src/treepath.hg b/gtk/src/treepath.hg
index c3a5535..1f7bd69 100644
--- a/gtk/src/treepath.hg
+++ b/gtk/src/treepath.hg
@@ -133,10 +133,10 @@ public:
   _WRAP_COMPARE(gtk_tree_path_compare)
 #m4end
 
-
   _IGNORE(gtk_tree_path_append_index) //replaced by push_back()
   _IGNORE(gtk_tree_path_prepend_index) //replaced by push_front()
   _IGNORE(gtk_tree_path_get_depth) //replaced by size()
+  _IGNORE(gtk_tree_path_get_indices_with_depth)
 
   /**
    * Obtains a Gtk::TreeModel and Gtk::TreeModel::Path from selection data of target type
diff --git a/tools/extra_defs_gen/generate_defs_gtk.cc b/tools/extra_defs_gen/generate_defs_gtk.cc
index 0c1d93d..084f980 100644
--- a/tools/extra_defs_gen/generate_defs_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_gtk.cc
@@ -97,6 +97,7 @@ int main(int argc, char** argv)
             << get_defs( GTK_TYPE_EVENT_BOX )
             << get_defs( GTK_TYPE_EXPANDER )
             << get_defs( GTK_TYPE_FILE_FILTER )
+            << get_defs( GTK_TYPE_FILE_CHOOSER )
             << get_defs( GTK_TYPE_FILE_CHOOSER_BUTTON )
             << get_defs( GTK_TYPE_FILE_CHOOSER_DIALOG )
             << get_defs( GTK_TYPE_FILE_CHOOSER_WIDGET )
@@ -138,6 +139,8 @@ int main(int argc, char** argv)
             << get_defs( GTK_TYPE_PAGE_SETUP_UNIX_DIALOG )
             << get_defs( GTK_TYPE_PRINT_UNIX_DIALOG )
 #endif /* G_OS_WIN32 */
+            << get_defs( GTK_TYPE_PRINT_SETTINGS )
+            << get_defs( GTK_TYPE_PRINT_OPERATION_PREVIEW )
             << get_defs( GTK_TYPE_PROGRESS_BAR )
             << get_defs( GTK_TYPE_RADIO_BUTTON )
             << get_defs( GTK_TYPE_RADIO_TOOL_BUTTON )
@@ -186,6 +189,8 @@ int main(int argc, char** argv)
             << get_defs( GTK_TYPE_TOOLTIP )
             << get_defs( GTK_TYPE_TREE_SELECTION )
             << get_defs( GTK_TYPE_TREE_MODEL )
+            << get_defs( GTK_TYPE_TREE_SELECTION )
+            << get_defs( GTK_TYPE_TREE_SORTABLE )
             << get_defs( GTK_TYPE_TREE_MODEL_FILTER )
             << get_defs( GTK_TYPE_TREE_STORE )
             << get_defs( GTK_TYPE_TREE_VIEW )



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