gir-repository r24 - trunk/gir



Author: johan
Date: Fri Aug 15 05:40:16 2008
New Revision: 24
URL: http://svn.gnome.org/viewvc/gir-repository?rev=24&view=rev

Log:
Remove a few more errros when generate gtk gir

Modified:
   trunk/gir/Makefile.am
   trunk/gir/gdk-x11-2.0.gir
   trunk/gir/gtk-x11-2.0.gir

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Fri Aug 15 05:40:16 2008
@@ -90,7 +90,10 @@
              --pkg gdk-2.0 \
              --pkg gtk+-2.0 \
              --output $@ \
-             -I$(GTK_INCLUDEDIR) \
+             -D__GTK_FILE_SYSTEM_H__ \
+             -D__GTK_TEXT_LAYOUT_H__ \
+             -D__GTK_TEXT_DISPLAY_H__ \
+	     -I$(GTK_INCLUDEDIR) \
 	     gtk-x11-2.0.c \
              $(GTK_INCLUDEDIR)/gtk/*.h
 GIRSOURCES += gtk-x11-2.0.gir

Modified: trunk/gir/gdk-x11-2.0.gir
==============================================================================
--- trunk/gir/gdk-x11-2.0.gir	(original)
+++ trunk/gir/gdk-x11-2.0.gir	Fri Aug 15 05:40:16 2008
@@ -7763,6 +7763,11 @@
         <type name="int32" c:type="gint"/>
       </field>
     </record>
+    <record name="GdkPixmapObjectClass" c:type="GdkPixmapObjectClass">
+      <field name="parent_class">
+        <type name="GdkDrawableClass" c:type="GdkDrawableClass"/>
+      </field>
+    </record>
     <class name="Pixmap"
            c:type="GdkPixmap"
            parent="Drawable"
@@ -9574,6 +9579,11 @@
         <type name="uint32" c:type="guint"/>
       </field>
     </record>
+    <record name="GdkWindowObjectClass" c:type="GdkWindowObjectClass">
+      <field name="parent_class">
+        <type name="GdkDrawableClass" c:type="GdkDrawableClass"/>
+      </field>
+    </record>
     <class name="Window"
            c:type="GdkWindow"
            parent="Drawable"

Modified: trunk/gir/gtk-x11-2.0.gir
==============================================================================
--- trunk/gir/gtk-x11-2.0.gir	(original)
+++ trunk/gir/gtk-x11-2.0.gir	Fri Aug 15 05:40:16 2008
@@ -13,7 +13,6 @@
     <alias name="GtkEnumValue" target="GEnumValue"/>
     <alias name="GtkFlagValue" target="GFlagsValue"/>
     <alias name="GtkAllocation" target="GdkRectangle"/>
-    <alias name="GtkFileTime" target="gint64"/>
     <alias name="GtkDitherInfo" target="_GtkDitherInfo"/>
     <enumeration name="AnchorType"
                  c:type="GtkAnchorType"
@@ -3247,48 +3246,6 @@
       <field name="flags">
         <type name="uint32" c:type="guint32"/>
       </field>
-      <callback name="set_arg">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkObject" c:type="GtkObject*"/>
-          </parameter>
-          <parameter name="arg">
-            <type name="GtkArg" c:type="GtkArg*"/>
-          </parameter>
-          <parameter name="arg_id">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_arg">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkObject" c:type="GtkObject*"/>
-          </parameter>
-          <parameter name="arg">
-            <type name="GtkArg" c:type="GtkArg*"/>
-          </parameter>
-          <parameter name="arg_id">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="destroy">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GtkObject" c:type="GtkObject*"/>
-          </parameter>
-        </parameters>
-      </callback>
     </record>
     <callback name="GtkFunction">
       <return-value>
@@ -3453,6 +3410,53 @@
         </parameter>
       </parameters>
     </function>
+    <record name="GtkObjectClass" c:type="GtkObjectClass">
+      <field name="parent_class">
+        <type name="GInitiallyUnownedClass" c:type="GInitiallyUnownedClass"/>
+      </field>
+      <callback name="set_arg">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkObject" c:type="GtkObject*"/>
+          </parameter>
+          <parameter name="arg">
+            <type name="GtkArg" c:type="GtkArg*"/>
+          </parameter>
+          <parameter name="arg_id">
+            <type name="uint32" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_arg">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkObject" c:type="GtkObject*"/>
+          </parameter>
+          <parameter name="arg">
+            <type name="GtkArg" c:type="GtkArg*"/>
+          </parameter>
+          <parameter name="arg_id">
+            <type name="uint32" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="destroy">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GtkObject" c:type="GtkObject*"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
     <function name="object_get_type" c:identifier="gtk_object_get_type">
       <return-value>
         <type name="GtkType" c:type="GtkType"/>
@@ -9122,23 +9126,6 @@
           </parameter>
         </parameters>
       </method>
-      <method name="style_get_valist"
-              c:identifier="gtk_widget_style_get_valist">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="first_property_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="var_args">
-            <type name="va_list" c:type="va_list"/>
-          </parameter>
-        </parameters>
-      </method>
       <method name="style_get" c:identifier="gtk_widget_style_get">
         <return-value>
           <type name="none" c:type="void"/>
@@ -11679,46 +11666,6 @@
           </parameter>
         </parameters>
       </method>
-      <method name="child_set_valist"
-              c:identifier="gtk_container_child_set_valist">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="first_property_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="var_args">
-            <type name="va_list" c:type="va_list"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="child_get_valist"
-              c:identifier="gtk_container_child_get_valist">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="first_property_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="var_args">
-            <type name="va_list" c:type="va_list"/>
-          </parameter>
-        </parameters>
-      </method>
       <method name="child_set_property"
               c:identifier="gtk_container_child_set_property">
         <return-value>
@@ -13300,10 +13247,10 @@
       <property name="title">
         <type name="string" c:type="gchararray"/>
       </property>
-      <property name="startup-id">
+      <property name="role">
         <type name="string" c:type="gchararray"/>
       </property>
-      <property name="role">
+      <property name="startup-id">
         <type name="string" c:type="gchararray"/>
       </property>
       <property name="allow-shrink">
@@ -17097,7 +17044,7 @@
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="extra_data">
-        <type name="gconstpointer" c:type="gconstpointer"/>
+        <type name="any" c:type="gconstpointer"/>
       </field>
     </record>
     <record name="GtkItemFactoryItem" c:type="GtkItemFactoryItem">
@@ -23867,23 +23814,6 @@
         </parameter>
       </parameters>
     </function>
-    <function name="tree_model_get_valist"
-              c:identifier="gtk_tree_model_get_valist">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
-        </parameter>
-        <parameter name="var_args">
-          <type name="va_list" c:type="va_list"/>
-        </parameter>
-      </parameters>
-    </function>
     <function name="tree_model_foreach" c:identifier="gtk_tree_model_foreach">
       <return-value>
         <type name="none" c:type="void"/>
@@ -27353,51 +27283,6 @@
           </parameter>
         </parameters>
       </method>
-      <method name="register_child"
-              c:identifier="gtk_text_child_anchor_register_child">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="anchor">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="unregister_child"
-              c:identifier="gtk_text_child_anchor_unregister_child">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="anchor">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="queue_resize"
-              c:identifier="gtk_text_child_anchor_queue_resize">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="anchor">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
-          </parameter>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-        </parameters>
-      </method>
       <callback name="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
@@ -30372,6 +30257,11 @@
       <field name="drag_highlight_pos">
         <type name="CListDragPos" c:type="GtkCListDragPos"/>
       </field>
+    </record>
+    <record name="GtkCListClass" c:type="GtkCListClass">
+      <field name="parent_class">
+        <type name="GtkContainerClass" c:type="GtkContainerClass"/>
+      </field>
       <callback name="set_scroll_adjustments">
         <return-value>
           <type name="none" c:type="void"/>
@@ -30971,10 +30861,10 @@
           <type name="GtkCList" c:type="GtkCList*"/>
         </parameter>
         <parameter name="ptr1">
-          <type name="gconstpointer" c:type="gconstpointer"/>
+          <type name="any" c:type="gconstpointer"/>
         </parameter>
         <parameter name="ptr2">
-          <type name="gconstpointer" c:type="gconstpointer"/>
+          <type name="any" c:type="gconstpointer"/>
         </parameter>
       </parameters>
     </callback>
@@ -34213,22 +34103,6 @@
           </parameter>
         </parameters>
       </method>
-      <method name="set_valist" c:identifier="gtk_list_store_set_valist">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="var_args">
-            <type name="va_list" c:type="va_list"/>
-          </parameter>
-        </parameters>
-      </method>
       <method name="remove" c:identifier="gtk_list_store_remove">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
@@ -38701,6 +38575,11 @@
       <field name="drag_compare">
         <type name="GtkCTreeCompareDragFunc" c:type="GtkCTreeCompareDragFunc"/>
       </field>
+    </record>
+    <record name="GtkCTreeClass" c:type="GtkCTreeClass">
+      <field name="parent_class">
+        <type name="GtkCListClass" c:type="GtkCListClass"/>
+      </field>
       <callback name="tree_select_row">
         <return-value>
           <type name="none" c:type="void"/>
@@ -40705,38 +40584,38 @@
                c:type="GtkFileChooser"
                glib:type-name="GtkFileChooser"
                glib:get-type="gtk_file_chooser_get_type">
-      <property name="file-system-backend">
-        <type name="string" c:type="gchararray"/>
+      <property name="do-overwrite-confirmation">
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="select-multiple">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="show-hidden">
+      <property name="use-preview-label">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="preview-widget">
-        <type name="Widget" c:type="GtkWidget"/>
+      <property name="filter">
+        <type name="FileFilter" c:type="GtkFileFilter"/>
       </property>
       <property name="extra-widget">
         <type name="Widget" c:type="GtkWidget"/>
       </property>
-      <property name="use-preview-label">
-        <type name="boolean" c:type="gboolean"/>
+      <property name="action">
+        <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
       </property>
-      <property name="preview-widget-active">
-        <type name="boolean" c:type="gboolean"/>
+      <property name="file-system-backend">
+        <type name="string" c:type="gchararray"/>
       </property>
-      <property name="do-overwrite-confirmation">
+      <property name="show-hidden">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="filter">
-        <type name="FileFilter" c:type="GtkFileFilter"/>
+      <property name="preview-widget-active">
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="local-only">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="action">
-        <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
+      <property name="preview-widget">
+        <type name="Widget" c:type="GtkWidget"/>
       </property>
       <glib:signal name="current-folder-changed">
         <return-value>
@@ -41784,1706 +41663,1209 @@
         </parameter>
       </parameters>
     </function>
-    <record name="GtkFileFolder" c:type="GtkFileFolder"/>
-    <record name="GtkFileSystem" c:type="GtkFileSystem"/>
-    <record name="GtkFileSystemVolume" c:type="GtkFileSystemVolume"/>
-    <enumeration name="FileInfoType" c:type="GtkFileInfoType">
-      <member name="display_name"
-              value="1"
-              c:identifier="GTK_FILE_INFO_DISPLAY_NAME"/>
-      <member name="is_folder"
-              value="2"
-              c:identifier="GTK_FILE_INFO_IS_FOLDER"/>
-      <member name="is_hidden"
-              value="4"
-              c:identifier="GTK_FILE_INFO_IS_HIDDEN"/>
-      <member name="mime_type"
-              value="8"
-              c:identifier="GTK_FILE_INFO_MIME_TYPE"/>
-      <member name="modification_time"
-              value="16"
-              c:identifier="GTK_FILE_INFO_MODIFICATION_TIME"/>
-      <member name="size" value="32" c:identifier="GTK_FILE_INFO_SIZE"/>
-      <member name="icon" value="64" c:identifier="GTK_FILE_INFO_ICON"/>
-      <member name="all" value="127" c:identifier="GTK_FILE_INFO_ALL"/>
-    </enumeration>
-    <enumeration name="FileSystemError" c:type="GtkFileSystemError">
-      <member name="r_nonexistent"
-              value="0"
-              c:identifier="GTK_FILE_SYSTEM_ERROR_NONEXISTENT"/>
-      <member name="r_not_folder"
-              value="1"
-              c:identifier="GTK_FILE_SYSTEM_ERROR_NOT_FOLDER"/>
-      <member name="r_invalid_uri"
-              value="2"
-              c:identifier="GTK_FILE_SYSTEM_ERROR_INVALID_URI"/>
-      <member name="r_bad_filename"
-              value="3"
-              c:identifier="GTK_FILE_SYSTEM_ERROR_BAD_FILENAME"/>
-      <member name="r_failed"
-              value="4"
-              c:identifier="GTK_FILE_SYSTEM_ERROR_FAILED"/>
-      <member name="r_already_exists"
-              value="5"
-              c:identifier="GTK_FILE_SYSTEM_ERROR_ALREADY_EXISTS"/>
-    </enumeration>
-    <function name="file_system_error_quark"
-              c:identifier="gtk_file_system_error_quark">
-      <return-value>
-        <type name="GLib.GQuark" c:type="GQuark"/>
-      </return-value>
-    </function>
-    <glib:boxed c:type="FileInfo"
-                glib:name="FileInfo"
-                glib:type-name="GtkFileInfo"
-                glib:get-type="gtk_file_info_get_type">
-      <constructor name="new" c:identifier="gtk_file_info_new">
+    <record name="GtkFixedChild" c:type="GtkFixedChild">
+      <field name="widget">
+        <type name="Widget" c:type="GtkWidget*"/>
+      </field>
+      <field name="x">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="y">
+        <type name="int32" c:type="gint"/>
+      </field>
+    </record>
+    <class name="Fixed"
+           c:type="GtkFixed"
+           parent="Container"
+           glib:type-name="GtkFixed"
+           glib:get-type="gtk_fixed_get_type">
+      <method name="put" c:identifier="gtk_fixed_put">
         <return-value>
-          <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </constructor>
-      <constructor name="copy" c:identifier="gtk_file_info_copy">
+        <parameters>
+          <parameter name="fixed">
+            <type name="Fixed" c:type="GtkFixed*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="move" c:identifier="gtk_fixed_move">
         <return-value>
-          <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="fixed">
+            <type name="Fixed" c:type="GtkFixed*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="free" c:identifier="gtk_file_info_free">
+      </method>
+      <method name="set_has_window" c:identifier="gtk_fixed_set_has_window">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="fixed">
+            <type name="Fixed" c:type="GtkFixed*"/>
+          </parameter>
+          <parameter name="has_window">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_display_name"
-              c:identifier="gtk_file_info_get_display_name">
+      <method name="get_has_window" c:identifier="gtk_fixed_get_has_window">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="fixed">
+            <type name="Fixed" c:type="GtkFixed*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_display_key"
-              c:identifier="gtk_file_info_get_display_key">
+    </class>
+    <function name="fixed_new" c:identifier="gtk_fixed_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <record name="GtkFontButtonPrivate" c:type="GtkFontButtonPrivate"/>
+    <class name="FontButton"
+           c:type="GtkFontButton"
+           parent="Button"
+           glib:type-name="GtkFontButton"
+           glib:get-type="gtk_font_button_get_type">
+      <method name="get_title" c:identifier="gtk_font_button_get_title">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_display_name"
-              c:identifier="gtk_file_info_set_display_name">
+      <method name="set_title" c:identifier="gtk_font_button_set_title">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
-          <parameter name="display_name">
+          <parameter name="title">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_is_folder" c:identifier="gtk_file_info_get_is_folder">
+      <method name="get_use_font" c:identifier="gtk_font_button_get_use_font">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_is_folder" c:identifier="gtk_file_info_set_is_folder">
+      <method name="set_use_font" c:identifier="gtk_font_button_set_use_font">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
-          <parameter name="is_folder">
+          <parameter name="use_font">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_is_hidden" c:identifier="gtk_file_info_get_is_hidden">
+      <method name="get_use_size" c:identifier="gtk_font_button_get_use_size">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_is_hidden" c:identifier="gtk_file_info_set_is_hidden">
+      <method name="set_use_size" c:identifier="gtk_font_button_set_use_size">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
-          <parameter name="is_hidden">
+          <parameter name="use_size">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_mime_type" c:identifier="gtk_file_info_get_mime_type">
+      <method name="get_font_name"
+              c:identifier="gtk_font_button_get_font_name">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_mime_type" c:identifier="gtk_file_info_set_mime_type">
+      <method name="set_font_name"
+              c:identifier="gtk_font_button_set_font_name">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
-          <parameter name="mime_type">
+          <parameter name="fontname">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_modification_time"
-              c:identifier="gtk_file_info_get_modification_time">
+      <method name="get_show_style"
+              c:identifier="gtk_font_button_get_show_style">
         <return-value>
-          <type name="GtkFileTime" c:type="GtkFileTime"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_modification_time"
-              c:identifier="gtk_file_info_set_modification_time">
+      <method name="set_show_style"
+              c:identifier="gtk_font_button_set_show_style">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
-          <parameter name="modification_time">
-            <type name="GtkFileTime" c:type="GtkFileTime"/>
+          <parameter name="show_style">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_size" c:identifier="gtk_file_info_get_size">
+      <method name="get_show_size"
+              c:identifier="gtk_font_button_get_show_size">
         <return-value>
-          <type name="gint64" c:type="gint64"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_size" c:identifier="gtk_file_info_set_size">
+      <method name="set_show_size"
+              c:identifier="gtk_font_button_set_show_size">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
-          <parameter name="size">
-            <type name="gint64" c:type="gint64"/>
+          <parameter name="show_size">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_icon_name" c:identifier="gtk_file_info_set_icon_name">
+      <property name="title">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="font-name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="use-font">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="use-size">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="show-style">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="show-size">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="font_set">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
-          </parameter>
-          <parameter name="con_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="gfp">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_icon_name" c:identifier="gtk_file_info_get_icon_name">
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="font-set">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="font_button_new" c:identifier="gtk_font_button_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="font_button_new_with_font"
+              c:identifier="gtk_font_button_new_with_font">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="fontname">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="FontSelection"
+           c:type="GtkFontSelection"
+           parent="VBox"
+           glib:type-name="GtkFontSelection"
+           glib:get-type="gtk_font_selection_get_type">
+      <method name="get_font_name"
+              c:identifier="gtk_font_selection_get_font_name">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="fontsel">
+            <type name="FontSelection" c:type="GtkFontSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="render_icon" c:identifier="gtk_file_info_render_icon">
+      <method name="get_font" c:identifier="gtk_font_selection_get_font">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkFont" c:type="GdkFont*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="FileInfo" c:type="GtkFileInfo*"/>
+          <parameter name="fontsel">
+            <type name="FontSelection" c:type="GtkFontSelection*"/>
           </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+        </parameters>
+      </method>
+      <method name="set_font_name"
+              c:identifier="gtk_font_selection_set_font_name">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="fontsel">
+            <type name="FontSelection" c:type="GtkFontSelection*"/>
           </parameter>
-          <parameter name="pixel_size">
-            <type name="int32" c:type="gint"/>
+          <parameter name="fontname">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+        </parameters>
+      </method>
+      <method name="get_preview_text"
+              c:identifier="gtk_font_selection_get_preview_text">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="fontsel">
+            <type name="FontSelection" c:type="GtkFontSelection*"/>
           </parameter>
         </parameters>
       </method>
-    </glib:boxed>
-    <class name="FileSystemHandle"
-           c:type="GtkFileSystemHandle"
-           parent="GObject.Object"
-           glib:type-name="GtkFileSystemHandle"
-           glib:get-type="gtk_file_system_handle_get_type">
-      <property name="cancelled">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-    </class>
-    <callback name="GtkFileSystemGetInfoCallback">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="handle">
-          <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
-        </parameter>
-        <parameter name="file_info">
-          <type name="FileInfo" c:type="GtkFileInfo*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkFileSystemGetFolderCallback">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="handle">
-          <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
-        </parameter>
-        <parameter name="folder">
-          <type name="FileFolder" c:type="GtkFileFolder*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkFileSystemCreateFolderCallback">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="handle">
-          <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="FilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkFileSystemVolumeMountCallback">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="handle">
-          <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <interface name="FileSystem"
-               c:type="GtkFileSystem"
-               glib:type-name="GtkFileSystem"
-               glib:get-type="gtk_file_system_get_type">
-      <callback name="list_volumes">
+      <method name="set_preview_text"
+              c:identifier="gtk_font_selection_set_preview_text">
         <return-value>
-          <type name="GLib.GSList" c:type="GSList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
+          <parameter name="fontsel">
+            <type name="FontSelection" c:type="GtkFontSelection*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
+      </method>
+      <property name="font-name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="font">
+        <type name="GdkFont" c:type="GdkFont"/>
+      </property>
+      <property name="preview-text">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
       </callback>
-      <callback name="get_volume_for_path">
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="FilePath" c:type="GtkFilePath*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="get_folder">
+      <callback name="_gtk_reserved3">
         <return-value>
-          <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="FilePath" c:type="GtkFilePath*"/>
-          </parameter>
-          <parameter name="types">
-            <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkFileSystemGetFolderCallback"
-                  c:type="GtkFileSystemGetFolderCallback"/>
-          </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="get_info">
+      <callback name="_gtk_reserved4">
         <return-value>
-          <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="FilePath" c:type="GtkFilePath*"/>
-          </parameter>
-          <parameter name="types">
-            <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkFileSystemGetInfoCallback"
-                  c:type="GtkFileSystemGetInfoCallback"/>
-          </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="create_folder">
+    </class>
+    <function name="font_selection_new" c:identifier="gtk_font_selection_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="FontSelectionDialog"
+           c:type="GtkFontSelectionDialog"
+           parent="Dialog"
+           glib:type-name="GtkFontSelectionDialog"
+           glib:get-type="gtk_font_selection_dialog_get_type">
+      <method name="get_font_name"
+              c:identifier="gtk_font_selection_dialog_get_font_name">
         <return-value>
-          <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="FilePath" c:type="GtkFilePath*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkFileSystemCreateFolderCallback"
-                  c:type="GtkFileSystemCreateFolderCallback"/>
-          </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="fsd">
+            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="cancel_operation">
+      </method>
+      <method name="get_font"
+              c:identifier="gtk_font_selection_dialog_get_font">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GdkFont" c:type="GdkFont*"/>
         </return-value>
         <parameters>
-          <parameter name="handle">
-            <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
+          <parameter name="fsd">
+            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="volume_free">
+      </method>
+      <method name="set_font_name"
+              c:identifier="gtk_font_selection_dialog_set_font_name">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
+          <parameter name="fsd">
+            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
           </parameter>
-          <parameter name="volume">
-            <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
+          <parameter name="fontname">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="volume_get_base_path">
+      </method>
+      <method name="get_preview_text"
+              c:identifier="gtk_font_selection_dialog_get_preview_text">
         <return-value>
-          <type name="FilePath" c:type="GtkFilePath*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="volume">
-            <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
+          <parameter name="fsd">
+            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="volume_get_is_mounted">
+      </method>
+      <method name="set_preview_text"
+              c:identifier="gtk_font_selection_dialog_set_preview_text">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
+          <parameter name="fsd">
+            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
           </parameter>
-          <parameter name="volume">
-            <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
+      </method>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
       </callback>
-      <callback name="volume_mount">
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="volume">
-            <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkFileSystemVolumeMountCallback"
-                  c:type="GtkFileSystemVolumeMountCallback"/>
-          </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="volume_get_display_name">
+      <callback name="_gtk_reserved3">
         <return-value>
-          <type name="string" c:type="char*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="volume">
-            <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="volume_get_icon_name">
+      <callback name="_gtk_reserved4">
         <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="font_selection_dialog_new"
+              c:identifier="gtk_font_selection_dialog_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="title">
           <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="GammaCurve"
+           c:type="GtkGammaCurve"
+           parent="VBox"
+           glib:type-name="GtkGammaCurve"
+           glib:get-type="gtk_gamma_curve_get_type">
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="volume">
-            <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="get_parent">
+      <callback name="_gtk_reserved2">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="FilePath" c:type="GtkFilePath*"/>
-          </parameter>
-          <parameter name="parent">
-            <type name="FilePath" c:type="GtkFilePath**"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="make_path">
+      <callback name="_gtk_reserved3">
         <return-value>
-          <type name="FilePath" c:type="GtkFilePath*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="base_path">
-            <type name="FilePath" c:type="GtkFilePath*"/>
-          </parameter>
-          <parameter name="display_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="parse">
+      <callback name="_gtk_reserved4">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="gamma_curve_new" c:identifier="gtk_gamma_curve_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="gc_get" c:identifier="gtk_gc_get">
+      <return-value>
+        <type name="Gdk.GC" c:type="GdkGC*"/>
+      </return-value>
+      <parameters>
+        <parameter name="depth">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="colormap">
+          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
+        </parameter>
+        <parameter name="values">
+          <type name="Gdk.GdkGCValues" c:type="GdkGCValues*"/>
+        </parameter>
+        <parameter name="values_mask">
+          <type name="GdkGCValuesMask" c:type="GdkGCValuesMask"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="gc_release" c:identifier="gtk_gc_release">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="gc">
+          <type name="Gdk.GC" c:type="GdkGC*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="HandleBox"
+           c:type="GtkHandleBox"
+           parent="Bin"
+           glib:type-name="GtkHandleBox"
+           glib:get-type="gtk_handle_box_get_type">
+      <method name="set_shadow_type"
+              c:identifier="gtk_handle_box_set_shadow_type">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="base_path">
-            <type name="FilePath" c:type="GtkFilePath*"/>
-          </parameter>
-          <parameter name="str">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="folder">
-            <type name="FilePath" c:type="GtkFilePath**"/>
-          </parameter>
-          <parameter name="file_part">
-            <type name="GLib.gchar" c:type="gchar**"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="type">
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="path_to_uri">
+      </method>
+      <method name="get_shadow_type"
+              c:identifier="gtk_handle_box_get_shadow_type">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="ShadowType" c:type="GtkShadowType"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="FilePath" c:type="GtkFilePath*"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="path_to_filename">
+      </method>
+      <method name="set_handle_position"
+              c:identifier="gtk_handle_box_set_handle_position">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
-          <parameter name="path">
-            <type name="FilePath" c:type="GtkFilePath*"/>
+          <parameter name="position">
+            <type name="PositionType" c:type="GtkPositionType"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="uri_to_path">
+      </method>
+      <method name="get_handle_position"
+              c:identifier="gtk_handle_box_get_handle_position">
         <return-value>
-          <type name="FilePath" c:type="GtkFilePath*"/>
+          <type name="PositionType" c:type="GtkPositionType"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="uri">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="filename_to_path">
+      </method>
+      <method name="set_snap_edge" c:identifier="gtk_handle_box_set_snap_edge">
         <return-value>
-          <type name="FilePath" c:type="GtkFilePath*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
-          <parameter name="path">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="edge">
+            <type name="PositionType" c:type="GtkPositionType"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="insert_bookmark">
+      </method>
+      <method name="get_snap_edge" c:identifier="gtk_handle_box_get_snap_edge">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="PositionType" c:type="GtkPositionType"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="FilePath" c:type="GtkFilePath*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="remove_bookmark">
+      </method>
+      <property name="shadow">
+        <type name="ShadowType" c:type="GtkShadowType"/>
+      </property>
+      <property name="shadow-type">
+        <type name="ShadowType" c:type="GtkShadowType"/>
+      </property>
+      <property name="handle-position">
+        <type name="PositionType" c:type="GtkPositionType"/>
+      </property>
+      <property name="snap-edge">
+        <type name="PositionType" c:type="GtkPositionType"/>
+      </property>
+      <property name="snap-edge-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="child_attached">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="FilePath" c:type="GtkFilePath*"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="list_bookmarks">
+      <callback name="child_detached">
         <return-value>
-          <type name="GLib.GSList" c:type="GSList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="volumes_changed">
+      <callback name="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="bookmarks_changed">
+      <callback name="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="get_bookmark_label">
+      <callback name="_gtk_reserved3">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="FilePath" c:type="GtkFilePath*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="set_bookmark_label">
+      <callback name="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="file_system">
-            <type name="FileSystem" c:type="GtkFileSystem*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="FilePath" c:type="GtkFilePath*"/>
-          </parameter>
-          <parameter name="label">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <glib:signal name="volumes-changed">
+      <glib:signal name="child-attached">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Widget" c:type="GtkWidget"/>
+          </parameter>
+        </parameters>
       </glib:signal>
-      <glib:signal name="bookmarks-changed">
+      <glib:signal name="child-detached">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Widget" c:type="GtkWidget"/>
+          </parameter>
+        </parameters>
       </glib:signal>
-    </interface>
-    <function name="file_system_list_volumes"
-              c:identifier="gtk_file_system_list_volumes">
-      <return-value>
-        <type name="GLib.GSList" c:type="GSList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_get_volume_for_path"
-              c:identifier="gtk_file_system_get_volume_for_path">
+    </class>
+    <function name="handle_box_new" c:identifier="gtk_handle_box_new">
       <return-value>
-        <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="FilePath" c:type="GtkFilePath*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="file_system_volume_free"
-              c:identifier="gtk_file_system_volume_free">
+    <class name="HButtonBox"
+           c:type="GtkHButtonBox"
+           parent="ButtonBox"
+           glib:type-name="GtkHButtonBox"
+           glib:get-type="gtk_hbutton_box_get_type">
+    </class>
+    <function name="hbutton_box_new" c:identifier="gtk_hbutton_box_new">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="file_system_volume_get_base_path"
-              c:identifier="gtk_file_system_volume_get_base_path">
+    <function name="hbutton_box_get_spacing_default"
+              c:identifier="gtk_hbutton_box_get_spacing_default">
       <return-value>
-        <type name="FilePath" c:type="GtkFilePath*"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="file_system_volume_get_is_mounted"
-              c:identifier="gtk_file_system_volume_get_is_mounted">
+    <function name="hbutton_box_get_layout_default"
+              c:identifier="gtk_hbutton_box_get_layout_default">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
       </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="file_system_volume_mount"
-              c:identifier="gtk_file_system_volume_mount">
+    <function name="hbutton_box_set_spacing_default"
+              c:identifier="gtk_hbutton_box_set_spacing_default">
       <return-value>
-        <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GtkFileSystemVolumeMountCallback"
-                c:type="GtkFileSystemVolumeMountCallback"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="spacing">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_system_volume_get_display_name"
-              c:identifier="gtk_file_system_volume_get_display_name">
+    <function name="hbutton_box_set_layout_default"
+              c:identifier="gtk_hbutton_box_set_layout_default">
       <return-value>
-        <type name="string" c:type="char*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
+        <parameter name="layout">
+          <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_system_volume_render_icon"
-              c:identifier="gtk_file_system_volume_render_icon">
-      <return-value>
-        <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="pixel_size">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_volume_get_icon_name"
-              c:identifier="gtk_file_system_volume_get_icon_name">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="volume">
-          <type name="GtkFileSystemVolume" c:type="GtkFileSystemVolume*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_get_parent"
-              c:identifier="gtk_file_system_get_parent">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="FilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="parent">
-          <type name="FilePath" c:type="GtkFilePath**"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_get_folder"
-              c:identifier="gtk_file_system_get_folder">
-      <return-value>
-        <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="FilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="types">
-          <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GtkFileSystemGetFolderCallback"
-                c:type="GtkFileSystemGetFolderCallback"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_get_info"
-              c:identifier="gtk_file_system_get_info">
-      <return-value>
-        <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="FilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="types">
-          <type name="GtkFileInfoType" c:type="GtkFileInfoType"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GtkFileSystemGetInfoCallback"
-                c:type="GtkFileSystemGetInfoCallback"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_create_folder"
-              c:identifier="gtk_file_system_create_folder">
-      <return-value>
-        <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="FilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="callback">
-          <type name="GtkFileSystemCreateFolderCallback"
-                c:type="GtkFileSystemCreateFolderCallback"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_cancel_operation"
-              c:identifier="gtk_file_system_cancel_operation">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="handle">
-          <type name="FileSystemHandle" c:type="GtkFileSystemHandle*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_make_path"
-              c:identifier="gtk_file_system_make_path">
-      <return-value>
-        <type name="FilePath" c:type="GtkFilePath*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="base_path">
-          <type name="FilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="display_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_parse" c:identifier="gtk_file_system_parse">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="base_path">
-          <type name="FilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="str">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="folder">
-          <type name="FilePath" c:type="GtkFilePath**"/>
-        </parameter>
-        <parameter name="file_part">
-          <type name="GLib.gchar" c:type="gchar**"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_path_to_uri"
-              c:identifier="gtk_file_system_path_to_uri">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="FilePath" c:type="GtkFilePath*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_path_to_filename"
-              c:identifier="gtk_file_system_path_to_filename">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="FilePath" c:type="GtkFilePath*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_uri_to_path"
-              c:identifier="gtk_file_system_uri_to_path">
-      <return-value>
-        <type name="FilePath" c:type="GtkFilePath*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="uri">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_filename_to_path"
-              c:identifier="gtk_file_system_filename_to_path">
-      <return-value>
-        <type name="FilePath" c:type="GtkFilePath*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="filename">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_path_is_local"
-              c:identifier="gtk_file_system_path_is_local">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="filesystem">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="FilePath" c:type="GtkFilePath*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_insert_bookmark"
-              c:identifier="gtk_file_system_insert_bookmark">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="FilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="position">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_remove_bookmark"
-              c:identifier="gtk_file_system_remove_bookmark">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="FilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_list_bookmarks"
-              c:identifier="gtk_file_system_list_bookmarks">
-      <return-value>
-        <type name="GLib.GSList" c:type="GSList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_get_bookmark_label"
-              c:identifier="gtk_file_system_get_bookmark_label">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="FilePath" c:type="GtkFilePath*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_set_bookmark_label"
-              c:identifier="gtk_file_system_set_bookmark_label">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system">
-          <type name="FileSystem" c:type="GtkFileSystem*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="FilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="label">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <interface name="FileFolder"
-               c:type="GtkFileFolder"
-               glib:type-name="GtkFileFolder"
-               glib:get-type="gtk_file_folder_get_type">
-      <callback name="get_info">
-        <return-value>
-          <type name="FileInfo" c:type="GtkFileInfo*"/>
-        </return-value>
-        <parameters>
-          <parameter name="folder">
-            <type name="FileFolder" c:type="GtkFileFolder*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="FilePath" c:type="GtkFilePath*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="list_children">
+    <record name="GtkPanedPrivate" c:type="GtkPanedPrivate"/>
+    <class name="Paned"
+           c:type="GtkPaned"
+           parent="Container"
+           glib:type-name="GtkPaned"
+           glib:get-type="gtk_paned_get_type">
+      <method name="add1" c:identifier="gtk_paned_add1">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="folder">
-            <type name="FileFolder" c:type="GtkFileFolder*"/>
-          </parameter>
-          <parameter name="children">
-            <type name="GLib.GSList" c:type="GSList**"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="deleted">
+      </method>
+      <method name="add2" c:identifier="gtk_paned_add2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="monitor">
-            <type name="FileFolder" c:type="GtkFileFolder*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="files_added">
+      </method>
+      <method name="pack1" c:identifier="gtk_paned_pack1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="monitor">
-            <type name="FileFolder" c:type="GtkFileFolder*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
-          <parameter name="paths">
-            <type name="GLib.GSList" c:type="GSList*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="files_changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="monitor">
-            <type name="FileFolder" c:type="GtkFileFolder*"/>
+          <parameter name="resize">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="paths">
-            <type name="GLib.GSList" c:type="GSList*"/>
+          <parameter name="shrink">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="files_removed">
+      </method>
+      <method name="pack2" c:identifier="gtk_paned_pack2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="monitor">
-            <type name="FileFolder" c:type="GtkFileFolder*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
-          <parameter name="paths">
-            <type name="GLib.GSList" c:type="GSList*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="is_finished_loading">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="folder">
-            <type name="FileFolder" c:type="GtkFileFolder*"/>
+          <parameter name="resize">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="finished_loading">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="folder">
-            <type name="FileFolder" c:type="GtkFileFolder*"/>
+          <parameter name="shrink">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <glib:signal name="deleted">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="files-added">
+      </method>
+      <method name="get_position" c:identifier="gtk_paned_get_position">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="files-changed">
+      </method>
+      <method name="set_position" c:identifier="gtk_paned_set_position">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="files-removed">
+      </method>
+      <method name="get_child1" c:identifier="gtk_paned_get_child1">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="finished-loading">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </interface>
-    <function name="file_folder_list_children"
-              c:identifier="gtk_file_folder_list_children">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="folder">
-          <type name="FileFolder" c:type="GtkFileFolder*"/>
-        </parameter>
-        <parameter name="children">
-          <type name="GLib.GSList" c:type="GSList**"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_folder_get_info"
-              c:identifier="gtk_file_folder_get_info">
-      <return-value>
-        <type name="FileInfo" c:type="GtkFileInfo*"/>
-      </return-value>
-      <parameters>
-        <parameter name="folder">
-          <type name="FileFolder" c:type="GtkFileFolder*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="FilePath" c:type="GtkFilePath*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_folder_is_finished_loading"
-              c:identifier="gtk_file_folder_is_finished_loading">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="folder">
-          <type name="FileFolder" c:type="GtkFileFolder*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <glib:boxed c:type="FilePath"
-                glib:name="FilePath"
-                glib:type-name="GtkFilePath"
-                glib:get-type="gtk_file_path_get_type">
-    </glib:boxed>
-    <function name="file_paths_sort" c:identifier="gtk_file_paths_sort">
-      <return-value>
-        <type name="GLib.GSList" c:type="GSList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="paths">
-          <type name="GLib.GSList" c:type="GSList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_paths_copy" c:identifier="gtk_file_paths_copy">
-      <return-value>
-        <type name="GLib.GSList" c:type="GSList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="paths">
-          <type name="GLib.GSList" c:type="GSList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_paths_free" c:identifier="gtk_file_paths_free">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="paths">
-          <type name="GLib.GSList" c:type="GSList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_system_create" c:identifier="gtk_file_system_create">
-      <return-value>
-        <type name="FileSystem" c:type="GtkFileSystem*"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_system_name">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkFixedChild" c:type="GtkFixedChild">
-      <field name="widget">
-        <type name="Widget" c:type="GtkWidget*"/>
-      </field>
-      <field name="x">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="y">
-        <type name="int32" c:type="gint"/>
-      </field>
-    </record>
-    <class name="Fixed"
-           c:type="GtkFixed"
-           parent="Container"
-           glib:type-name="GtkFixed"
-           glib:get-type="gtk_fixed_get_type">
-      <method name="put" c:identifier="gtk_fixed_put">
+      </method>
+      <method name="get_child2" c:identifier="gtk_paned_get_child2">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="fixed">
-            <type name="Fixed" c:type="GtkFixed*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move" c:identifier="gtk_fixed_move">
+      <method name="compute_position"
+              c:identifier="gtk_paned_compute_position">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="fixed">
-            <type name="Fixed" c:type="GtkFixed*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="allocation">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="x">
+          <parameter name="child1_req">
             <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="y">
+          <parameter name="child2_req">
             <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_has_window" c:identifier="gtk_fixed_set_has_window">
+      <property name="position">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="position-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="min-position">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="max-position">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <callback name="cycle_child_focus">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="fixed">
-            <type name="Fixed" c:type="GtkFixed*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
-          <parameter name="has_window">
+          <parameter name="reverse">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_has_window" c:identifier="gtk_fixed_get_has_window">
+      </callback>
+      <callback name="toggle_handle_focus">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="fixed">
-            <type name="Fixed" c:type="GtkFixed*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
         </parameters>
-      </method>
-    </class>
-    <function name="fixed_new" c:identifier="gtk_fixed_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <record name="GtkFontButtonPrivate" c:type="GtkFontButtonPrivate"/>
-    <class name="FontButton"
-           c:type="GtkFontButton"
-           parent="Button"
-           glib:type-name="GtkFontButton"
-           glib:get-type="gtk_font_button_get_type">
-      <method name="get_title" c:identifier="gtk_font_button_get_title">
+      </callback>
+      <callback name="move_handle">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
+          </parameter>
+          <parameter name="scroll">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_title" c:identifier="gtk_font_button_set_title">
+      </callback>
+      <callback name="cycle_handle_focus">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
-          <parameter name="title">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="reverse">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_use_font" c:identifier="gtk_font_button_get_use_font">
+      </callback>
+      <callback name="accept_position">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_use_font" c:identifier="gtk_font_button_set_use_font">
+      </callback>
+      <callback name="cancel_position">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
-          <parameter name="use_font">
+        </parameters>
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="cycle-child-focus">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_use_size" c:identifier="gtk_font_button_get_use_size">
+      </glib:signal>
+      <glib:signal name="toggle-handle-focus">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="move-handle">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="object">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_use_size" c:identifier="gtk_font_button_set_use_size">
+      </glib:signal>
+      <glib:signal name="cycle-handle-focus">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
-          </parameter>
-          <parameter name="use_size">
+          <parameter name="object">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_font_name"
-              c:identifier="gtk_font_button_get_font_name">
+      </glib:signal>
+      <glib:signal name="accept-position">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="cancel-position">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <class name="HPaned"
+           c:type="GtkHPaned"
+           parent="Paned"
+           glib:type-name="GtkHPaned"
+           glib:get-type="gtk_hpaned_get_type">
+    </class>
+    <function name="hpaned_new" c:identifier="gtk_hpaned_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <record name="GtkRulerMetric" c:type="GtkRulerMetric">
+      <field name="metric_name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="abbrev">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="pixels_per_unit">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="ruler_scale">
+        <type name="double" c:type="gdouble"/>
+      </field>
+      <field name="subdivide">
+        <type name="int32" c:type="gint"/>
+      </field>
+    </record>
+    <class name="Ruler"
+           c:type="GtkRuler"
+           parent="Widget"
+           glib:type-name="GtkRuler"
+           glib:get-type="gtk_ruler_get_type">
+      <method name="set_metric" c:identifier="gtk_ruler_set_metric">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="ruler">
+            <type name="Ruler" c:type="GtkRuler*"/>
+          </parameter>
+          <parameter name="metric">
+            <type name="MetricType" c:type="GtkMetricType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_font_name"
-              c:identifier="gtk_font_button_set_font_name">
+      <method name="set_range" c:identifier="gtk_ruler_set_range">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="ruler">
+            <type name="Ruler" c:type="GtkRuler*"/>
           </parameter>
-          <parameter name="fontname">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="lower">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="upper">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="position">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="max_size">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_show_style"
-              c:identifier="gtk_font_button_get_show_style">
+      <method name="draw_ticks" c:identifier="gtk_ruler_draw_ticks">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="ruler">
+            <type name="Ruler" c:type="GtkRuler*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_show_style"
-              c:identifier="gtk_font_button_set_show_style">
+      <method name="draw_pos" c:identifier="gtk_ruler_draw_pos">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
-          </parameter>
-          <parameter name="show_style">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="ruler">
+            <type name="Ruler" c:type="GtkRuler*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_show_size"
-              c:identifier="gtk_font_button_get_show_size">
+      <method name="get_metric" c:identifier="gtk_ruler_get_metric">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="MetricType" c:type="GtkMetricType"/>
         </return-value>
         <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="ruler">
+            <type name="Ruler" c:type="GtkRuler*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_show_size"
-              c:identifier="gtk_font_button_set_show_size">
+      <method name="get_range" c:identifier="gtk_ruler_get_range">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="ruler">
+            <type name="Ruler" c:type="GtkRuler*"/>
           </parameter>
-          <parameter name="show_size">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="lower">
+            <type name="GLib.gdouble" c:type="gdouble*"/>
+          </parameter>
+          <parameter name="upper">
+            <type name="GLib.gdouble" c:type="gdouble*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="GLib.gdouble" c:type="gdouble*"/>
+          </parameter>
+          <parameter name="max_size">
+            <type name="GLib.gdouble" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="title">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="font-name">
-        <type name="string" c:type="gchararray"/>
+      <property name="lower">
+        <type name="double" c:type="gdouble"/>
       </property>
-      <property name="use-font">
-        <type name="boolean" c:type="gboolean"/>
+      <property name="upper">
+        <type name="double" c:type="gdouble"/>
       </property>
-      <property name="use-size">
-        <type name="boolean" c:type="gboolean"/>
+      <property name="position">
+        <type name="double" c:type="gdouble"/>
       </property>
-      <property name="show-style">
-        <type name="boolean" c:type="gboolean"/>
+      <property name="max-size">
+        <type name="double" c:type="gdouble"/>
       </property>
-      <property name="show-size">
-        <type name="boolean" c:type="gboolean"/>
+      <property name="metric">
+        <type name="MetricType" c:type="GtkMetricType"/>
       </property>
-      <callback name="font_set">
+      <callback name="draw_ticks">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="gfp">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="ruler">
+            <type name="Ruler" c:type="GtkRuler*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="draw_pos">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="ruler">
+            <type name="Ruler" c:type="GtkRuler*"/>
           </parameter>
         </parameters>
       </callback>
@@ -43507,198 +42889,166 @@
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="font-set">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
     </class>
-    <function name="font_button_new" c:identifier="gtk_font_button_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="font_button_new_with_font"
-              c:identifier="gtk_font_button_new_with_font">
+    <class name="HRuler"
+           c:type="GtkHRuler"
+           parent="Ruler"
+           glib:type-name="GtkHRuler"
+           glib:get-type="gtk_hruler_get_type">
+    </class>
+    <function name="hruler_new" c:identifier="gtk_hruler_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="fontname">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
     </function>
-    <class name="FontSelection"
-           c:type="GtkFontSelection"
-           parent="VBox"
-           glib:type-name="GtkFontSelection"
-           glib:get-type="gtk_font_selection_get_type">
-      <method name="get_font_name"
-              c:identifier="gtk_font_selection_get_font_name">
+    <class name="Scale"
+           c:type="GtkScale"
+           parent="Range"
+           glib:type-name="GtkScale"
+           glib:get-type="gtk_scale_get_type">
+      <method name="set_digits" c:identifier="gtk_scale_set_digits">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="fontsel">
-            <type name="FontSelection" c:type="GtkFontSelection*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
+          </parameter>
+          <parameter name="digits">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_font" c:identifier="gtk_font_selection_get_font">
+      <method name="get_digits" c:identifier="gtk_scale_get_digits">
         <return-value>
-          <type name="GdkFont" c:type="GdkFont*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="fontsel">
-            <type name="FontSelection" c:type="GtkFontSelection*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_font_name"
-              c:identifier="gtk_font_selection_set_font_name">
+      <method name="set_draw_value" c:identifier="gtk_scale_set_draw_value">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="fontsel">
-            <type name="FontSelection" c:type="GtkFontSelection*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
-          <parameter name="fontname">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="draw_value">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_preview_text"
-              c:identifier="gtk_font_selection_get_preview_text">
+      <method name="get_draw_value" c:identifier="gtk_scale_get_draw_value">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="fontsel">
-            <type name="FontSelection" c:type="GtkFontSelection*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_preview_text"
-              c:identifier="gtk_font_selection_set_preview_text">
+      <method name="set_value_pos" c:identifier="gtk_scale_set_value_pos">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="fontsel">
-            <type name="FontSelection" c:type="GtkFontSelection*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="pos">
+            <type name="PositionType" c:type="GtkPositionType"/>
           </parameter>
         </parameters>
       </method>
-      <property name="font-name">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="font">
-        <type name="GdkFont" c:type="GdkFont"/>
-      </property>
-      <property name="preview-text">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-    </class>
-    <function name="font_selection_new" c:identifier="gtk_font_selection_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <class name="FontSelectionDialog"
-           c:type="GtkFontSelectionDialog"
-           parent="Dialog"
-           glib:type-name="GtkFontSelectionDialog"
-           glib:get-type="gtk_font_selection_dialog_get_type">
-      <method name="get_font_name"
-              c:identifier="gtk_font_selection_dialog_get_font_name">
+      <method name="get_value_pos" c:identifier="gtk_scale_get_value_pos">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="PositionType" c:type="GtkPositionType"/>
         </return-value>
         <parameters>
-          <parameter name="fsd">
-            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_font"
-              c:identifier="gtk_font_selection_dialog_get_font">
+      <method name="get_layout" c:identifier="gtk_scale_get_layout">
         <return-value>
-          <type name="GdkFont" c:type="GdkFont*"/>
+          <type name="Pango.Layout" c:type="PangoLayout*"/>
         </return-value>
         <parameters>
-          <parameter name="fsd">
-            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_font_name"
-              c:identifier="gtk_font_selection_dialog_set_font_name">
+      <method name="get_layout_offsets"
+              c:identifier="gtk_scale_get_layout_offsets">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="fsd">
-            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
-          <parameter name="fontname">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="x">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="y">
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_preview_text"
-              c:identifier="gtk_font_selection_dialog_get_preview_text">
+      <property name="digits">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="draw-value">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="value-pos">
+        <type name="PositionType" c:type="GtkPositionType"/>
+      </property>
+      <callback name="format_value">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="fsd">
-            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_preview_text"
-              c:identifier="gtk_font_selection_dialog_set_preview_text">
+      </callback>
+      <callback name="draw_value">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="fsd">
-            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
         </parameters>
-      </method>
-      <callback name="_gtk_reserved1">
+      </callback>
+      <callback name="get_layout_offsets">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="y">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+        </parameters>
       </callback>
       <callback name="_gtk_reserved2">
         <return-value>
@@ -43715,197 +43065,167 @@
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
+      <glib:signal name="format-value">
+        <return-value>
+          <type name="string" c:type="gchararray"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
     </class>
-    <function name="font_selection_dialog_new"
-              c:identifier="gtk_font_selection_dialog_new">
+    <function name="scale_clear_layout" c:identifier="_gtk_scale_clear_layout">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="title">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="scale">
+          <type name="Scale" c:type="GtkScale*"/>
         </parameter>
       </parameters>
     </function>
-    <class name="GammaCurve"
-           c:type="GtkGammaCurve"
-           parent="VBox"
-           glib:type-name="GtkGammaCurve"
-           glib:get-type="gtk_gamma_curve_get_type">
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-    </class>
-    <function name="gamma_curve_new" c:identifier="gtk_gamma_curve_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="gc_get" c:identifier="gtk_gc_get">
+    <function name="scale_get_value_size"
+              c:identifier="_gtk_scale_get_value_size">
       <return-value>
-        <type name="Gdk.GC" c:type="GdkGC*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="depth">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="colormap">
-          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
+        <parameter name="scale">
+          <type name="Scale" c:type="GtkScale*"/>
         </parameter>
-        <parameter name="values">
-          <type name="Gdk.GdkGCValues" c:type="GdkGCValues*"/>
+        <parameter name="width">
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
-        <parameter name="values_mask">
-          <type name="GdkGCValuesMask" c:type="GdkGCValuesMask"/>
+        <parameter name="height">
+          <type name="GLib.gint" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="gc_release" c:identifier="gtk_gc_release">
+    <function name="scale_format_value" c:identifier="_gtk_scale_format_value">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="gc">
-          <type name="Gdk.GC" c:type="GdkGC*"/>
+        <parameter name="scale">
+          <type name="Scale" c:type="GtkScale*"/>
+        </parameter>
+        <parameter name="value">
+          <type name="double" c:type="gdouble"/>
         </parameter>
       </parameters>
     </function>
-    <class name="HandleBox"
-           c:type="GtkHandleBox"
-           parent="Bin"
-           glib:type-name="GtkHandleBox"
-           glib:get-type="gtk_handle_box_get_type">
-      <method name="set_shadow_type"
-              c:identifier="gtk_handle_box_set_shadow_type">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="ShadowType" c:type="GtkShadowType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_shadow_type"
-              c:identifier="gtk_handle_box_get_shadow_type">
+    <class name="HScale"
+           c:type="GtkHScale"
+           parent="Scale"
+           glib:type-name="GtkHScale"
+           glib:get-type="gtk_hscale_get_type">
+    </class>
+    <function name="hscale_new" c:identifier="gtk_hscale_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="adjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="hscale_new_with_range"
+              c:identifier="gtk_hscale_new_with_range">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="min">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+        <parameter name="max">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+        <parameter name="step">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="Separator"
+           c:type="GtkSeparator"
+           parent="Widget"
+           glib:type-name="GtkSeparator"
+           glib:get-type="gtk_separator_get_type">
+    </class>
+    <class name="HSeparator"
+           c:type="GtkHSeparator"
+           parent="Separator"
+           glib:type-name="GtkHSeparator"
+           glib:get-type="gtk_hseparator_get_type">
+    </class>
+    <function name="hseparator_new" c:identifier="gtk_hseparator_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="IconFactory"
+           c:type="GtkIconFactory"
+           parent="GObject.Object"
+           glib:type-name="GtkIconFactory"
+           glib:get-type="gtk_icon_factory_get_type">
+      <constructor name="new" c:identifier="gtk_icon_factory_new">
         <return-value>
-          <type name="ShadowType" c:type="GtkShadowType"/>
+          <type name="IconFactory" c:type="GtkIconFactory*"/>
         </return-value>
-        <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_handle_position"
-              c:identifier="gtk_handle_box_set_handle_position">
+      </constructor>
+      <method name="add" c:identifier="gtk_icon_factory_add">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
+          <parameter name="factory">
+            <type name="IconFactory" c:type="GtkIconFactory*"/>
           </parameter>
-          <parameter name="position">
-            <type name="PositionType" c:type="GtkPositionType"/>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_handle_position"
-              c:identifier="gtk_handle_box_get_handle_position">
-        <return-value>
-          <type name="PositionType" c:type="GtkPositionType"/>
-        </return-value>
-        <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_snap_edge" c:identifier="gtk_handle_box_set_snap_edge">
+      <method name="lookup" c:identifier="gtk_icon_factory_lookup">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="IconSet" c:type="GtkIconSet*"/>
         </return-value>
         <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
-          </parameter>
-          <parameter name="edge">
-            <type name="PositionType" c:type="GtkPositionType"/>
+          <parameter name="factory">
+            <type name="IconFactory" c:type="GtkIconFactory*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_snap_edge" c:identifier="gtk_handle_box_get_snap_edge">
-        <return-value>
-          <type name="PositionType" c:type="GtkPositionType"/>
-        </return-value>
-        <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="shadow">
-        <type name="ShadowType" c:type="GtkShadowType"/>
-      </property>
-      <property name="shadow-type">
-        <type name="ShadowType" c:type="GtkShadowType"/>
-      </property>
-      <property name="handle-position">
-        <type name="PositionType" c:type="GtkPositionType"/>
-      </property>
-      <property name="snap-edge">
-        <type name="PositionType" c:type="GtkPositionType"/>
-      </property>
-      <property name="snap-edge-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="child_attached">
+      <method name="add_default" c:identifier="gtk_icon_factory_add_default">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="factory">
+            <type name="IconFactory" c:type="GtkIconFactory*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="child_detached">
+      </method>
+      <method name="remove_default"
+              c:identifier="gtk_icon_factory_remove_default">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="factory">
+            <type name="IconFactory" c:type="GtkIconFactory*"/>
           </parameter>
         </parameters>
-      </callback>
+      </method>
       <callback name="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
@@ -43926,1965 +43246,1846 @@
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="child-attached">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Widget" c:type="GtkWidget"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="child-detached">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Widget" c:type="GtkWidget"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
     </class>
-    <function name="handle_box_new" c:identifier="gtk_handle_box_new">
+    <function name="icon_factory_lookup_default"
+              c:identifier="gtk_icon_factory_lookup_default">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="IconSet" c:type="GtkIconSet*"/>
       </return-value>
+      <parameters>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
     </function>
-    <class name="HButtonBox"
-           c:type="GtkHButtonBox"
-           parent="ButtonBox"
-           glib:type-name="GtkHButtonBox"
-           glib:get-type="gtk_hbutton_box_get_type">
-    </class>
-    <function name="hbutton_box_new" c:identifier="gtk_hbutton_box_new">
+    <function name="icon_size_lookup" c:identifier="gtk_icon_size_lookup">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
+      <parameters>
+        <parameter name="size">
+          <type name="IconSize" c:type="GtkIconSize"/>
+        </parameter>
+        <parameter name="width">
+          <type name="GLib.gint" c:type="gint*"/>
+        </parameter>
+        <parameter name="height">
+          <type name="GLib.gint" c:type="gint*"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="hbutton_box_get_spacing_default"
-              c:identifier="gtk_hbutton_box_get_spacing_default">
+    <function name="icon_size_lookup_for_settings"
+              c:identifier="gtk_icon_size_lookup_for_settings">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
+      <parameters>
+        <parameter name="settings">
+          <type name="Settings" c:type="GtkSettings*"/>
+        </parameter>
+        <parameter name="size">
+          <type name="IconSize" c:type="GtkIconSize"/>
+        </parameter>
+        <parameter name="width">
+          <type name="GLib.gint" c:type="gint*"/>
+        </parameter>
+        <parameter name="height">
+          <type name="GLib.gint" c:type="gint*"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="hbutton_box_get_layout_default"
-              c:identifier="gtk_hbutton_box_get_layout_default">
+    <function name="icon_size_register" c:identifier="gtk_icon_size_register">
       <return-value>
-        <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
+        <type name="IconSize" c:type="GtkIconSize"/>
       </return-value>
+      <parameters>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="hbutton_box_set_spacing_default"
-              c:identifier="gtk_hbutton_box_set_spacing_default">
+    <function name="icon_size_register_alias"
+              c:identifier="gtk_icon_size_register_alias">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="spacing">
-          <type name="int32" c:type="gint"/>
+        <parameter name="alias">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="target">
+          <type name="IconSize" c:type="GtkIconSize"/>
         </parameter>
       </parameters>
     </function>
-    <function name="hbutton_box_set_layout_default"
-              c:identifier="gtk_hbutton_box_set_layout_default">
+    <function name="icon_size_from_name"
+              c:identifier="gtk_icon_size_from_name">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="IconSize" c:type="GtkIconSize"/>
       </return-value>
       <parameters>
-        <parameter name="layout">
-          <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkPanedPrivate" c:type="GtkPanedPrivate"/>
-    <class name="Paned"
-           c:type="GtkPaned"
-           parent="Container"
-           glib:type-name="GtkPaned"
-           glib:get-type="gtk_paned_get_type">
-      <method name="add1" c:identifier="gtk_paned_add1">
+    <function name="icon_size_get_name" c:identifier="gtk_icon_size_get_name">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="size">
+          <type name="IconSize" c:type="GtkIconSize"/>
+        </parameter>
+      </parameters>
+    </function>
+    <glib:boxed c:type="IconSet"
+                glib:name="IconSet"
+                glib:type-name="GtkIconSet"
+                glib:get-type="gtk_icon_set_get_type">
+      <constructor name="new" c:identifier="gtk_icon_set_new">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="IconSet" c:type="GtkIconSet*"/>
+        </return-value>
+      </constructor>
+      <constructor name="new_from_pixbuf"
+                   c:identifier="gtk_icon_set_new_from_pixbuf">
+        <return-value>
+          <type name="IconSet" c:type="GtkIconSet*"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="pixbuf">
+            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="add2" c:identifier="gtk_paned_add2">
+      </constructor>
+      <constructor name="ref" c:identifier="gtk_icon_set_ref">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="IconSet" c:type="GtkIconSet*"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+        </parameters>
+      </constructor>
+      <constructor name="copy" c:identifier="gtk_icon_set_copy">
+        <return-value>
+          <type name="IconSet" c:type="GtkIconSet*"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="pack1" c:identifier="gtk_paned_pack1">
+      </constructor>
+      <method name="unref" c:identifier="gtk_icon_set_unref">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="resize">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="shrink">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="pack2" c:identifier="gtk_paned_pack2">
+      <method name="render_icon" c:identifier="gtk_icon_set_render_icon">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
-          <parameter name="resize">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="direction">
+            <type name="TextDirection" c:type="GtkTextDirection"/>
           </parameter>
-          <parameter name="shrink">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="state">
+            <type name="StateType" c:type="GtkStateType"/>
+          </parameter>
+          <parameter name="size">
+            <type name="IconSize" c:type="GtkIconSize"/>
+          </parameter>
+          <parameter name="widget" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="detail" allow-none="1">
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_position" c:identifier="gtk_paned_get_position">
+      <method name="add_source" c:identifier="gtk_icon_set_add_source">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
+          </parameter>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_position" c:identifier="gtk_paned_set_position">
+      <method name="get_sizes" c:identifier="gtk_icon_set_get_sizes">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
+          <parameter name="sizes">
+            <type name="IconSize" c:type="GtkIconSize**"/>
+          </parameter>
+          <parameter name="n_sizes">
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_child1" c:identifier="gtk_paned_get_child1">
+    </glib:boxed>
+    <glib:boxed c:type="IconSource"
+                glib:name="IconSource"
+                glib:type-name="GtkIconSource"
+                glib:get-type="gtk_icon_source_get_type">
+      <constructor name="new" c:identifier="gtk_icon_source_new">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="IconSource" c:type="GtkIconSource*"/>
+        </return-value>
+      </constructor>
+      <constructor name="copy" c:identifier="gtk_icon_source_copy">
+        <return-value>
+          <type name="IconSource" c:type="GtkIconSource*"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_child2" c:identifier="gtk_paned_get_child2">
+      </constructor>
+      <method name="free" c:identifier="gtk_icon_source_free">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="compute_position"
-              c:identifier="gtk_paned_compute_position">
+      <method name="set_filename" c:identifier="gtk_icon_source_set_filename">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
-          </parameter>
-          <parameter name="allocation">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="child1_req">
-            <type name="int32" c:type="gint"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
-          <parameter name="child2_req">
-            <type name="int32" c:type="gint"/>
+          <parameter name="filename">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="position">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="position-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="min-position">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="max-position">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <callback name="cycle_child_focus">
+      <method name="set_icon_name"
+              c:identifier="gtk_icon_source_set_icon_name">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
-          <parameter name="reverse">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="icon_name" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="toggle_handle_focus">
+      </method>
+      <method name="set_pixbuf" c:identifier="gtk_icon_source_set_pixbuf">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+          <parameter name="pixbuf">
+            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="move_handle">
+      </method>
+      <method name="get_filename" c:identifier="gtk_icon_source_get_filename">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
-          </parameter>
-          <parameter name="scroll">
-            <type name="ScrollType" c:type="GtkScrollType"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="cycle_handle_focus">
+      </method>
+      <method name="get_icon_name"
+              c:identifier="gtk_icon_source_get_icon_name">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
-          </parameter>
-          <parameter name="reverse">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="accept_position">
+      </method>
+      <method name="get_pixbuf" c:identifier="gtk_icon_source_get_pixbuf">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="cancel_position">
+      </method>
+      <method name="set_direction_wildcarded"
+              c:identifier="gtk_icon_source_set_direction_wildcarded">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+      </method>
+      <method name="set_state_wildcarded"
+              c:identifier="gtk_icon_source_set_state_wildcarded">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_size_wildcarded"
+              c:identifier="gtk_icon_source_set_size_wildcarded">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <glib:signal name="cycle-child-focus">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
         <parameters>
-          <parameter name="object">
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+          <parameter name="setting">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="toggle-handle-focus">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="move-handle">
+      </method>
+      <method name="get_size_wildcarded"
+              c:identifier="gtk_icon_source_get_size_wildcarded">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="ScrollType" c:type="GtkScrollType"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="cycle-handle-focus">
+      </method>
+      <method name="get_state_wildcarded"
+              c:identifier="gtk_icon_source_get_state_wildcarded">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="accept-position">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="cancel-position">
+      </method>
+      <method name="get_direction_wildcarded"
+              c:identifier="gtk_icon_source_get_direction_wildcarded">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </glib:signal>
-    </class>
-    <class name="HPaned"
-           c:type="GtkHPaned"
-           parent="Paned"
-           glib:type-name="GtkHPaned"
-           glib:get-type="gtk_hpaned_get_type">
-    </class>
-    <function name="hpaned_new" c:identifier="gtk_hpaned_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <record name="GtkRulerMetric" c:type="GtkRulerMetric">
-      <field name="metric_name">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="abbrev">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="pixels_per_unit">
-        <type name="double" c:type="gdouble"/>
-      </field>
-      <field name="ruler_scale">
-        <type name="double" c:type="gdouble"/>
-      </field>
-      <field name="subdivide">
-        <type name="int32" c:type="gint"/>
-      </field>
-    </record>
-    <class name="Ruler"
-           c:type="GtkRuler"
-           parent="Widget"
-           glib:type-name="GtkRuler"
-           glib:get-type="gtk_ruler_get_type">
-      <method name="set_metric" c:identifier="gtk_ruler_set_metric">
+        <parameters>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_direction"
+              c:identifier="gtk_icon_source_set_direction">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ruler">
-            <type name="Ruler" c:type="GtkRuler*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
-          <parameter name="metric">
-            <type name="MetricType" c:type="GtkMetricType"/>
+          <parameter name="direction">
+            <type name="TextDirection" c:type="GtkTextDirection"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_range" c:identifier="gtk_ruler_set_range">
+      <method name="set_state" c:identifier="gtk_icon_source_set_state">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ruler">
-            <type name="Ruler" c:type="GtkRuler*"/>
-          </parameter>
-          <parameter name="lower">
-            <type name="double" c:type="gdouble"/>
-          </parameter>
-          <parameter name="upper">
-            <type name="double" c:type="gdouble"/>
-          </parameter>
-          <parameter name="position">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
-          <parameter name="max_size">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="state">
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="draw_ticks" c:identifier="gtk_ruler_draw_ticks">
+      <method name="set_size" c:identifier="gtk_icon_source_set_size">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ruler">
-            <type name="Ruler" c:type="GtkRuler*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+          <parameter name="size">
+            <type name="IconSize" c:type="GtkIconSize"/>
           </parameter>
         </parameters>
       </method>
-      <method name="draw_pos" c:identifier="gtk_ruler_draw_pos">
+      <method name="get_direction"
+              c:identifier="gtk_icon_source_get_direction">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TextDirection" c:type="GtkTextDirection"/>
         </return-value>
         <parameters>
-          <parameter name="ruler">
-            <type name="Ruler" c:type="GtkRuler*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_metric" c:identifier="gtk_ruler_get_metric">
+      <method name="get_state" c:identifier="gtk_icon_source_get_state">
         <return-value>
-          <type name="MetricType" c:type="GtkMetricType"/>
+          <type name="StateType" c:type="GtkStateType"/>
         </return-value>
         <parameters>
-          <parameter name="ruler">
-            <type name="Ruler" c:type="GtkRuler*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_range" c:identifier="gtk_ruler_get_range">
+      <method name="get_size" c:identifier="gtk_icon_source_get_size">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="IconSize" c:type="GtkIconSize"/>
         </return-value>
         <parameters>
-          <parameter name="ruler">
-            <type name="Ruler" c:type="GtkRuler*"/>
-          </parameter>
-          <parameter name="lower">
-            <type name="GLib.gdouble" c:type="gdouble*"/>
-          </parameter>
-          <parameter name="upper">
-            <type name="GLib.gdouble" c:type="gdouble*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="GLib.gdouble" c:type="gdouble*"/>
-          </parameter>
-          <parameter name="max_size">
-            <type name="GLib.gdouble" c:type="gdouble*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="lower">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <property name="upper">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <property name="position">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <property name="max-size">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <property name="metric">
-        <type name="MetricType" c:type="GtkMetricType"/>
-      </property>
-      <callback name="draw_ticks">
+    </glib:boxed>
+    <function name="icon_set_invalidate_caches"
+              c:identifier="_gtk_icon_set_invalidate_caches">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="icon_factory_list_ids"
+              c:identifier="_gtk_icon_factory_list_ids">
+      <return-value>
+        <type name="GLib.GList" c:type="GList*"/>
+      </return-value>
+    </function>
+    <function name="icon_factory_ensure_default_icons"
+              c:identifier="_gtk_icon_factory_ensure_default_icons">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <record name="GtkIconThemePrivate" c:type="GtkIconThemePrivate"/>
+    <function name="icon_theme_error_quark"
+              c:identifier="gtk_icon_theme_error_quark">
+      <return-value>
+        <type name="GLib.GQuark" c:type="GQuark"/>
+      </return-value>
+    </function>
+    <class name="IconTheme"
+           c:type="GtkIconTheme"
+           parent="GObject.Object"
+           glib:type-name="GtkIconTheme"
+           glib:get-type="gtk_icon_theme_get_type">
+      <constructor name="new" c:identifier="gtk_icon_theme_new">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="IconTheme" c:type="GtkIconTheme*"/>
+        </return-value>
+      </constructor>
+      <constructor name="get_default"
+                   c:identifier="gtk_icon_theme_get_default">
+        <return-value>
+          <type name="IconTheme" c:type="GtkIconTheme*"/>
+        </return-value>
+      </constructor>
+      <constructor name="get_for_screen"
+                   c:identifier="gtk_icon_theme_get_for_screen">
+        <return-value>
+          <type name="IconTheme" c:type="GtkIconTheme*"/>
         </return-value>
         <parameters>
-          <parameter name="ruler">
-            <type name="Ruler" c:type="GtkRuler*"/>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="draw_pos">
+      </constructor>
+      <method name="set_screen" c:identifier="gtk_icon_theme_set_screen">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ruler">
-            <type name="Ruler" c:type="GtkRuler*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          </parameter>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+      </method>
+      <method name="set_search_path"
+              c:identifier="gtk_icon_theme_set_search_path">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="n_elements">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_search_path"
+              c:identifier="gtk_icon_theme_get_search_path">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-    </class>
-    <class name="HRuler"
-           c:type="GtkHRuler"
-           parent="Ruler"
-           glib:type-name="GtkHRuler"
-           glib:get-type="gtk_hruler_get_type">
-    </class>
-    <function name="hruler_new" c:identifier="gtk_hruler_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <class name="Scale"
-           c:type="GtkScale"
-           parent="Range"
-           glib:type-name="GtkScale"
-           glib:get-type="gtk_scale_get_type">
-      <method name="set_digits" c:identifier="gtk_scale_set_digits">
+        <parameters>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GLib.gchar" c:type="gchar**"/>
+          </parameter>
+          <parameter name="n_elements">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="append_search_path"
+              c:identifier="gtk_icon_theme_append_search_path">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
-          <parameter name="digits">
-            <type name="int32" c:type="gint"/>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_digits" c:identifier="gtk_scale_get_digits">
+      <method name="prepend_search_path"
+              c:identifier="gtk_icon_theme_prepend_search_path">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_draw_value" c:identifier="gtk_scale_set_draw_value">
+      <method name="set_custom_theme"
+              c:identifier="gtk_icon_theme_set_custom_theme">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
-          <parameter name="draw_value">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="theme_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_draw_value" c:identifier="gtk_scale_get_draw_value">
+      <method name="has_icon" c:identifier="gtk_icon_theme_has_icon">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          </parameter>
+          <parameter name="icon_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_value_pos" c:identifier="gtk_scale_set_value_pos">
+      <method name="get_icon_sizes"
+              c:identifier="gtk_icon_theme_get_icon_sizes">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.gint" c:type="gint*"/>
         </return-value>
         <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
-          <parameter name="pos">
-            <type name="PositionType" c:type="GtkPositionType"/>
+          <parameter name="icon_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_value_pos" c:identifier="gtk_scale_get_value_pos">
+      <method name="lookup_icon" c:identifier="gtk_icon_theme_lookup_icon">
         <return-value>
-          <type name="PositionType" c:type="GtkPositionType"/>
+          <type name="IconInfo" c:type="GtkIconInfo*"/>
         </return-value>
         <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          </parameter>
+          <parameter name="icon_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="size">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="IconLookupFlags" c:type="GtkIconLookupFlags"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_layout" c:identifier="gtk_scale_get_layout">
+      <method name="choose_icon" c:identifier="gtk_icon_theme_choose_icon">
         <return-value>
-          <type name="Pango.Layout" c:type="PangoLayout*"/>
+          <type name="IconInfo" c:type="GtkIconInfo*"/>
         </return-value>
         <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          </parameter>
+          <parameter name="icon_names">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="size">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="IconLookupFlags" c:type="GtkIconLookupFlags"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_layout_offsets"
-              c:identifier="gtk_scale_get_layout_offsets">
+      <method name="load_icon" c:identifier="gtk_icon_theme_load_icon">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
-          <parameter name="x">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="icon_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="y">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="size">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="IconLookupFlags" c:type="GtkIconLookupFlags"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
-      <property name="digits">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="draw-value">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="value-pos">
-        <type name="PositionType" c:type="GtkPositionType"/>
-      </property>
-      <callback name="format_value">
+      <method name="list_icons" c:identifier="gtk_icon_theme_list_icons">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
-          <parameter name="value">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="context">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="draw_value">
+      </method>
+      <method name="list_contexts" c:identifier="gtk_icon_theme_list_contexts">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_layout_offsets">
+      </method>
+      <method name="get_example_icon_name"
+              c:identifier="gtk_icon_theme_get_example_icon_name">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="char*"/>
         </return-value>
         <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved2">
+      </method>
+      <method name="rescan_if_needed"
+              c:identifier="gtk_icon_theme_rescan_if_needed">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <callback name="changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="_gtk_reserved4">
+      <glib:signal name="changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <glib:signal name="format-value">
-        <return-value>
-          <type name="string" c:type="gchararray"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="double" c:type="gdouble"/>
-          </parameter>
-        </parameters>
       </glib:signal>
     </class>
-    <function name="scale_clear_layout" c:identifier="_gtk_scale_clear_layout">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="scale">
-          <type name="Scale" c:type="GtkScale*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="scale_get_value_size"
-              c:identifier="_gtk_scale_get_value_size">
+    <function name="icon_theme_add_builtin_icon"
+              c:identifier="gtk_icon_theme_add_builtin_icon">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="scale">
-          <type name="Scale" c:type="GtkScale*"/>
-        </parameter>
-        <parameter name="width">
-          <type name="GLib.gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="height">
-          <type name="GLib.gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="scale_format_value" c:identifier="_gtk_scale_format_value">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="scale">
-          <type name="Scale" c:type="GtkScale*"/>
+        <parameter name="icon_name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="value">
-          <type name="double" c:type="gdouble"/>
+        <parameter name="size">
+          <type name="int32" c:type="gint"/>
         </parameter>
-      </parameters>
-    </function>
-    <class name="HScale"
-           c:type="GtkHScale"
-           parent="Scale"
-           glib:type-name="GtkHScale"
-           glib:get-type="gtk_hscale_get_type">
-    </class>
-    <function name="hscale_new" c:identifier="gtk_hscale_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="adjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        <parameter name="pixbuf">
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="hscale_new_with_range"
-              c:identifier="gtk_hscale_new_with_range">
+    <glib:boxed c:type="IconInfo"
+                glib:name="IconInfo"
+                glib:type-name="GtkIconInfo"
+                glib:get-type="gtk_icon_info_get_type">
+      <constructor name="copy" c:identifier="gtk_icon_info_copy">
+        <return-value>
+          <type name="IconInfo" c:type="GtkIconInfo*"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_info">
+            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="free" c:identifier="gtk_icon_info_free">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_info">
+            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_base_size" c:identifier="gtk_icon_info_get_base_size">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_info">
+            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_filename" c:identifier="gtk_icon_info_get_filename">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_info">
+            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_builtin_pixbuf"
+              c:identifier="gtk_icon_info_get_builtin_pixbuf">
+        <return-value>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_info">
+            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="load_icon" c:identifier="gtk_icon_info_load_icon">
+        <return-value>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_info">
+            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.GError" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_raw_coordinates"
+              c:identifier="gtk_icon_info_set_raw_coordinates">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_info">
+            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          </parameter>
+          <parameter name="raw_coordinates">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_embedded_rect"
+              c:identifier="gtk_icon_info_get_embedded_rect">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_info">
+            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          </parameter>
+          <parameter name="rectangle">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_attach_points"
+              c:identifier="gtk_icon_info_get_attach_points">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_info">
+            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          </parameter>
+          <parameter name="points">
+            <type name="Gdk.GdkPoint" c:type="GdkPoint**"/>
+          </parameter>
+          <parameter name="n_points">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_display_name"
+              c:identifier="gtk_icon_info_get_display_name">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_info">
+            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </glib:boxed>
+    <function name="icon_theme_check_reload"
+              c:identifier="_gtk_icon_theme_check_reload">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="min">
-          <type name="double" c:type="gdouble"/>
-        </parameter>
-        <parameter name="max">
-          <type name="double" c:type="gdouble"/>
-        </parameter>
-        <parameter name="step">
-          <type name="double" c:type="gdouble"/>
+        <parameter name="display">
+          <type name="Gdk.Display" c:type="GdkDisplay*"/>
         </parameter>
       </parameters>
     </function>
-    <class name="Separator"
-           c:type="GtkSeparator"
-           parent="Widget"
-           glib:type-name="GtkSeparator"
-           glib:get-type="gtk_separator_get_type">
-    </class>
-    <class name="HSeparator"
-           c:type="GtkHSeparator"
-           parent="Separator"
-           glib:type-name="GtkHSeparator"
-           glib:get-type="gtk_hseparator_get_type">
-    </class>
-    <function name="hseparator_new" c:identifier="gtk_hseparator_new">
+    <function name="icon_theme_ensure_builtin_cache"
+              c:identifier="_gtk_icon_theme_ensure_builtin_cache">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
-    <class name="IconFactory"
-           c:type="GtkIconFactory"
+    <class name="Tooltip"
+           c:type="GtkTooltip"
            parent="GObject.Object"
-           glib:type-name="GtkIconFactory"
-           glib:get-type="gtk_icon_factory_get_type">
-      <constructor name="new" c:identifier="gtk_icon_factory_new">
-        <return-value>
-          <type name="IconFactory" c:type="GtkIconFactory*"/>
-        </return-value>
-      </constructor>
-      <method name="add" c:identifier="gtk_icon_factory_add">
+           glib:type-name="GtkTooltip"
+           glib:get-type="gtk_tooltip_get_type">
+      <method name="set_markup" c:identifier="gtk_tooltip_set_markup">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="factory">
-            <type name="IconFactory" c:type="GtkIconFactory*"/>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
           </parameter>
-          <parameter name="stock_id">
+          <parameter name="markup">
             <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="icon_set">
-            <type name="IconSet" c:type="GtkIconSet*"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="lookup" c:identifier="gtk_icon_factory_lookup">
+      <method name="set_text" c:identifier="gtk_tooltip_set_text">
         <return-value>
-          <type name="IconSet" c:type="GtkIconSet*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="factory">
-            <type name="IconFactory" c:type="GtkIconFactory*"/>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
           </parameter>
-          <parameter name="stock_id">
+          <parameter name="text">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_default" c:identifier="gtk_icon_factory_add_default">
+      <method name="set_icon" c:identifier="gtk_tooltip_set_icon">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="factory">
-            <type name="IconFactory" c:type="GtkIconFactory*"/>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
+          </parameter>
+          <parameter name="pixbuf">
+            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_default"
-              c:identifier="gtk_icon_factory_remove_default">
+      <method name="set_icon_from_stock"
+              c:identifier="gtk_tooltip_set_icon_from_stock">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="factory">
-            <type name="IconFactory" c:type="GtkIconFactory*"/>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
+          </parameter>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="size">
+            <type name="IconSize" c:type="GtkIconSize"/>
           </parameter>
         </parameters>
       </method>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+      <method name="set_custom" c:identifier="gtk_tooltip_set_custom">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
+          </parameter>
+          <parameter name="custom_widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_tip_area" c:identifier="gtk_tooltip_set_tip_area">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
+        <parameters>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
+          </parameter>
+          <parameter name="rect">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          </parameter>
+        </parameters>
+      </method>
     </class>
-    <function name="icon_factory_lookup_default"
-              c:identifier="gtk_icon_factory_lookup_default">
+    <function name="tooltip_trigger_tooltip_query"
+              c:identifier="gtk_tooltip_trigger_tooltip_query">
       <return-value>
-        <type name="IconSet" c:type="GtkIconSet*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="stock_id">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="display">
+          <type name="Gdk.Display" c:type="GdkDisplay*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="icon_size_lookup" c:identifier="gtk_icon_size_lookup">
+    <function name="tooltip_focus_in" c:identifier="_gtk_tooltip_focus_in">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="size">
-          <type name="IconSize" c:type="GtkIconSize"/>
-        </parameter>
-        <parameter name="width">
-          <type name="GLib.gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="height">
-          <type name="GLib.gint" c:type="gint*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="icon_size_lookup_for_settings"
-              c:identifier="gtk_icon_size_lookup_for_settings">
+    <function name="tooltip_focus_out" c:identifier="_gtk_tooltip_focus_out">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="settings">
-          <type name="Settings" c:type="GtkSettings*"/>
-        </parameter>
-        <parameter name="size">
-          <type name="IconSize" c:type="GtkIconSize"/>
-        </parameter>
-        <parameter name="width">
-          <type name="GLib.gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="height">
-          <type name="GLib.gint" c:type="gint*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="icon_size_register" c:identifier="gtk_icon_size_register">
+    <function name="tooltip_toggle_keyboard_mode"
+              c:identifier="_gtk_tooltip_toggle_keyboard_mode">
       <return-value>
-        <type name="IconSize" c:type="GtkIconSize"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="int32" c:type="gint"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="icon_size_register_alias"
-              c:identifier="gtk_icon_size_register_alias">
+    <function name="tooltip_handle_event"
+              c:identifier="_gtk_tooltip_handle_event">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="alias">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="target">
-          <type name="IconSize" c:type="GtkIconSize"/>
+        <parameter name="event">
+          <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="icon_size_from_name"
-              c:identifier="gtk_icon_size_from_name">
+    <function name="tooltip_hide" c:identifier="_gtk_tooltip_hide">
       <return-value>
-        <type name="IconSize" c:type="GtkIconSize"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="icon_size_get_name" c:identifier="gtk_icon_size_get_name">
+    <record name="GtkIconViewPrivate" c:type="GtkIconViewPrivate"/>
+    <callback name="GtkIconViewForeachFunc">
       <return-value>
-        <type name="string" c:type="gchar*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="size">
-          <type name="IconSize" c:type="GtkIconSize"/>
+        <parameter name="icon_view">
+          <type name="IconView" c:type="GtkIconView*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <glib:boxed c:type="IconSet"
-                glib:name="IconSet"
-                glib:type-name="GtkIconSet"
-                glib:get-type="gtk_icon_set_get_type">
-      <constructor name="new" c:identifier="gtk_icon_set_new">
-        <return-value>
-          <type name="IconSet" c:type="GtkIconSet*"/>
-        </return-value>
-      </constructor>
-      <constructor name="new_from_pixbuf"
-                   c:identifier="gtk_icon_set_new_from_pixbuf">
+    </callback>
+    <class name="IconView"
+           c:type="GtkIconView"
+           parent="Container"
+           glib:type-name="GtkIconView"
+           glib:get-type="gtk_icon_view_get_type">
+      <method name="set_model" c:identifier="gtk_icon_view_set_model">
         <return-value>
-          <type name="IconSet" c:type="GtkIconSet*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="model" allow-none="1">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="ref" c:identifier="gtk_icon_set_ref">
+      </method>
+      <method name="get_model" c:identifier="gtk_icon_view_get_model">
         <return-value>
-          <type name="IconSet" c:type="GtkIconSet*"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </return-value>
         <parameters>
-          <parameter name="icon_set">
-            <type name="IconSet" c:type="GtkIconSet*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="copy" c:identifier="gtk_icon_set_copy">
+      </method>
+      <method name="set_text_column"
+              c:identifier="gtk_icon_view_set_text_column">
         <return-value>
-          <type name="IconSet" c:type="GtkIconSet*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_set">
-            <type name="IconSet" c:type="GtkIconSet*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="unref" c:identifier="gtk_icon_set_unref">
+      </method>
+      <method name="get_text_column"
+              c:identifier="gtk_icon_view_get_text_column">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="icon_set">
-            <type name="IconSet" c:type="GtkIconSet*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="render_icon" c:identifier="gtk_icon_set_render_icon">
+      <method name="set_markup_column"
+              c:identifier="gtk_icon_view_set_markup_column">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_set">
-            <type name="IconSet" c:type="GtkIconSet*"/>
-          </parameter>
-          <parameter name="style">
-            <type name="Style" c:type="GtkStyle*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="direction">
-            <type name="TextDirection" c:type="GtkTextDirection"/>
-          </parameter>
-          <parameter name="state">
-            <type name="StateType" c:type="GtkStateType"/>
-          </parameter>
-          <parameter name="size">
-            <type name="IconSize" c:type="GtkIconSize"/>
-          </parameter>
-          <parameter name="widget" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="detail" allow-none="1">
-            <type name="string" c:type="char*"/>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_source" c:identifier="gtk_icon_set_add_source">
+      <method name="get_markup_column"
+              c:identifier="gtk_icon_view_get_markup_column">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="icon_set">
-            <type name="IconSet" c:type="GtkIconSet*"/>
-          </parameter>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_sizes" c:identifier="gtk_icon_set_get_sizes">
+      <method name="set_pixbuf_column"
+              c:identifier="gtk_icon_view_set_pixbuf_column">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_set">
-            <type name="IconSet" c:type="GtkIconSet*"/>
-          </parameter>
-          <parameter name="sizes">
-            <type name="IconSize" c:type="GtkIconSize**"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="n_sizes">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-    </glib:boxed>
-    <glib:boxed c:type="IconSource"
-                glib:name="IconSource"
-                glib:type-name="GtkIconSource"
-                glib:get-type="gtk_icon_source_get_type">
-      <constructor name="new" c:identifier="gtk_icon_source_new">
-        <return-value>
-          <type name="IconSource" c:type="GtkIconSource*"/>
-        </return-value>
-      </constructor>
-      <constructor name="copy" c:identifier="gtk_icon_source_copy">
-        <return-value>
-          <type name="IconSource" c:type="GtkIconSource*"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="free" c:identifier="gtk_icon_source_free">
+      <method name="get_pixbuf_column"
+              c:identifier="gtk_icon_view_get_pixbuf_column">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_filename" c:identifier="gtk_icon_source_set_filename">
+      <method name="set_orientation"
+              c:identifier="gtk_icon_view_set_orientation">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="filename">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="orientation">
+            <type name="Orientation" c:type="GtkOrientation"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_icon_name"
-              c:identifier="gtk_icon_source_set_icon_name">
+      <method name="get_orientation"
+              c:identifier="gtk_icon_view_get_orientation">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Orientation" c:type="GtkOrientation"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-          <parameter name="icon_name" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_pixbuf" c:identifier="gtk_icon_source_set_pixbuf">
+      <method name="set_columns" c:identifier="gtk_icon_view_set_columns">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="columns">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_filename" c:identifier="gtk_icon_source_get_filename">
+      <method name="get_columns" c:identifier="gtk_icon_view_get_columns">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_icon_name"
-              c:identifier="gtk_icon_source_get_icon_name">
+      <method name="set_item_width"
+              c:identifier="gtk_icon_view_set_item_width">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="item_width">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_pixbuf" c:identifier="gtk_icon_source_get_pixbuf">
+      <method name="get_item_width"
+              c:identifier="gtk_icon_view_get_item_width">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_direction_wildcarded"
-              c:identifier="gtk_icon_source_set_direction_wildcarded">
+      <method name="set_spacing" c:identifier="gtk_icon_view_set_spacing">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="spacing">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_state_wildcarded"
-              c:identifier="gtk_icon_source_set_state_wildcarded">
+      <method name="get_spacing" c:identifier="gtk_icon_view_get_spacing">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_size_wildcarded"
-              c:identifier="gtk_icon_source_set_size_wildcarded">
+      <method name="set_row_spacing"
+              c:identifier="gtk_icon_view_set_row_spacing">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="row_spacing">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_size_wildcarded"
-              c:identifier="gtk_icon_source_get_size_wildcarded">
+      <method name="get_row_spacing"
+              c:identifier="gtk_icon_view_get_row_spacing">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_state_wildcarded"
-              c:identifier="gtk_icon_source_get_state_wildcarded">
+      <method name="set_column_spacing"
+              c:identifier="gtk_icon_view_set_column_spacing">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="column_spacing">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_direction_wildcarded"
-              c:identifier="gtk_icon_source_get_direction_wildcarded">
+      <method name="get_column_spacing"
+              c:identifier="gtk_icon_view_get_column_spacing">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_direction"
-              c:identifier="gtk_icon_source_set_direction">
+      <method name="set_margin" c:identifier="gtk_icon_view_set_margin">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="direction">
-            <type name="TextDirection" c:type="GtkTextDirection"/>
+          <parameter name="margin">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_state" c:identifier="gtk_icon_source_set_state">
+      <method name="get_margin" c:identifier="gtk_icon_view_get_margin">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-          <parameter name="state">
-            <type name="StateType" c:type="GtkStateType"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_size" c:identifier="gtk_icon_source_set_size">
+      <method name="get_path_at_pos"
+              c:identifier="gtk_icon_view_get_path_at_pos">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="size">
-            <type name="IconSize" c:type="GtkIconSize"/>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_direction"
-              c:identifier="gtk_icon_source_get_direction">
+      <method name="get_item_at_pos"
+              c:identifier="gtk_icon_view_get_item_at_pos">
         <return-value>
-          <type name="TextDirection" c:type="GtkTextDirection"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
+          </parameter>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_state" c:identifier="gtk_icon_source_get_state">
+      <method name="get_visible_range"
+              c:identifier="gtk_icon_view_get_visible_range">
         <return-value>
-          <type name="StateType" c:type="GtkStateType"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="start_path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
+          </parameter>
+          <parameter name="end_path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_size" c:identifier="gtk_icon_source_get_size">
+      <method name="selected_foreach"
+              c:identifier="gtk_icon_view_selected_foreach">
         <return-value>
-          <type name="IconSize" c:type="GtkIconSize"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="GtkIconViewForeachFunc"
+                  c:type="GtkIconViewForeachFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-    </glib:boxed>
-    <function name="icon_set_invalidate_caches"
-              c:identifier="_gtk_icon_set_invalidate_caches">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="icon_factory_list_ids"
-              c:identifier="_gtk_icon_factory_list_ids">
-      <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
-      </return-value>
-    </function>
-    <function name="icon_factory_ensure_default_icons"
-              c:identifier="_gtk_icon_factory_ensure_default_icons">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <record name="GtkIconThemePrivate" c:type="GtkIconThemePrivate"/>
-    <function name="icon_theme_error_quark"
-              c:identifier="gtk_icon_theme_error_quark">
-      <return-value>
-        <type name="GLib.GQuark" c:type="GQuark"/>
-      </return-value>
-    </function>
-    <class name="IconTheme"
-           c:type="GtkIconTheme"
-           parent="GObject.Object"
-           glib:type-name="GtkIconTheme"
-           glib:get-type="gtk_icon_theme_get_type">
-      <constructor name="new" c:identifier="gtk_icon_theme_new">
-        <return-value>
-          <type name="IconTheme" c:type="GtkIconTheme*"/>
-        </return-value>
-      </constructor>
-      <constructor name="get_default"
-                   c:identifier="gtk_icon_theme_get_default">
-        <return-value>
-          <type name="IconTheme" c:type="GtkIconTheme*"/>
-        </return-value>
-      </constructor>
-      <constructor name="get_for_screen"
-                   c:identifier="gtk_icon_theme_get_for_screen">
+      <method name="set_selection_mode"
+              c:identifier="gtk_icon_view_set_selection_mode">
         <return-value>
-          <type name="IconTheme" c:type="GtkIconTheme*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="mode">
+            <type name="SelectionMode" c:type="GtkSelectionMode"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="set_screen" c:identifier="gtk_icon_theme_set_screen">
+      </method>
+      <method name="get_selection_mode"
+              c:identifier="gtk_icon_view_get_selection_mode">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="SelectionMode" c:type="GtkSelectionMode"/>
         </return-value>
         <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_search_path"
-              c:identifier="gtk_icon_theme_set_search_path">
+      <method name="select_path" c:identifier="gtk_icon_view_select_path">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
           <parameter name="path">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="n_elements">
-            <type name="int32" c:type="gint"/>
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_search_path"
-              c:identifier="gtk_icon_theme_get_search_path">
+      <method name="unselect_path" c:identifier="gtk_icon_view_unselect_path">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
           <parameter name="path">
-            <type name="GLib.gchar" c:type="gchar**"/>
-          </parameter>
-          <parameter name="n_elements">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="append_search_path"
-              c:identifier="gtk_icon_theme_append_search_path">
+      <method name="path_is_selected"
+              c:identifier="gtk_icon_view_path_is_selected">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
           <parameter name="path">
-            <type name="string" c:type="gchar*"/>
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="prepend_search_path"
-              c:identifier="gtk_icon_theme_prepend_search_path">
+      <method name="get_selected_items"
+              c:identifier="gtk_icon_view_get_selected_items">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_custom_theme"
-              c:identifier="gtk_icon_theme_set_custom_theme">
+      <method name="select_all" c:identifier="gtk_icon_view_select_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="theme_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="has_icon" c:identifier="gtk_icon_theme_has_icon">
+      <method name="unselect_all" c:identifier="gtk_icon_view_unselect_all">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="icon_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_icon_sizes"
-              c:identifier="gtk_icon_theme_get_icon_sizes">
+      <method name="item_activated"
+              c:identifier="gtk_icon_view_item_activated">
         <return-value>
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="icon_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="lookup_icon" c:identifier="gtk_icon_theme_lookup_icon">
+      <method name="set_cursor" c:identifier="gtk_icon_view_set_cursor">
         <return-value>
-          <type name="IconInfo" c:type="GtkIconInfo*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="icon_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
-          <parameter name="size">
-            <type name="int32" c:type="gint"/>
+          <parameter name="cell" allow-none="1">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
-          <parameter name="flags">
-            <type name="IconLookupFlags" c:type="GtkIconLookupFlags"/>
+          <parameter name="start_editing">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="choose_icon" c:identifier="gtk_icon_theme_choose_icon">
+      <method name="get_cursor" c:identifier="gtk_icon_view_get_cursor">
         <return-value>
-          <type name="IconInfo" c:type="GtkIconInfo*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="icon_names">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="size">
-            <type name="int32" c:type="gint"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
           </parameter>
-          <parameter name="flags">
-            <type name="IconLookupFlags" c:type="GtkIconLookupFlags"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="load_icon" c:identifier="gtk_icon_theme_load_icon">
+      <method name="scroll_to_path"
+              c:identifier="gtk_icon_view_scroll_to_path">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="icon_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
-          <parameter name="size">
-            <type name="int32" c:type="gint"/>
+          <parameter name="use_align">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="flags">
-            <type name="IconLookupFlags" c:type="GtkIconLookupFlags"/>
+          <parameter name="row_align">
+            <type name="float" c:type="gfloat"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="col_align">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
       </method>
-      <method name="list_icons" c:identifier="gtk_icon_theme_list_icons">
+      <method name="enable_model_drag_source"
+              c:identifier="gtk_icon_view_enable_model_drag_source">
         <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="context">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="start_button_mask">
+            <type name="GdkModifierType" c:type="GdkModifierType"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="list_contexts" c:identifier="gtk_icon_theme_list_contexts">
-        <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          <parameter name="targets">
+            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_example_icon_name"
-              c:identifier="gtk_icon_theme_get_example_icon_name">
-        <return-value>
-          <type name="string" c:type="char*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          <parameter name="n_targets">
+            <type name="int32" c:type="gint"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="rescan_if_needed"
-              c:identifier="gtk_icon_theme_rescan_if_needed">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          <parameter name="actions">
+            <type name="GdkDragAction" c:type="GdkDragAction"/>
           </parameter>
         </parameters>
       </method>
-      <callback name="changed">
+      <method name="enable_model_drag_dest"
+              c:identifier="gtk_icon_view_enable_model_drag_dest">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <glib:signal name="changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="icon_theme_add_builtin_icon"
-              c:identifier="gtk_icon_theme_add_builtin_icon">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="icon_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="size">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="pixbuf">
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <glib:boxed c:type="IconInfo"
-                glib:name="IconInfo"
-                glib:type-name="GtkIconInfo"
-                glib:get-type="gtk_icon_info_get_type">
-      <constructor name="copy" c:identifier="gtk_icon_info_copy">
-        <return-value>
-          <type name="IconInfo" c:type="GtkIconInfo*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_info">
-            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          <parameter name="targets">
+            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
+          </parameter>
+          <parameter name="n_targets">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="actions">
+            <type name="GdkDragAction" c:type="GdkDragAction"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="free" c:identifier="gtk_icon_info_free">
+      </method>
+      <method name="unset_model_drag_source"
+              c:identifier="gtk_icon_view_unset_model_drag_source">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_info">
-            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_base_size" c:identifier="gtk_icon_info_get_base_size">
+      <method name="unset_model_drag_dest"
+              c:identifier="gtk_icon_view_unset_model_drag_dest">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_info">
-            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_filename" c:identifier="gtk_icon_info_get_filename">
+      <method name="set_reorderable"
+              c:identifier="gtk_icon_view_set_reorderable">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_info">
-            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="reorderable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_builtin_pixbuf"
-              c:identifier="gtk_icon_info_get_builtin_pixbuf">
+      <method name="get_reorderable"
+              c:identifier="gtk_icon_view_get_reorderable">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="icon_info">
-            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="load_icon" c:identifier="gtk_icon_info_load_icon">
+      <method name="set_drag_dest_item"
+              c:identifier="gtk_icon_view_set_drag_dest_item">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_info">
-            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="path" allow-none="1">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="pos">
+            <type name="IconViewDropPosition"
+                  c:type="GtkIconViewDropPosition"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_raw_coordinates"
-              c:identifier="gtk_icon_info_set_raw_coordinates">
+      <method name="get_drag_dest_item"
+              c:identifier="gtk_icon_view_get_drag_dest_item">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_info">
-            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="raw_coordinates">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
+          </parameter>
+          <parameter name="pos">
+            <type name="IconViewDropPosition"
+                  c:type="GtkIconViewDropPosition*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_embedded_rect"
-              c:identifier="gtk_icon_info_get_embedded_rect">
+      <method name="get_dest_item_at_pos"
+              c:identifier="gtk_icon_view_get_dest_item_at_pos">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="icon_info">
-            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="rectangle">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="drag_x">
+            <type name="int32" c:type="gint"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_attach_points"
-              c:identifier="gtk_icon_info_get_attach_points">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_info">
-            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          <parameter name="drag_y">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="points">
-            <type name="Gdk.GdkPoint" c:type="GdkPoint**"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
           </parameter>
-          <parameter name="n_points">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="pos">
+            <type name="IconViewDropPosition"
+                  c:type="GtkIconViewDropPosition*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_display_name"
-              c:identifier="gtk_icon_info_get_display_name">
+      <method name="create_drag_icon"
+              c:identifier="gtk_icon_view_create_drag_icon">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </return-value>
         <parameters>
-          <parameter name="icon_info">
-            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-    </glib:boxed>
-    <function name="icon_theme_check_reload"
-              c:identifier="_gtk_icon_theme_check_reload">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="display">
-          <type name="Gdk.Display" c:type="GdkDisplay*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="icon_theme_ensure_builtin_cache"
-              c:identifier="_gtk_icon_theme_ensure_builtin_cache">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <class name="Tooltip"
-           c:type="GtkTooltip"
-           parent="GObject.Object"
-           glib:type-name="GtkTooltip"
-           glib:get-type="gtk_tooltip_get_type">
-      <method name="set_markup" c:identifier="gtk_tooltip_set_markup">
+      <method name="convert_widget_to_bin_window_coords"
+              c:identifier="gtk_icon_view_convert_widget_to_bin_window_coords">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="markup">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="wx">
+            <type name="int32" c:type="gint"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="set_text" c:identifier="gtk_tooltip_set_text">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
+          <parameter name="wy">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="bx">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="by">
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_icon" c:identifier="gtk_tooltip_set_icon">
+      <method name="set_tooltip_item"
+              c:identifier="gtk_icon_view_set_tooltip_item">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
           <parameter name="tooltip">
             <type name="Tooltip" c:type="GtkTooltip*"/>
           </parameter>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_icon_from_stock"
-              c:identifier="gtk_tooltip_set_icon_from_stock">
+      <method name="set_tooltip_cell"
+              c:identifier="gtk_icon_view_set_tooltip_cell">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
           <parameter name="tooltip">
             <type name="Tooltip" c:type="GtkTooltip*"/>
           </parameter>
-          <parameter name="stock_id">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
-          <parameter name="size">
-            <type name="IconSize" c:type="GtkIconSize"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_custom" c:identifier="gtk_tooltip_set_custom">
+      <method name="get_tooltip_context"
+              c:identifier="gtk_icon_view_get_tooltip_context">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="custom_widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="x">
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="set_tip_area" c:identifier="gtk_tooltip_set_tip_area">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
+          <parameter name="y">
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
-          <parameter name="rect">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="keyboard_tip">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="model">
+            <type name="TreeModel" c:type="GtkTreeModel**"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-    </class>
-    <function name="tooltip_trigger_tooltip_query"
-              c:identifier="gtk_tooltip_trigger_tooltip_query">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="display">
-          <type name="Gdk.Display" c:type="GdkDisplay*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tooltip_focus_in" c:identifier="_gtk_tooltip_focus_in">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tooltip_focus_out" c:identifier="_gtk_tooltip_focus_out">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tooltip_toggle_keyboard_mode"
-              c:identifier="_gtk_tooltip_toggle_keyboard_mode">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tooltip_handle_event"
-              c:identifier="_gtk_tooltip_handle_event">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="event">
-          <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tooltip_hide" c:identifier="_gtk_tooltip_hide">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkIconViewPrivate" c:type="GtkIconViewPrivate"/>
-    <callback name="GtkIconViewForeachFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="icon_view">
-          <type name="IconView" c:type="GtkIconView*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <class name="IconView"
-           c:type="GtkIconView"
-           parent="Container"
-           glib:type-name="GtkIconView"
-           glib:get-type="gtk_icon_view_get_type">
-      <method name="set_model" c:identifier="gtk_icon_view_set_model">
+      <method name="set_tooltip_column"
+              c:identifier="gtk_icon_view_set_tooltip_column">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -45892,14 +45093,15 @@
           <parameter name="icon_view">
             <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="model" allow-none="1">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="column">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_model" c:identifier="gtk_icon_view_get_model">
+      <method name="get_tooltip_column"
+              c:identifier="gtk_icon_view_get_tooltip_column">
         <return-value>
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="icon_view">
@@ -45907,8 +45109,49 @@
           </parameter>
         </parameters>
       </method>
-      <method name="set_text_column"
-              c:identifier="gtk_icon_view_set_text_column">
+      <property name="pixbuf-column">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="text-column">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="markup-column">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="selection-mode">
+        <type name="SelectionMode" c:type="GtkSelectionMode"/>
+      </property>
+      <property name="orientation">
+        <type name="Orientation" c:type="GtkOrientation"/>
+      </property>
+      <property name="model">
+        <type name="TreeModel" c:type="GtkTreeModel"/>
+      </property>
+      <property name="columns">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="item-width">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="spacing">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="row-spacing">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="column-spacing">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="margin">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="reorderable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="tooltip-column">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <callback name="set_scroll_adjustments">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -45916,24 +45159,28 @@
           <parameter name="icon_view">
             <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="column">
-            <type name="int32" c:type="gint"/>
+          <parameter name="hadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+          <parameter name="vadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_text_column"
-              c:identifier="gtk_icon_view_get_text_column">
+      </callback>
+      <callback name="item_activated">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="icon_view">
             <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="set_markup_column"
-              c:identifier="gtk_icon_view_set_markup_column">
+      </callback>
+      <callback name="selection_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -45941,24 +45188,19 @@
           <parameter name="icon_view">
             <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="column">
-            <type name="int32" c:type="gint"/>
-          </parameter>
         </parameters>
-      </method>
-      <method name="get_markup_column"
-              c:identifier="gtk_icon_view_get_markup_column">
+      </callback>
+      <callback name="select_all">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="icon_view">
             <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_pixbuf_column"
-              c:identifier="gtk_icon_view_set_pixbuf_column">
+      </callback>
+      <callback name="unselect_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -45966,24 +45208,19 @@
           <parameter name="icon_view">
             <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="column">
-            <type name="int32" c:type="gint"/>
-          </parameter>
         </parameters>
-      </method>
-      <method name="get_pixbuf_column"
-              c:identifier="gtk_icon_view_get_pixbuf_column">
+      </callback>
+      <callback name="select_cursor_item">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="icon_view">
             <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_orientation"
-              c:identifier="gtk_icon_view_set_orientation">
+      </callback>
+      <callback name="toggle_cursor_item">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -45991,174 +45228,423 @@
           <parameter name="icon_view">
             <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="orientation">
-            <type name="Orientation" c:type="GtkOrientation"/>
-          </parameter>
         </parameters>
-      </method>
-      <method name="get_orientation"
-              c:identifier="gtk_icon_view_get_orientation">
+      </callback>
+      <callback name="move_cursor">
         <return-value>
-          <type name="Orientation" c:type="GtkOrientation"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="icon_view">
             <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
+          <parameter name="step">
+            <type name="MovementStep" c:type="GtkMovementStep"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="set_columns" c:identifier="gtk_icon_view_set_columns">
+      </callback>
+      <callback name="activate_cursor_item">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="icon_view">
             <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="columns">
+        </parameters>
+      </callback>
+      <glib:signal name="move-cursor">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="MovementStep" c:type="GtkMovementStep"/>
+          </parameter>
+          <parameter name="p0">
             <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_columns" c:identifier="gtk_icon_view_get_columns">
+      </glib:signal>
+      <glib:signal name="set-scroll-adjustments">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="object">
+            <type name="Adjustment" c:type="GtkAdjustment"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_item_width"
-              c:identifier="gtk_icon_view_set_item_width">
+      </glib:signal>
+      <glib:signal name="select-all">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="unselect-all">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="selection-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="item-activated">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="object">
+            <type name="TreePath" c:type="GtkTreePath"/>
           </parameter>
-          <parameter name="item_width">
-            <type name="int32" c:type="gint"/>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="select-cursor-item">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="toggle-cursor-item">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="activate-cursor-item">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="icon_view_new" c:identifier="gtk_icon_view_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="icon_view_new_with_model"
+              c:identifier="gtk_icon_view_new_with_model">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="ImageMenuItem"
+           c:type="GtkImageMenuItem"
+           parent="MenuItem"
+           glib:type-name="GtkImageMenuItem"
+           glib:get-type="gtk_image_menu_item_get_type">
+      <method name="set_image" c:identifier="gtk_image_menu_item_set_image">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="image_menu_item">
+            <type name="ImageMenuItem" c:type="GtkImageMenuItem*"/>
+          </parameter>
+          <parameter name="image" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_item_width"
-              c:identifier="gtk_icon_view_get_item_width">
+      <method name="get_image" c:identifier="gtk_image_menu_item_get_image">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="image_menu_item">
+            <type name="ImageMenuItem" c:type="GtkImageMenuItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_spacing" c:identifier="gtk_icon_view_set_spacing">
+      <property name="image">
+        <type name="Widget" c:type="GtkWidget"/>
+      </property>
+    </class>
+    <function name="image_menu_item_new"
+              c:identifier="gtk_image_menu_item_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="image_menu_item_new_with_label"
+              c:identifier="gtk_image_menu_item_new_with_label">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="image_menu_item_new_with_mnemonic"
+              c:identifier="gtk_image_menu_item_new_with_mnemonic">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="image_menu_item_new_from_stock"
+              c:identifier="gtk_image_menu_item_new_from_stock">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="accel_group">
+          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="IMContextSimple"
+           c:type="GtkIMContextSimple"
+           parent="IMContext"
+           glib:type-name="GtkIMContextSimple"
+           glib:get-type="gtk_im_context_simple_get_type">
+      <method name="add_table" c:identifier="gtk_im_context_simple_add_table">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="context_simple">
+            <type name="IMContextSimple" c:type="GtkIMContextSimple*"/>
           </parameter>
-          <parameter name="spacing">
+          <parameter name="data">
+            <type name="guint16" c:type="guint16*"/>
+          </parameter>
+          <parameter name="max_seq_len">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="n_seqs">
             <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_spacing" c:identifier="gtk_icon_view_get_spacing">
+    </class>
+    <record name="GtkIMMulticontextPrivate" c:type="GtkIMMulticontextPrivate"/>
+    <class name="IMMulticontext"
+           c:type="GtkIMMulticontext"
+           parent="IMContext"
+           glib:type-name="GtkIMMulticontext"
+           glib:get-type="gtk_im_multicontext_get_type">
+      <method name="append_menuitems"
+              c:identifier="gtk_im_multicontext_append_menuitems">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="context">
+            <type name="IMMulticontext" c:type="GtkIMMulticontext*"/>
+          </parameter>
+          <parameter name="menushell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_row_spacing"
-              c:identifier="gtk_icon_view_set_row_spacing">
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="im_multicontext_new"
+              c:identifier="gtk_im_multicontext_new">
+      <return-value>
+        <type name="IMContext" c:type="GtkIMContext*"/>
+      </return-value>
+    </function>
+    <class name="InputDialog"
+           c:type="GtkInputDialog"
+           parent="Dialog"
+           glib:type-name="GtkInputDialog"
+           glib:get-type="gtk_input_dialog_get_type">
+      <callback name="enable_device">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="inputd">
+            <type name="InputDialog" c:type="GtkInputDialog*"/>
           </parameter>
-          <parameter name="row_spacing">
-            <type name="int32" c:type="gint"/>
+          <parameter name="device">
+            <type name="Gdk.Device" c:type="GdkDevice*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_row_spacing"
-              c:identifier="gtk_icon_view_get_row_spacing">
+      </callback>
+      <callback name="disable_device">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="inputd">
+            <type name="InputDialog" c:type="GtkInputDialog*"/>
+          </parameter>
+          <parameter name="device">
+            <type name="Gdk.Device" c:type="GdkDevice*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_column_spacing"
-              c:identifier="gtk_icon_view_set_column_spacing">
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="enable-device">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="column_spacing">
-            <type name="int32" c:type="gint"/>
+          <parameter name="object">
+            <type name="Gdk.Device" c:type="GdkDevice"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_column_spacing"
-              c:identifier="gtk_icon_view_get_column_spacing">
+      </glib:signal>
+      <glib:signal name="disable-device">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="object">
+            <type name="Gdk.Device" c:type="GdkDevice"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_margin" c:identifier="gtk_icon_view_set_margin">
+      </glib:signal>
+    </class>
+    <function name="input_dialog_new" c:identifier="gtk_input_dialog_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="Invisible"
+           c:type="GtkInvisible"
+           parent="Widget"
+           glib:type-name="GtkInvisible"
+           glib:get-type="gtk_invisible_get_type">
+      <method name="set_screen" c:identifier="gtk_invisible_set_screen">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="invisible">
+            <type name="Invisible" c:type="GtkInvisible*"/>
           </parameter>
-          <parameter name="margin">
-            <type name="int32" c:type="gint"/>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_margin" c:identifier="gtk_icon_view_get_margin">
+      <method name="get_screen" c:identifier="gtk_invisible_get_screen">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="Gdk.Screen" c:type="GdkScreen*"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="invisible">
+            <type name="Invisible" c:type="GtkInvisible*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_path_at_pos"
-              c:identifier="gtk_icon_view_get_path_at_pos">
+      <property name="screen">
+        <type name="Gdk.Screen" c:type="GdkScreen"/>
+      </property>
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="TreePath" c:type="GtkTreePath*"/>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="invisible_new" c:identifier="gtk_invisible_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="invisible_new_for_screen"
+              c:identifier="gtk_invisible_new_for_screen">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="screen">
+          <type name="Gdk.Screen" c:type="GdkScreen*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="Layout"
+           c:type="GtkLayout"
+           parent="Container"
+           glib:type-name="GtkLayout"
+           glib:get-type="gtk_layout_get_type">
+      <method name="put" c:identifier="gtk_layout_put">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
+          </parameter>
+          <parameter name="child_widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -46168,14 +45654,16 @@
           </parameter>
         </parameters>
       </method>
-      <method name="get_item_at_pos"
-              c:identifier="gtk_icon_view_get_item_at_pos">
+      <method name="move" c:identifier="gtk_layout_move">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
+          </parameter>
+          <parameter name="child_widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="x">
             <type name="int32" c:type="gint"/>
@@ -46183,765 +45671,434 @@
           <parameter name="y">
             <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
-          </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer**"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="get_visible_range"
-              c:identifier="gtk_icon_view_get_visible_range">
+      <method name="set_size" c:identifier="gtk_layout_set_size">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
-          <parameter name="start_path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
+          <parameter name="width">
+            <type name="uint32" c:type="guint"/>
           </parameter>
-          <parameter name="end_path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
+          <parameter name="height">
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="selected_foreach"
-              c:identifier="gtk_icon_view_selected_foreach">
+      <method name="get_size" c:identifier="gtk_layout_get_size">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
-          <parameter name="func">
-            <type name="GtkIconViewForeachFunc"
-                  c:type="GtkIconViewForeachFunc"/>
+          <parameter name="width">
+            <type name="GLib.guint" c:type="guint*"/>
           </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="height">
+            <type name="GLib.guint" c:type="guint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_selection_mode"
-              c:identifier="gtk_icon_view_set_selection_mode">
+      <method name="get_hadjustment" c:identifier="gtk_layout_get_hadjustment">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="mode">
-            <type name="SelectionMode" c:type="GtkSelectionMode"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_selection_mode"
-              c:identifier="gtk_icon_view_get_selection_mode">
+      <method name="get_vadjustment" c:identifier="gtk_layout_get_vadjustment">
         <return-value>
-          <type name="SelectionMode" c:type="GtkSelectionMode"/>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="select_path" c:identifier="gtk_icon_view_select_path">
+      <method name="set_hadjustment" c:identifier="gtk_layout_set_hadjustment">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="adjustment" allow-none="1">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unselect_path" c:identifier="gtk_icon_view_unselect_path">
+      <method name="set_vadjustment" c:identifier="gtk_layout_set_vadjustment">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="adjustment" allow-none="1">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="path_is_selected"
-              c:identifier="gtk_icon_view_path_is_selected">
+      <method name="freeze" c:identifier="gtk_layout_freeze">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_selected_items"
-              c:identifier="gtk_icon_view_get_selected_items">
+      <method name="thaw" c:identifier="gtk_layout_thaw">
         <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="select_all" c:identifier="gtk_icon_view_select_all">
+      <property name="hadjustment">
+        <type name="Adjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="vadjustment">
+        <type name="Adjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="width">
+        <type name="uint32" c:type="guint"/>
+      </property>
+      <property name="height">
+        <type name="uint32" c:type="guint"/>
+      </property>
+      <callback name="set_scroll_adjustments">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
+          </parameter>
+          <parameter name="hadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+          <parameter name="vadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="unselect_all" c:identifier="gtk_icon_view_unselect_all">
+      </callback>
+      <callback name="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="item_activated"
-              c:identifier="gtk_icon_view_item_activated">
+      </callback>
+      <callback name="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_cursor" c:identifier="gtk_icon_view_set_cursor">
+      </callback>
+      <callback name="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="cell" allow-none="1">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="start_editing">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_cursor" c:identifier="gtk_icon_view_get_cursor">
+      </callback>
+      <callback name="_gtk_reserved4">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
-          </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer**"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="scroll_to_path"
-              c:identifier="gtk_icon_view_scroll_to_path">
+      </callback>
+      <glib:signal name="set-scroll-adjustments">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="use_align">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="row_align">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="object">
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
-          <parameter name="col_align">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="p0">
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="enable_model_drag_source"
-              c:identifier="gtk_icon_view_enable_model_drag_source">
+      </glib:signal>
+    </class>
+    <function name="layout_new" c:identifier="gtk_layout_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="hadjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </parameter>
+        <parameter name="vadjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkLinkButtonPrivate" c:type="GtkLinkButtonPrivate"/>
+    <callback name="GtkLinkButtonUriFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="button">
+          <type name="LinkButton" c:type="GtkLinkButton*"/>
+        </parameter>
+        <parameter name="link_">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <class name="LinkButton"
+           c:type="GtkLinkButton"
+           parent="Button"
+           glib:type-name="GtkLinkButton"
+           glib:get-type="gtk_link_button_get_type">
+      <method name="get_uri" c:identifier="gtk_link_button_get_uri">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="start_button_mask">
-            <type name="GdkModifierType" c:type="GdkModifierType"/>
-          </parameter>
-          <parameter name="targets">
-            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
-          </parameter>
-          <parameter name="n_targets">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="actions">
-            <type name="GdkDragAction" c:type="GdkDragAction"/>
+          <parameter name="link_button">
+            <type name="LinkButton" c:type="GtkLinkButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="enable_model_drag_dest"
-              c:identifier="gtk_icon_view_enable_model_drag_dest">
+      <method name="set_uri" c:identifier="gtk_link_button_set_uri">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="targets">
-            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
-          </parameter>
-          <parameter name="n_targets">
-            <type name="int32" c:type="gint"/>
+          <parameter name="link_button">
+            <type name="LinkButton" c:type="GtkLinkButton*"/>
           </parameter>
-          <parameter name="actions">
-            <type name="GdkDragAction" c:type="GdkDragAction"/>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unset_model_drag_source"
-              c:identifier="gtk_icon_view_unset_model_drag_source">
+      <property name="uri">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <callback name="_gtk_padding1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="unset_model_drag_dest"
-              c:identifier="gtk_icon_view_unset_model_drag_dest">
+      </callback>
+      <callback name="_gtk_padding2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_reorderable"
-              c:identifier="gtk_icon_view_set_reorderable">
+      </callback>
+      <callback name="_gtk_padding3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="reorderable">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_reorderable"
-              c:identifier="gtk_icon_view_get_reorderable">
+      </callback>
+      <callback name="_gtk_padding4">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_drag_dest_item"
-              c:identifier="gtk_icon_view_set_drag_dest_item">
+      </callback>
+    </class>
+    <function name="link_button_new" c:identifier="gtk_link_button_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="uri">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="link_button_new_with_label"
+              c:identifier="gtk_link_button_new_with_label">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="uri">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="label" allow-none="1">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="link_button_set_uri_hook"
+              c:identifier="gtk_link_button_set_uri_hook">
+      <return-value>
+        <type name="GtkLinkButtonUriFunc" c:type="GtkLinkButtonUriFunc"/>
+      </return-value>
+      <parameters>
+        <parameter name="func">
+          <type name="GtkLinkButtonUriFunc" c:type="GtkLinkButtonUriFunc"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy">
+          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkListItem" c:type="GtkListItem">
+      <field name="item">
+        <type name="Item" c:type="GtkItem"/>
+      </field>
+    </record>
+    <record name="GtkListItemClass" c:type="GtkListItemClass">
+      <field name="parent_class">
+        <type name="GtkItemClass" c:type="GtkItemClass"/>
+      </field>
+      <callback name="toggle_focus_row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path" allow-none="1">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="pos">
-            <type name="IconViewDropPosition"
-                  c:type="GtkIconViewDropPosition"/>
+          <parameter name="list_item">
+            <type name="GtkListItem" c:type="GtkListItem*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_drag_dest_item"
-              c:identifier="gtk_icon_view_get_drag_dest_item">
+      </callback>
+      <callback name="select_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
-          </parameter>
-          <parameter name="pos">
-            <type name="IconViewDropPosition"
-                  c:type="GtkIconViewDropPosition*"/>
+          <parameter name="list_item">
+            <type name="GtkListItem" c:type="GtkListItem*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_dest_item_at_pos"
-              c:identifier="gtk_icon_view_get_dest_item_at_pos">
+      </callback>
+      <callback name="unselect_all">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="drag_x">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="drag_y">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
-          </parameter>
-          <parameter name="pos">
-            <type name="IconViewDropPosition"
-                  c:type="GtkIconViewDropPosition*"/>
+          <parameter name="list_item">
+            <type name="GtkListItem" c:type="GtkListItem*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="create_drag_icon"
-              c:identifier="gtk_icon_view_create_drag_icon">
+      </callback>
+      <callback name="undo_selection">
         <return-value>
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="list_item">
+            <type name="GtkListItem" c:type="GtkListItem*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="convert_widget_to_bin_window_coords"
-              c:identifier="gtk_icon_view_convert_widget_to_bin_window_coords">
+      </callback>
+      <callback name="start_selection">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="wx">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="wy">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="bx">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="by">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="list_item">
+            <type name="GtkListItem" c:type="GtkListItem*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_tooltip_item"
-              c:identifier="gtk_icon_view_set_tooltip_item">
+      </callback>
+      <callback name="end_selection">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="list_item">
+            <type name="GtkListItem" c:type="GtkListItem*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_tooltip_cell"
-              c:identifier="gtk_icon_view_set_tooltip_cell">
+      </callback>
+      <callback name="extend_selection">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="list_item">
+            <type name="GtkListItem" c:type="GtkListItem*"/>
           </parameter>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
+          <parameter name="scroll_type">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="position">
+            <type name="float" c:type="gfloat"/>
           </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="auto_start_selection">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_tooltip_context"
-              c:identifier="gtk_icon_view_get_tooltip_context">
+      </callback>
+      <callback name="scroll_horizontal">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="keyboard_tip">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="model">
-            <type name="TreeModel" c:type="GtkTreeModel**"/>
+          <parameter name="list_item">
+            <type name="GtkListItem" c:type="GtkListItem*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
+          <parameter name="scroll_type">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="position">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_tooltip_column"
-              c:identifier="gtk_icon_view_set_tooltip_column">
+      </callback>
+      <callback name="scroll_vertical">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="list_item">
+            <type name="GtkListItem" c:type="GtkListItem*"/>
           </parameter>
-          <parameter name="column">
-            <type name="int32" c:type="gint"/>
+          <parameter name="scroll_type">
+            <type name="ScrollType" c:type="GtkScrollType"/>
+          </parameter>
+          <parameter name="position">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_tooltip_column"
-              c:identifier="gtk_icon_view_get_tooltip_column">
+      </callback>
+      <callback name="toggle_add_mode">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="pixbuf-column">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="text-column">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="markup-column">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="selection-mode">
-        <type name="SelectionMode" c:type="GtkSelectionMode"/>
-      </property>
-      <property name="orientation">
-        <type name="Orientation" c:type="GtkOrientation"/>
-      </property>
-      <property name="model">
-        <type name="TreeModel" c:type="GtkTreeModel"/>
-      </property>
-      <property name="columns">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="item-width">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="spacing">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="row-spacing">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="column-spacing">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="margin">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="reorderable">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="tooltip-column">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <callback name="set_scroll_adjustments">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="hadjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
-          </parameter>
-          <parameter name="vadjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="item_activated">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="selection_changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="select_all">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="unselect_all">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="select_cursor_item">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="toggle_cursor_item">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="move_cursor">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="step">
-            <type name="MovementStep" c:type="GtkMovementStep"/>
-          </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="activate_cursor_item">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="list_item">
+            <type name="GtkListItem" c:type="GtkListItem*"/>
           </parameter>
         </parameters>
       </callback>
-      <glib:signal name="move-cursor">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="MovementStep" c:type="GtkMovementStep"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="set-scroll-adjustments">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Adjustment" c:type="GtkAdjustment"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="Adjustment" c:type="GtkAdjustment"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="select-all">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="unselect-all">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="selection-changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="item-activated">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="TreePath" c:type="GtkTreePath"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="select-cursor-item">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="toggle-cursor-item">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="activate-cursor-item">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="icon_view_new" c:identifier="gtk_icon_view_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="icon_view_new_with_model"
-              c:identifier="gtk_icon_view_new_with_model">
+    </record>
+    <function name="list_item_get_type" c:identifier="gtk_list_item_get_type">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="GtkType" c:type="GtkType"/>
       </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-      </parameters>
     </function>
-    <class name="ImageMenuItem"
-           c:type="GtkImageMenuItem"
-           parent="MenuItem"
-           glib:type-name="GtkImageMenuItem"
-           glib:get-type="gtk_image_menu_item_get_type">
-      <method name="set_image" c:identifier="gtk_image_menu_item_set_image">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="image_menu_item">
-            <type name="ImageMenuItem" c:type="GtkImageMenuItem*"/>
-          </parameter>
-          <parameter name="image" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_image" c:identifier="gtk_image_menu_item_get_image">
-        <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="image_menu_item">
-            <type name="ImageMenuItem" c:type="GtkImageMenuItem*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="image">
-        <type name="Widget" c:type="GtkWidget"/>
-      </property>
-    </class>
-    <function name="image_menu_item_new"
-              c:identifier="gtk_image_menu_item_new">
+    <function name="list_item_new" c:identifier="gtk_list_item_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
-    <function name="image_menu_item_new_with_label"
-              c:identifier="gtk_image_menu_item_new_with_label">
+    <function name="list_item_new_with_label"
+              c:identifier="gtk_list_item_new_with_label">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
@@ -46951,983 +46108,273 @@
         </parameter>
       </parameters>
     </function>
-    <function name="image_menu_item_new_with_mnemonic"
-              c:identifier="gtk_image_menu_item_new_with_mnemonic">
+    <function name="list_item_select" c:identifier="gtk_list_item_select">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="label">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="list_item">
+          <type name="GtkListItem" c:type="GtkListItem*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="image_menu_item_new_from_stock"
-              c:identifier="gtk_image_menu_item_new_from_stock">
+    <function name="list_item_deselect" c:identifier="gtk_list_item_deselect">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="stock_id">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="accel_group">
-          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+        <parameter name="list_item">
+          <type name="GtkListItem" c:type="GtkListItem*"/>
         </parameter>
       </parameters>
     </function>
-    <class name="IMContextSimple"
-           c:type="GtkIMContextSimple"
-           parent="IMContext"
-           glib:type-name="GtkIMContextSimple"
-           glib:get-type="gtk_im_context_simple_get_type">
-      <method name="add_table" c:identifier="gtk_im_context_simple_add_table">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="context_simple">
-            <type name="IMContextSimple" c:type="GtkIMContextSimple*"/>
-          </parameter>
-          <parameter name="data">
-            <type name="guint16" c:type="guint16*"/>
-          </parameter>
-          <parameter name="max_seq_len">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="n_seqs">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-    </class>
-    <record name="GtkIMMulticontextPrivate" c:type="GtkIMMulticontextPrivate"/>
-    <class name="IMMulticontext"
-           c:type="GtkIMMulticontext"
-           parent="IMContext"
-           glib:type-name="GtkIMMulticontext"
-           glib:get-type="gtk_im_multicontext_get_type">
-      <method name="append_menuitems"
-              c:identifier="gtk_im_multicontext_append_menuitems">
+    <record name="GtkList" c:type="GtkList">
+      <field name="container">
+        <type name="Container" c:type="GtkContainer"/>
+      </field>
+      <field name="children">
+        <type name="GLib.GList" c:type="GList*"/>
+      </field>
+      <field name="selection">
+        <type name="GLib.GList" c:type="GList*"/>
+      </field>
+      <field name="undo_selection">
+        <type name="GLib.GList" c:type="GList*"/>
+      </field>
+      <field name="undo_unselection">
+        <type name="GLib.GList" c:type="GList*"/>
+      </field>
+      <field name="last_focus_child">
+        <type name="Widget" c:type="GtkWidget*"/>
+      </field>
+      <field name="undo_focus_child">
+        <type name="Widget" c:type="GtkWidget*"/>
+      </field>
+      <field name="htimer">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="vtimer">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="anchor">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="drag_pos">
+        <type name="int32" c:type="gint"/>
+      </field>
+      <field name="anchor_state">
+        <type name="StateType" c:type="GtkStateType"/>
+      </field>
+      <field name="selection_mode">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="drag_selection">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="add_mode">
+        <type name="uint32" c:type="guint"/>
+      </field>
+    </record>
+    <record name="GtkListClass" c:type="GtkListClass">
+      <field name="parent_class">
+        <type name="GtkContainerClass" c:type="GtkContainerClass"/>
+      </field>
+      <callback name="selection_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMMulticontext" c:type="GtkIMMulticontext*"/>
-          </parameter>
-          <parameter name="menushell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          <parameter name="list">
+            <type name="GtkList" c:type="GtkList*"/>
           </parameter>
         </parameters>
-      </method>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
       </callback>
-    </class>
-    <function name="im_multicontext_new"
-              c:identifier="gtk_im_multicontext_new">
-      <return-value>
-        <type name="IMContext" c:type="GtkIMContext*"/>
-      </return-value>
-    </function>
-    <class name="InputDialog"
-           c:type="GtkInputDialog"
-           parent="Dialog"
-           glib:type-name="GtkInputDialog"
-           glib:get-type="gtk_input_dialog_get_type">
-      <callback name="enable_device">
+      <callback name="select_child">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="inputd">
-            <type name="InputDialog" c:type="GtkInputDialog*"/>
+          <parameter name="list">
+            <type name="GtkList" c:type="GtkList*"/>
           </parameter>
-          <parameter name="device">
-            <type name="Gdk.Device" c:type="GdkDevice*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="disable_device">
+      <callback name="unselect_child">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="inputd">
-            <type name="InputDialog" c:type="GtkInputDialog*"/>
+          <parameter name="list">
+            <type name="GtkList" c:type="GtkList*"/>
           </parameter>
-          <parameter name="device">
-            <type name="Gdk.Device" c:type="GdkDevice*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="enable-device">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.Device" c:type="GdkDevice"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="disable-device">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.Device" c:type="GdkDevice"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </class>
-    <function name="input_dialog_new" c:identifier="gtk_input_dialog_new">
+    </record>
+    <function name="list_get_type" c:identifier="gtk_list_get_type">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="GtkType" c:type="GtkType"/>
       </return-value>
     </function>
-    <class name="Invisible"
-           c:type="GtkInvisible"
-           parent="Widget"
-           glib:type-name="GtkInvisible"
-           glib:get-type="gtk_invisible_get_type">
-      <method name="set_screen" c:identifier="gtk_invisible_set_screen">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="invisible">
-            <type name="Invisible" c:type="GtkInvisible*"/>
-          </parameter>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_screen" c:identifier="gtk_invisible_get_screen">
-        <return-value>
-          <type name="Gdk.Screen" c:type="GdkScreen*"/>
-        </return-value>
-        <parameters>
-          <parameter name="invisible">
-            <type name="Invisible" c:type="GtkInvisible*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="screen">
-        <type name="Gdk.Screen" c:type="GdkScreen"/>
-      </property>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-    </class>
-    <function name="invisible_new" c:identifier="gtk_invisible_new">
+    <function name="list_new" c:identifier="gtk_list_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
-    <function name="invisible_new_for_screen"
-              c:identifier="gtk_invisible_new_for_screen">
+    <function name="list_insert_items" c:identifier="gtk_list_insert_items">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="screen">
-          <type name="Gdk.Screen" c:type="GdkScreen*"/>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="items">
+          <type name="GLib.GList" c:type="GList*"/>
+        </parameter>
+        <parameter name="position">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <class name="Layout"
-           c:type="GtkLayout"
-           parent="Container"
-           glib:type-name="GtkLayout"
-           glib:get-type="gtk_layout_get_type">
-      <method name="put" c:identifier="gtk_layout_put">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
-          </parameter>
-          <parameter name="child_widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="move" c:identifier="gtk_layout_move">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
-          </parameter>
-          <parameter name="child_widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_size" c:identifier="gtk_layout_set_size">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="height">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_size" c:identifier="gtk_layout_get_size">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="GLib.guint" c:type="guint*"/>
-          </parameter>
-          <parameter name="height">
-            <type name="GLib.guint" c:type="guint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_hadjustment" c:identifier="gtk_layout_get_hadjustment">
-        <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
-        </return-value>
-        <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_vadjustment" c:identifier="gtk_layout_get_vadjustment">
-        <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
-        </return-value>
-        <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_hadjustment" c:identifier="gtk_layout_set_hadjustment">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
-          </parameter>
-          <parameter name="adjustment" allow-none="1">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_vadjustment" c:identifier="gtk_layout_set_vadjustment">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
-          </parameter>
-          <parameter name="adjustment" allow-none="1">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="freeze" c:identifier="gtk_layout_freeze">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="thaw" c:identifier="gtk_layout_thaw">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="hadjustment">
-        <type name="Adjustment" c:type="GtkAdjustment"/>
-      </property>
-      <property name="vadjustment">
-        <type name="Adjustment" c:type="GtkAdjustment"/>
-      </property>
-      <property name="width">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <property name="height">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <callback name="set_scroll_adjustments">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
-          </parameter>
-          <parameter name="hadjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
-          </parameter>
-          <parameter name="vadjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="set-scroll-adjustments">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Adjustment" c:type="GtkAdjustment"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="Adjustment" c:type="GtkAdjustment"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </class>
-    <function name="layout_new" c:identifier="gtk_layout_new">
+    <function name="list_append_items" c:identifier="gtk_list_append_items">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="hadjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
         </parameter>
-        <parameter name="vadjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        <parameter name="items">
+          <type name="GLib.GList" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkLinkButtonPrivate" c:type="GtkLinkButtonPrivate"/>
-    <callback name="GtkLinkButtonUriFunc">
+    <function name="list_prepend_items" c:identifier="gtk_list_prepend_items">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="button">
-          <type name="LinkButton" c:type="GtkLinkButton*"/>
-        </parameter>
-        <parameter name="link_">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
         </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="items">
+          <type name="GLib.GList" c:type="GList*"/>
         </parameter>
       </parameters>
-    </callback>
-    <class name="LinkButton"
-           c:type="GtkLinkButton"
-           parent="Button"
-           glib:type-name="GtkLinkButton"
-           glib:get-type="gtk_link_button_get_type">
-      <method name="get_uri" c:identifier="gtk_link_button_get_uri">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_button">
-            <type name="LinkButton" c:type="GtkLinkButton*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_uri" c:identifier="gtk_link_button_set_uri">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_button">
-            <type name="LinkButton" c:type="GtkLinkButton*"/>
-          </parameter>
-          <parameter name="uri">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="uri">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <callback name="_gtk_padding1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_padding2">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_padding3">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_padding4">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-    </class>
-    <function name="link_button_new" c:identifier="gtk_link_button_new">
+    </function>
+    <function name="list_remove_items" c:identifier="gtk_list_remove_items">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="uri">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="items">
+          <type name="GLib.GList" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="link_button_new_with_label"
-              c:identifier="gtk_link_button_new_with_label">
+    <function name="list_remove_items_no_unref"
+              c:identifier="gtk_list_remove_items_no_unref">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="uri">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
         </parameter>
-        <parameter name="label" allow-none="1">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="items">
+          <type name="GLib.GList" c:type="GList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="link_button_set_uri_hook"
-              c:identifier="gtk_link_button_set_uri_hook">
+    <function name="list_clear_items" c:identifier="gtk_list_clear_items">
       <return-value>
-        <type name="GtkLinkButtonUriFunc" c:type="GtkLinkButtonUriFunc"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="func">
-          <type name="GtkLinkButtonUriFunc" c:type="GtkLinkButtonUriFunc"/>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
         </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="start">
+          <type name="int32" c:type="gint"/>
         </parameter>
-        <parameter name="destroy">
-          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+        <parameter name="end">
+          <type name="int32" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkListItem" c:type="GtkListItem">
-      <field name="item">
-        <type name="Item" c:type="GtkItem"/>
-      </field>
-      <callback name="toggle_focus_row">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem" c:type="GtkListItem*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="select_all">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem" c:type="GtkListItem*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="unselect_all">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem" c:type="GtkListItem*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="undo_selection">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem" c:type="GtkListItem*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="start_selection">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem" c:type="GtkListItem*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="end_selection">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem" c:type="GtkListItem*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="extend_selection">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem" c:type="GtkListItem*"/>
-          </parameter>
-          <parameter name="scroll_type">
-            <type name="ScrollType" c:type="GtkScrollType"/>
-          </parameter>
-          <parameter name="position">
-            <type name="float" c:type="gfloat"/>
-          </parameter>
-          <parameter name="auto_start_selection">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="scroll_horizontal">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem" c:type="GtkListItem*"/>
-          </parameter>
-          <parameter name="scroll_type">
-            <type name="ScrollType" c:type="GtkScrollType"/>
-          </parameter>
-          <parameter name="position">
-            <type name="float" c:type="gfloat"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="scroll_vertical">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem" c:type="GtkListItem*"/>
-          </parameter>
-          <parameter name="scroll_type">
-            <type name="ScrollType" c:type="GtkScrollType"/>
-          </parameter>
-          <parameter name="position">
-            <type name="float" c:type="gfloat"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="toggle_add_mode">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem" c:type="GtkListItem*"/>
-          </parameter>
-        </parameters>
-      </callback>
-    </record>
-    <function name="list_item_get_type" c:identifier="gtk_list_item_get_type">
+    <function name="list_select_item" c:identifier="gtk_list_select_item">
       <return-value>
-        <type name="GtkType" c:type="GtkType"/>
+        <type name="none" c:type="void"/>
       </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="item">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="list_item_new" c:identifier="gtk_list_item_new">
+    <function name="list_unselect_item" c:identifier="gtk_list_unselect_item">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="item">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="list_item_new_with_label"
-              c:identifier="gtk_list_item_new_with_label">
+    <function name="list_select_child" c:identifier="gtk_list_select_child">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="label">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="child">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="list_item_select" c:identifier="gtk_list_item_select">
+    <function name="list_unselect_child"
+              c:identifier="gtk_list_unselect_child">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="list_item">
-          <type name="GtkListItem" c:type="GtkListItem*"/>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="child">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="list_item_deselect" c:identifier="gtk_list_item_deselect">
+    <function name="list_child_position"
+              c:identifier="gtk_list_child_position">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
-        <parameter name="list_item">
-          <type name="GtkListItem" c:type="GtkListItem*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkList" c:type="GtkList">
-      <field name="container">
-        <type name="Container" c:type="GtkContainer"/>
-      </field>
-      <field name="children">
-        <type name="GLib.GList" c:type="GList*"/>
-      </field>
-      <field name="selection">
-        <type name="GLib.GList" c:type="GList*"/>
-      </field>
-      <field name="undo_selection">
-        <type name="GLib.GList" c:type="GList*"/>
-      </field>
-      <field name="undo_unselection">
-        <type name="GLib.GList" c:type="GList*"/>
-      </field>
-      <field name="last_focus_child">
-        <type name="Widget" c:type="GtkWidget*"/>
-      </field>
-      <field name="undo_focus_child">
-        <type name="Widget" c:type="GtkWidget*"/>
-      </field>
-      <field name="htimer">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="vtimer">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="anchor">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="drag_pos">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="anchor_state">
-        <type name="StateType" c:type="GtkStateType"/>
-      </field>
-      <field name="selection_mode">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="drag_selection">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="add_mode">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <callback name="selection_changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="list">
-            <type name="GtkList" c:type="GtkList*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="select_child">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="list">
-            <type name="GtkList" c:type="GtkList*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="unselect_child">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="list">
-            <type name="GtkList" c:type="GtkList*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </callback>
-    </record>
-    <function name="list_get_type" c:identifier="gtk_list_get_type">
-      <return-value>
-        <type name="GtkType" c:type="GtkType"/>
-      </return-value>
-    </function>
-    <function name="list_new" c:identifier="gtk_list_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="list_insert_items" c:identifier="gtk_list_insert_items">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="items">
-          <type name="GLib.GList" c:type="GList*"/>
-        </parameter>
-        <parameter name="position">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_append_items" c:identifier="gtk_list_append_items">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="items">
-          <type name="GLib.GList" c:type="GList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_prepend_items" c:identifier="gtk_list_prepend_items">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="items">
-          <type name="GLib.GList" c:type="GList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_remove_items" c:identifier="gtk_list_remove_items">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="items">
-          <type name="GLib.GList" c:type="GList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_remove_items_no_unref"
-              c:identifier="gtk_list_remove_items_no_unref">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="items">
-          <type name="GLib.GList" c:type="GList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_clear_items" c:identifier="gtk_list_clear_items">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="start">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="end">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_select_item" c:identifier="gtk_list_select_item">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="item">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_unselect_item" c:identifier="gtk_list_unselect_item">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="item">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_select_child" c:identifier="gtk_list_select_child">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="child">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_unselect_child"
-              c:identifier="gtk_list_unselect_child">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="child">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_child_position"
-              c:identifier="gtk_list_child_position">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="child">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="list">
+          <type name="GtkList" c:type="GtkList*"/>
+        </parameter>
+        <parameter name="child">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
@@ -50924,6 +49371,11 @@
       <field name="clipboard_text">
         <type name="string" c:type="gchar*"/>
       </field>
+    </record>
+    <record name="GtkOldEditableClass" c:type="GtkOldEditableClass">
+      <field name="parent_class">
+        <type name="GtkWidgetClass" c:type="GtkWidgetClass"/>
+      </field>
       <callback name="activate">
         <return-value>
           <type name="none" c:type="void"/>
@@ -51318,6 +49770,11 @@
         <type name="uint32" c:type="guint"/>
       </field>
     </record>
+    <record name="GtkPixmapClass" c:type="GtkPixmapClass">
+      <field name="parent_class">
+        <type name="GtkMiscClass" c:type="GtkMiscClass"/>
+      </field>
+    </record>
     <function name="pixmap_get_type" c:identifier="gtk_pixmap_get_type">
       <return-value>
         <type name="GtkType" c:type="GtkType"/>
@@ -51642,9 +50099,6 @@
       <field name="expand">
         <type name="uint32" c:type="guint"/>
       </field>
-      <field name="info">
-        <type name="GtkPreviewInfo" c:type="GtkPreviewInfo"/>
-      </field>
     </record>
     <record name="GtkPreviewInfo" c:type="GtkPreviewInfo">
       <field name="lookup">
@@ -51654,6 +50108,14 @@
         <type name="double" c:type="gdouble"/>
       </field>
     </record>
+    <record name="GtkPreviewClass" c:type="GtkPreviewClass">
+      <field name="parent_class">
+        <type name="GtkWidgetClass" c:type="GtkWidgetClass"/>
+      </field>
+      <field name="info">
+        <type name="GtkPreviewInfo" c:type="GtkPreviewInfo"/>
+      </field>
+    </record>
     <function name="preview_get_type" c:identifier="gtk_preview_get_type">
       <return-value>
         <type name="GtkType" c:type="GtkType"/>
@@ -55904,2670 +54366,1776 @@
         </parameters>
       </method>
       <method name="get_application_info"
-              c:identifier="gtk_recent_info_get_application_info">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-          <parameter name="app_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="app_exec">
-            <type name="GLib.gchar" c:type="gchar**"/>
-          </parameter>
-          <parameter name="count">
-            <type name="GLib.guint" c:type="guint*"/>
-          </parameter>
-          <parameter name="time_">
-            <type name="time_t" c:type="time_t*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_applications"
-              c:identifier="gtk_recent_info_get_applications">
-        <return-value>
-          <type name="GLib.gchar" c:type="gchar**"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-          <parameter name="length">
-            <type name="gsize" c:type="gsize*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="last_application"
-              c:identifier="gtk_recent_info_last_application">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="has_application"
-              c:identifier="gtk_recent_info_has_application">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-          <parameter name="app_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_groups" c:identifier="gtk_recent_info_get_groups">
-        <return-value>
-          <type name="GLib.gchar" c:type="gchar**"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-          <parameter name="length">
-            <type name="gsize" c:type="gsize*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="has_group" c:identifier="gtk_recent_info_has_group">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-          <parameter name="group_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_icon" c:identifier="gtk_recent_info_get_icon">
-        <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-          <parameter name="size">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_short_name"
-              c:identifier="gtk_recent_info_get_short_name">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_uri_display"
-              c:identifier="gtk_recent_info_get_uri_display">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_age" c:identifier="gtk_recent_info_get_age">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="is_local" c:identifier="gtk_recent_info_is_local">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="exists" c:identifier="gtk_recent_info_exists">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="match" c:identifier="gtk_recent_info_match">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="info_a">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-          <parameter name="info_b">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </glib:boxed>
-    <function name="recent_manager_sync"
-              c:identifier="_gtk_recent_manager_sync">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <record name="GtkRecentActionPrivate" c:type="GtkRecentActionPrivate"/>
-    <class name="RecentAction"
-           c:type="GtkRecentAction"
-           parent="Action"
-           glib:type-name="GtkRecentAction"
-           glib:get-type="gtk_recent_action_get_type">
-      <method name="get_show_numbers"
-              c:identifier="gtk_recent_action_get_show_numbers">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="RecentAction" c:type="GtkRecentAction*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_show_numbers"
-              c:identifier="gtk_recent_action_set_show_numbers">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="RecentAction" c:type="GtkRecentAction*"/>
-          </parameter>
-          <parameter name="show_numbers">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="show-numbers">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-    </class>
-    <function name="recent_action_new" c:identifier="gtk_recent_action_new">
-      <return-value>
-        <type name="Action" c:type="GtkAction*"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="label">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="tooltip">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="stock_id">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_action_new_for_manager"
-              c:identifier="gtk_recent_action_new_for_manager">
-      <return-value>
-        <type name="Action" c:type="GtkAction*"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="label">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="tooltip">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="stock_id">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="manager">
-          <type name="RecentManager" c:type="GtkRecentManager*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkRecentFilterInfo" c:type="GtkRecentFilterInfo">
-      <field name="contains">
-        <type name="RecentFilterFlags" c:type="GtkRecentFilterFlags"/>
-      </field>
-      <field name="uri">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="display_name">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="mime_type">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="applications">
-        <type name="GLib.gchar" c:type="gchar**"/>
-      </field>
-      <field name="groups">
-        <type name="GLib.gchar" c:type="gchar**"/>
-      </field>
-      <field name="age">
-        <type name="int32" c:type="gint"/>
-      </field>
-    </record>
-    <callback name="GtkRecentFilterFunc">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="filter_info">
-          <type name="GtkRecentFilterInfo" c:type="GtkRecentFilterInfo*"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <class name="RecentFilter"
-           c:type="GtkRecentFilter"
-           parent="GtkObject"
-           glib:type-name="GtkRecentFilter"
-           glib:get-type="gtk_recent_filter_get_type">
-      <constructor name="new" c:identifier="gtk_recent_filter_new">
-        <return-value>
-          <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-        </return-value>
-      </constructor>
-      <method name="set_name" c:identifier="gtk_recent_filter_set_name">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_name" c:identifier="gtk_recent_filter_get_name">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_mime_type"
-              c:identifier="gtk_recent_filter_add_mime_type">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-          <parameter name="mime_type">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_pattern" c:identifier="gtk_recent_filter_add_pattern">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-          <parameter name="pattern">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_pixbuf_formats"
-              c:identifier="gtk_recent_filter_add_pixbuf_formats">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_application"
-              c:identifier="gtk_recent_filter_add_application">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-          <parameter name="application">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_group" c:identifier="gtk_recent_filter_add_group">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-          <parameter name="group">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_age" c:identifier="gtk_recent_filter_add_age">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-          <parameter name="days">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_custom" c:identifier="gtk_recent_filter_add_custom">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-          <parameter name="needed">
-            <type name="RecentFilterFlags" c:type="GtkRecentFilterFlags"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkRecentFilterFunc" c:type="GtkRecentFilterFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-          <parameter name="data_destroy">
-            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_needed" c:identifier="gtk_recent_filter_get_needed">
-        <return-value>
-          <type name="RecentFilterFlags" c:type="GtkRecentFilterFlags"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="filter" c:identifier="gtk_recent_filter_filter">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-          <parameter name="filter_info">
-            <type name="GtkRecentFilterInfo" c:type="GtkRecentFilterInfo*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </class>
-    <callback name="GtkRecentSortFunc">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="a">
-          <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-        </parameter>
-        <parameter name="b">
-          <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <record name="GtkRecentChooser" c:type="GtkRecentChooser"/>
-    <function name="recent_chooser_error_quark"
-              c:identifier="gtk_recent_chooser_error_quark">
-      <return-value>
-        <type name="GLib.GQuark" c:type="GQuark"/>
-      </return-value>
-    </function>
-    <interface name="RecentChooser"
-               c:type="GtkRecentChooser"
-               glib:type-name="GtkRecentChooser"
-               glib:get-type="gtk_recent_chooser_get_type">
-      <property name="filter">
-        <type name="RecentFilter" c:type="GtkRecentFilter"/>
-      </property>
-      <property name="show-private">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="show-icons">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="local-only">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="show-tips">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="limit">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="recent-manager">
-        <type name="RecentManager" c:type="GtkRecentManager"/>
-      </property>
-      <property name="sort-type">
-        <type name="RecentSortType" c:type="GtkRecentSortType"/>
-      </property>
-      <property name="show-not-found">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="select-multiple">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="set_current_uri">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-          </parameter>
-          <parameter name="uri">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_current_uri">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="select_uri">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-          </parameter>
-          <parameter name="uri">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="unselect_uri">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-          </parameter>
-          <parameter name="uri">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="select_all">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="unselect_all">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_items">
-        <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_recent_manager">
-        <return-value>
-          <type name="RecentManager" c:type="GtkRecentManager*"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="add_filter">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-          </parameter>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="remove_filter">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-          </parameter>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="list_filters">
-        <return-value>
-          <type name="GLib.GSList" c:type="GSList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_sort_func">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-          </parameter>
-          <parameter name="sort_func">
-            <type name="GtkRecentSortFunc" c:type="GtkRecentSortFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-          <parameter name="destroy">
-            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="item_activated">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="selection_changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <glib:signal name="selection-changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="item-activated">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </interface>
-    <function name="recent_chooser_set_show_private"
-              c:identifier="gtk_recent_chooser_set_show_private">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="show_private">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_show_private"
-              c:identifier="gtk_recent_chooser_get_show_private">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_set_show_not_found"
-              c:identifier="gtk_recent_chooser_set_show_not_found">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="show_not_found">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_show_not_found"
-              c:identifier="gtk_recent_chooser_get_show_not_found">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_set_select_multiple"
-              c:identifier="gtk_recent_chooser_set_select_multiple">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="select_multiple">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_select_multiple"
-              c:identifier="gtk_recent_chooser_get_select_multiple">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_set_limit"
-              c:identifier="gtk_recent_chooser_set_limit">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="limit">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_limit"
-              c:identifier="gtk_recent_chooser_get_limit">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_set_local_only"
-              c:identifier="gtk_recent_chooser_set_local_only">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="local_only">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_local_only"
-              c:identifier="gtk_recent_chooser_get_local_only">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_set_show_tips"
-              c:identifier="gtk_recent_chooser_set_show_tips">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="show_tips">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_show_tips"
-              c:identifier="gtk_recent_chooser_get_show_tips">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_set_show_numbers"
-              c:identifier="gtk_recent_chooser_set_show_numbers">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="show_numbers">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_show_numbers"
-              c:identifier="gtk_recent_chooser_get_show_numbers">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_set_show_icons"
-              c:identifier="gtk_recent_chooser_set_show_icons">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="show_icons">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_show_icons"
-              c:identifier="gtk_recent_chooser_get_show_icons">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_set_sort_type"
-              c:identifier="gtk_recent_chooser_set_sort_type">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="sort_type">
-          <type name="RecentSortType" c:type="GtkRecentSortType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_sort_type"
-              c:identifier="gtk_recent_chooser_get_sort_type">
-      <return-value>
-        <type name="RecentSortType" c:type="GtkRecentSortType"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_set_sort_func"
-              c:identifier="gtk_recent_chooser_set_sort_func">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="sort_func">
-          <type name="GtkRecentSortFunc" c:type="GtkRecentSortFunc"/>
-        </parameter>
-        <parameter name="sort_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="data_destroy">
-          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_set_current_uri"
-              c:identifier="gtk_recent_chooser_set_current_uri">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="uri">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_current_uri"
-              c:identifier="gtk_recent_chooser_get_current_uri">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_current_item"
-              c:identifier="gtk_recent_chooser_get_current_item">
-      <return-value>
-        <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_select_uri"
-              c:identifier="gtk_recent_chooser_select_uri">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="uri">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_unselect_uri"
-              c:identifier="gtk_recent_chooser_unselect_uri">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="uri">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_select_all"
-              c:identifier="gtk_recent_chooser_select_all">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_unselect_all"
-              c:identifier="gtk_recent_chooser_unselect_all">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_items"
-              c:identifier="gtk_recent_chooser_get_items">
-      <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_uris"
-              c:identifier="gtk_recent_chooser_get_uris">
-      <return-value>
-        <type name="GLib.gchar" c:type="gchar**"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_add_filter"
-              c:identifier="gtk_recent_chooser_add_filter">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="filter">
-          <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_remove_filter"
-              c:identifier="gtk_recent_chooser_remove_filter">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="filter">
-          <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_list_filters"
-              c:identifier="gtk_recent_chooser_list_filters">
-      <return-value>
-        <type name="GLib.GSList" c:type="GSList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_set_filter"
-              c:identifier="gtk_recent_chooser_set_filter">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-        <parameter name="filter">
-          <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_get_filter"
-              c:identifier="gtk_recent_chooser_get_filter">
-      <return-value>
-        <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkRecentChooserDialogPrivate"
-            c:type="GtkRecentChooserDialogPrivate"/>
-    <class name="RecentChooserDialog"
-           c:type="GtkRecentChooserDialog"
-           parent="Dialog"
-           glib:type-name="GtkRecentChooserDialog"
-           glib:get-type="gtk_recent_chooser_dialog_get_type">
-    </class>
-    <function name="recent_chooser_dialog_new"
-              c:identifier="gtk_recent_chooser_dialog_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="title">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="parent">
-          <type name="Window" c:type="GtkWindow*"/>
-        </parameter>
-        <parameter name="first_button_text">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="recent_chooser_dialog_new_for_manager"
-              c:identifier="gtk_recent_chooser_dialog_new_for_manager">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="title">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="parent">
-          <type name="Window" c:type="GtkWindow*"/>
-        </parameter>
-        <parameter name="manager">
-          <type name="RecentManager" c:type="GtkRecentManager*"/>
-        </parameter>
-        <parameter name="first_button_text">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkRecentChooserMenuPrivate"
-            c:type="GtkRecentChooserMenuPrivate"/>
-    <class name="RecentChooserMenu"
-           c:type="GtkRecentChooserMenu"
-           parent="Menu"
-           glib:type-name="GtkRecentChooserMenu"
-           glib:get-type="gtk_recent_chooser_menu_get_type">
-      <method name="get_show_numbers"
-              c:identifier="gtk_recent_chooser_menu_get_show_numbers">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="menu">
-            <type name="RecentChooserMenu" c:type="GtkRecentChooserMenu*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_show_numbers"
-              c:identifier="gtk_recent_chooser_menu_set_show_numbers">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="menu">
-            <type name="RecentChooserMenu" c:type="GtkRecentChooserMenu*"/>
-          </parameter>
-          <parameter name="show_numbers">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="show-numbers">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="gtk_recent1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="gtk_recent2">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="gtk_recent3">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="gtk_recent4">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-    </class>
-    <function name="recent_chooser_menu_new"
-              c:identifier="gtk_recent_chooser_menu_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="recent_chooser_menu_new_for_manager"
-              c:identifier="gtk_recent_chooser_menu_new_for_manager">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="manager">
-          <type name="RecentManager" c:type="GtkRecentManager*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkRecentChooserWidgetPrivate"
-            c:type="GtkRecentChooserWidgetPrivate"/>
-    <class name="RecentChooserWidget"
-           c:type="GtkRecentChooserWidget"
-           parent="VBox"
-           glib:type-name="GtkRecentChooserWidget"
-           glib:get-type="gtk_recent_chooser_widget_get_type">
-    </class>
-    <function name="recent_chooser_widget_new"
-              c:identifier="gtk_recent_chooser_widget_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="recent_chooser_widget_new_for_manager"
-              c:identifier="gtk_recent_chooser_widget_new_for_manager">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="manager">
-          <type name="RecentManager" c:type="GtkRecentManager*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkScaleButtonPrivate" c:type="GtkScaleButtonPrivate"/>
-    <class name="ScaleButton"
-           c:type="GtkScaleButton"
-           parent="Button"
-           glib:type-name="GtkScaleButton"
-           glib:get-type="gtk_scale_button_get_type">
-      <method name="set_icons" c:identifier="gtk_scale_button_set_icons">
+              c:identifier="gtk_recent_info_get_application_info">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ScaleButton" c:type="GtkScaleButton*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
-          <parameter name="icons">
+          <parameter name="app_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="app_exec">
             <type name="GLib.gchar" c:type="gchar**"/>
           </parameter>
+          <parameter name="count">
+            <type name="GLib.guint" c:type="guint*"/>
+          </parameter>
+          <parameter name="time_">
+            <type name="time_t" c:type="time_t*"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="get_value" c:identifier="gtk_scale_button_get_value">
+      <method name="get_applications"
+              c:identifier="gtk_recent_info_get_applications">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="GLib.gchar" c:type="gchar**"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ScaleButton" c:type="GtkScaleButton*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="gsize" c:type="gsize*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_value" c:identifier="gtk_scale_button_set_value">
+      <method name="last_application"
+              c:identifier="gtk_recent_info_last_application">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ScaleButton" c:type="GtkScaleButton*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
-          <parameter name="value">
-            <type name="double" c:type="gdouble"/>
+        </parameters>
+      </method>
+      <method name="has_application"
+              c:identifier="gtk_recent_info_has_application">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          </parameter>
+          <parameter name="app_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_adjustment"
-              c:identifier="gtk_scale_button_get_adjustment">
+      <method name="get_groups" c:identifier="gtk_recent_info_get_groups">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <type name="GLib.gchar" c:type="gchar**"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ScaleButton" c:type="GtkScaleButton*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="gsize" c:type="gsize*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_adjustment"
-              c:identifier="gtk_scale_button_set_adjustment">
+      <method name="has_group" c:identifier="gtk_recent_info_has_group">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ScaleButton" c:type="GtkScaleButton*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="group_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="value">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <property name="size">
-        <type name="IconSize" c:type="GtkIconSize"/>
-      </property>
-      <property name="adjustment">
-        <type name="Adjustment" c:type="GtkAdjustment"/>
-      </property>
-      <property name="icons">
-        <type name="GStrv" c:type="GStrv"/>
-      </property>
-      <callback name="value_changed">
+      <method name="get_icon" c:identifier="gtk_recent_info_get_icon">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ScaleButton" c:type="GtkScaleButton*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
-          <parameter name="value">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="size">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
+      </method>
+      <method name="get_short_name"
+              c:identifier="gtk_recent_info_get_short_name">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+        <parameters>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_uri_display"
+              c:identifier="gtk_recent_info_get_uri_display">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_age" c:identifier="gtk_recent_info_get_age">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="is_local" c:identifier="gtk_recent_info_is_local">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </callback>
-      <glib:signal name="value-changed">
+        <parameters>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="exists" c:identifier="gtk_recent_info_exists">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="popup">
+      </method>
+      <method name="match" c:identifier="gtk_recent_info_match">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="popdown">
+        <parameters>
+          <parameter name="info_a">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          </parameter>
+          <parameter name="info_b">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </glib:boxed>
+    <function name="recent_manager_sync"
+              c:identifier="_gtk_recent_manager_sync">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <record name="GtkRecentActionPrivate" c:type="GtkRecentActionPrivate"/>
+    <class name="RecentAction"
+           c:type="GtkRecentAction"
+           parent="Action"
+           glib:type-name="GtkRecentAction"
+           glib:get-type="gtk_recent_action_get_type">
+      <method name="get_show_numbers"
+              c:identifier="gtk_recent_action_get_show_numbers">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="action">
+            <type name="RecentAction" c:type="GtkRecentAction*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_show_numbers"
+              c:identifier="gtk_recent_action_set_show_numbers">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
+        <parameters>
+          <parameter name="action">
+            <type name="RecentAction" c:type="GtkRecentAction*"/>
+          </parameter>
+          <parameter name="show_numbers">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="show-numbers">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
     </class>
-    <function name="scale_button_new" c:identifier="gtk_scale_button_new">
+    <function name="recent_action_new" c:identifier="gtk_recent_action_new">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="Action" c:type="GtkAction*"/>
       </return-value>
       <parameters>
-        <parameter name="size">
-          <type name="IconSize" c:type="GtkIconSize"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="min">
-          <type name="double" c:type="gdouble"/>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="max">
-          <type name="double" c:type="gdouble"/>
+        <parameter name="tooltip">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="step">
-          <type name="double" c:type="gdouble"/>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="icons">
-          <type name="GLib.gchar" c:type="gchar**"/>
+      </parameters>
+    </function>
+    <function name="recent_action_new_for_manager"
+              c:identifier="gtk_recent_action_new_for_manager">
+      <return-value>
+        <type name="Action" c:type="GtkAction*"/>
+      </return-value>
+      <parameters>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="tooltip">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="manager">
+          <type name="RecentManager" c:type="GtkRecentManager*"/>
         </parameter>
       </parameters>
     </function>
-    <class name="Viewport"
-           c:type="GtkViewport"
-           parent="Bin"
-           glib:type-name="GtkViewport"
-           glib:get-type="gtk_viewport_get_type">
-      <method name="get_hadjustment"
-              c:identifier="gtk_viewport_get_hadjustment">
+    <record name="GtkRecentFilterInfo" c:type="GtkRecentFilterInfo">
+      <field name="contains">
+        <type name="RecentFilterFlags" c:type="GtkRecentFilterFlags"/>
+      </field>
+      <field name="uri">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="display_name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="mime_type">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="applications">
+        <type name="GLib.gchar" c:type="gchar**"/>
+      </field>
+      <field name="groups">
+        <type name="GLib.gchar" c:type="gchar**"/>
+      </field>
+      <field name="age">
+        <type name="int32" c:type="gint"/>
+      </field>
+    </record>
+    <callback name="GtkRecentFilterFunc">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="filter_info">
+          <type name="GtkRecentFilterInfo" c:type="GtkRecentFilterInfo*"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <class name="RecentFilter"
+           c:type="GtkRecentFilter"
+           parent="GtkObject"
+           glib:type-name="GtkRecentFilter"
+           glib:get-type="gtk_recent_filter_get_type">
+      <constructor name="new" c:identifier="gtk_recent_filter_new">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+        </return-value>
+      </constructor>
+      <method name="set_name" c:identifier="gtk_recent_filter_set_name">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="viewport">
-            <type name="Viewport" c:type="GtkViewport*"/>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_vadjustment"
-              c:identifier="gtk_viewport_get_vadjustment">
+      <method name="get_name" c:identifier="gtk_recent_filter_get_name">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="viewport">
-            <type name="Viewport" c:type="GtkViewport*"/>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_hadjustment"
-              c:identifier="gtk_viewport_set_hadjustment">
+      <method name="add_mime_type"
+              c:identifier="gtk_recent_filter_add_mime_type">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="viewport">
-            <type name="Viewport" c:type="GtkViewport*"/>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
           </parameter>
-          <parameter name="adjustment" allow-none="1">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="mime_type">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_vadjustment"
-              c:identifier="gtk_viewport_set_vadjustment">
+      <method name="add_pattern" c:identifier="gtk_recent_filter_add_pattern">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="viewport">
-            <type name="Viewport" c:type="GtkViewport*"/>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
           </parameter>
-          <parameter name="adjustment" allow-none="1">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="pattern">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_shadow_type"
-              c:identifier="gtk_viewport_set_shadow_type">
+      <method name="add_pixbuf_formats"
+              c:identifier="gtk_recent_filter_add_pixbuf_formats">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="viewport">
-            <type name="Viewport" c:type="GtkViewport*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="ShadowType" c:type="GtkShadowType"/>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_shadow_type"
-              c:identifier="gtk_viewport_get_shadow_type">
+      <method name="add_application"
+              c:identifier="gtk_recent_filter_add_application">
         <return-value>
-          <type name="ShadowType" c:type="GtkShadowType"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="viewport">
-            <type name="Viewport" c:type="GtkViewport*"/>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+          <parameter name="application">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="hadjustment">
-        <type name="Adjustment" c:type="GtkAdjustment"/>
-      </property>
-      <property name="vadjustment">
-        <type name="Adjustment" c:type="GtkAdjustment"/>
-      </property>
-      <property name="shadow-type">
-        <type name="ShadowType" c:type="GtkShadowType"/>
-      </property>
-      <callback name="set_scroll_adjustments">
+      <method name="add_group" c:identifier="gtk_recent_filter_add_group">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="viewport">
-            <type name="Viewport" c:type="GtkViewport*"/>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
           </parameter>
-          <parameter name="hadjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="group">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="vadjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </parameters>
+      </method>
+      <method name="add_age" c:identifier="gtk_recent_filter_add_age">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+          <parameter name="days">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <glib:signal name="set-scroll-adjustments">
+      </method>
+      <method name="add_custom" c:identifier="gtk_recent_filter_add_custom">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Adjustment" c:type="GtkAdjustment"/>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="Adjustment" c:type="GtkAdjustment"/>
+          <parameter name="needed">
+            <type name="RecentFilterFlags" c:type="GtkRecentFilterFlags"/>
+          </parameter>
+          <parameter name="func">
+            <type name="GtkRecentFilterFunc" c:type="GtkRecentFilterFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="data_destroy">
+            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
-      </glib:signal>
+      </method>
+      <method name="get_needed" c:identifier="gtk_recent_filter_get_needed">
+        <return-value>
+          <type name="RecentFilterFlags" c:type="GtkRecentFilterFlags"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="filter" c:identifier="gtk_recent_filter_filter">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+          <parameter name="filter_info">
+            <type name="GtkRecentFilterInfo" c:type="GtkRecentFilterInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
     </class>
-    <function name="viewport_new" c:identifier="gtk_viewport_new">
+    <callback name="GtkRecentSortFunc">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="int32" c:type="gint"/>
       </return-value>
       <parameters>
-        <parameter name="hadjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        <parameter name="a">
+          <type name="RecentInfo" c:type="GtkRecentInfo*"/>
         </parameter>
-        <parameter name="vadjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        <parameter name="b">
+          <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
+    </callback>
+    <record name="GtkRecentChooser" c:type="GtkRecentChooser"/>
+    <function name="recent_chooser_error_quark"
+              c:identifier="gtk_recent_chooser_error_quark">
+      <return-value>
+        <type name="GLib.GQuark" c:type="GQuark"/>
+      </return-value>
     </function>
-    <class name="ScrolledWindow"
-           c:type="GtkScrolledWindow"
-           parent="Bin"
-           glib:type-name="GtkScrolledWindow"
-           glib:get-type="gtk_scrolled_window_get_type">
-      <method name="set_hadjustment"
-              c:identifier="gtk_scrolled_window_set_hadjustment">
+    <interface name="RecentChooser"
+               c:type="GtkRecentChooser"
+               glib:type-name="GtkRecentChooser"
+               glib:get-type="gtk_recent_chooser_get_type">
+      <property name="local-only">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="recent-manager">
+        <type name="RecentManager" c:type="GtkRecentManager"/>
+      </property>
+      <property name="filter">
+        <type name="RecentFilter" c:type="GtkRecentFilter"/>
+      </property>
+      <property name="show-private">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="show-tips">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="sort-type">
+        <type name="RecentSortType" c:type="GtkRecentSortType"/>
+      </property>
+      <property name="show-not-found">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="limit">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="show-icons">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="select-multiple">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="set_current_uri">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
-          <parameter name="hadjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_vadjustment"
-              c:identifier="gtk_scrolled_window_set_vadjustment">
+      </callback>
+      <callback name="get_current_uri">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
-          </parameter>
-          <parameter name="vadjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_hadjustment"
-              c:identifier="gtk_scrolled_window_get_hadjustment">
+      </callback>
+      <callback name="select_uri">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+          </parameter>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_vadjustment"
-              c:identifier="gtk_scrolled_window_get_vadjustment">
+      </callback>
+      <callback name="unselect_uri">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+          </parameter>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_hscrollbar"
-              c:identifier="gtk_scrolled_window_get_hscrollbar">
+      </callback>
+      <callback name="select_all">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_vscrollbar"
-              c:identifier="gtk_scrolled_window_get_vscrollbar">
+      </callback>
+      <callback name="unselect_all">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_policy" c:identifier="gtk_scrolled_window_set_policy">
+      </callback>
+      <callback name="get_items">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
-          </parameter>
-          <parameter name="hscrollbar_policy">
-            <type name="PolicyType" c:type="GtkPolicyType"/>
-          </parameter>
-          <parameter name="vscrollbar_policy">
-            <type name="PolicyType" c:type="GtkPolicyType"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_policy" c:identifier="gtk_scrolled_window_get_policy">
+      </callback>
+      <callback name="get_recent_manager">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="RecentManager" c:type="GtkRecentManager*"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
-          </parameter>
-          <parameter name="hscrollbar_policy">
-            <type name="PolicyType" c:type="GtkPolicyType*"/>
-          </parameter>
-          <parameter name="vscrollbar_policy">
-            <type name="PolicyType" c:type="GtkPolicyType*"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_placement"
-              c:identifier="gtk_scrolled_window_set_placement">
+      </callback>
+      <callback name="add_filter">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
-          <parameter name="window_placement">
-            <type name="CornerType" c:type="GtkCornerType"/>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="unset_placement"
-              c:identifier="gtk_scrolled_window_unset_placement">
+      </callback>
+      <callback name="remove_filter">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+          </parameter>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_placement"
-              c:identifier="gtk_scrolled_window_get_placement">
+      </callback>
+      <callback name="list_filters">
         <return-value>
-          <type name="CornerType" c:type="GtkCornerType"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_shadow_type"
-              c:identifier="gtk_scrolled_window_set_shadow_type">
+      </callback>
+      <callback name="set_sort_func">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
-          <parameter name="type">
-            <type name="ShadowType" c:type="GtkShadowType"/>
+          <parameter name="sort_func">
+            <type name="GtkRecentSortFunc" c:type="GtkRecentSortFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_shadow_type"
-              c:identifier="gtk_scrolled_window_get_shadow_type">
+      </callback>
+      <callback name="item_activated">
         <return-value>
-          <type name="ShadowType" c:type="GtkShadowType"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="add_with_viewport"
-              c:identifier="gtk_scrolled_window_add_with_viewport">
+      </callback>
+      <callback name="selection_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="hadjustment">
-        <type name="Adjustment" c:type="GtkAdjustment"/>
-      </property>
-      <property name="vadjustment">
-        <type name="Adjustment" c:type="GtkAdjustment"/>
-      </property>
-      <property name="hscrollbar-policy">
-        <type name="PolicyType" c:type="GtkPolicyType"/>
-      </property>
-      <property name="vscrollbar-policy">
-        <type name="PolicyType" c:type="GtkPolicyType"/>
-      </property>
-      <property name="window-placement">
-        <type name="CornerType" c:type="GtkCornerType"/>
-      </property>
-      <property name="window-placement-set">
+      </callback>
+      <glib:signal name="selection-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="item-activated">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </interface>
+    <function name="recent_chooser_set_show_private"
+              c:identifier="gtk_recent_chooser_set_show_private">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+        <parameter name="show_private">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_get_show_private"
+              c:identifier="gtk_recent_chooser_get_show_private">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_set_show_not_found"
+              c:identifier="gtk_recent_chooser_set_show_not_found">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+        <parameter name="show_not_found">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_get_show_not_found"
+              c:identifier="gtk_recent_chooser_get_show_not_found">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_set_select_multiple"
+              c:identifier="gtk_recent_chooser_set_select_multiple">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+        <parameter name="select_multiple">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_get_select_multiple"
+              c:identifier="gtk_recent_chooser_get_select_multiple">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_set_limit"
+              c:identifier="gtk_recent_chooser_set_limit">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+        <parameter name="limit">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_get_limit"
+              c:identifier="gtk_recent_chooser_get_limit">
+      <return-value>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_set_local_only"
+              c:identifier="gtk_recent_chooser_set_local_only">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+        <parameter name="local_only">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_get_local_only"
+              c:identifier="gtk_recent_chooser_get_local_only">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_set_show_tips"
+              c:identifier="gtk_recent_chooser_set_show_tips">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+        <parameter name="show_tips">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_get_show_tips"
+              c:identifier="gtk_recent_chooser_get_show_tips">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_set_show_numbers"
+              c:identifier="gtk_recent_chooser_set_show_numbers">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+        <parameter name="show_numbers">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_get_show_numbers"
+              c:identifier="gtk_recent_chooser_get_show_numbers">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_set_show_icons"
+              c:identifier="gtk_recent_chooser_set_show_icons">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+        <parameter name="show_icons">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_get_show_icons"
+              c:identifier="gtk_recent_chooser_get_show_icons">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_set_sort_type"
+              c:identifier="gtk_recent_chooser_set_sort_type">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+        <parameter name="sort_type">
+          <type name="RecentSortType" c:type="GtkRecentSortType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_get_sort_type"
+              c:identifier="gtk_recent_chooser_get_sort_type">
+      <return-value>
+        <type name="RecentSortType" c:type="GtkRecentSortType"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_set_sort_func"
+              c:identifier="gtk_recent_chooser_set_sort_func">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+        <parameter name="sort_func">
+          <type name="GtkRecentSortFunc" c:type="GtkRecentSortFunc"/>
+        </parameter>
+        <parameter name="sort_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="data_destroy">
+          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_set_current_uri"
+              c:identifier="gtk_recent_chooser_set_current_uri">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+        <parameter name="uri">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.GError" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_get_current_uri"
+              c:identifier="gtk_recent_chooser_get_current_uri">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_get_current_item"
+              c:identifier="gtk_recent_chooser_get_current_item">
+      <return-value>
+        <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_select_uri"
+              c:identifier="gtk_recent_chooser_select_uri">
+      <return-value>
         <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="shadow-type">
-        <type name="ShadowType" c:type="GtkShadowType"/>
-      </property>
-      <field name="scrollbar_spacing">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <callback name="scroll_child">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
-          </parameter>
-          <parameter name="scroll">
-            <type name="ScrollType" c:type="GtkScrollType"/>
-          </parameter>
-          <parameter name="horizontal">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="move_focus_out">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
-          </parameter>
-          <parameter name="direction">
-            <type name="DirectionType" c:type="GtkDirectionType"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="move-focus-out">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="DirectionType" c:type="GtkDirectionType"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="scroll-child">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="ScrollType" c:type="GtkScrollType"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </class>
-    <function name="scrolled_window_new"
-              c:identifier="gtk_scrolled_window_new">
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+        <parameter name="uri">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.GError" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_unselect_uri"
+              c:identifier="gtk_recent_chooser_unselect_uri">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="hadjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
-        <parameter name="vadjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        <parameter name="uri">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="scrolled_window_get_scrollbar_spacing"
-              c:identifier="_gtk_scrolled_window_get_scrollbar_spacing">
+    <function name="recent_chooser_select_all"
+              c:identifier="gtk_recent_chooser_select_all">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="scrolled_window">
-          <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
       </parameters>
     </function>
-    <class name="SeparatorMenuItem"
-           c:type="GtkSeparatorMenuItem"
-           parent="MenuItem"
-           glib:type-name="GtkSeparatorMenuItem"
-           glib:get-type="gtk_separator_menu_item_get_type">
+    <function name="recent_chooser_unselect_all"
+              c:identifier="gtk_recent_chooser_unselect_all">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_get_items"
+              c:identifier="gtk_recent_chooser_get_items">
+      <return-value>
+        <type name="GLib.GList" c:type="GList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_get_uris"
+              c:identifier="gtk_recent_chooser_get_uris">
+      <return-value>
+        <type name="GLib.gchar" c:type="gchar**"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+        <parameter name="length">
+          <type name="gsize" c:type="gsize*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_add_filter"
+              c:identifier="gtk_recent_chooser_add_filter">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+        <parameter name="filter">
+          <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_remove_filter"
+              c:identifier="gtk_recent_chooser_remove_filter">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+        <parameter name="filter">
+          <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_list_filters"
+              c:identifier="gtk_recent_chooser_list_filters">
+      <return-value>
+        <type name="GLib.GSList" c:type="GSList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_set_filter"
+              c:identifier="gtk_recent_chooser_set_filter">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+        <parameter name="filter">
+          <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_get_filter"
+              c:identifier="gtk_recent_chooser_get_filter">
+      <return-value>
+        <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkRecentChooserDialogPrivate"
+            c:type="GtkRecentChooserDialogPrivate"/>
+    <class name="RecentChooserDialog"
+           c:type="GtkRecentChooserDialog"
+           parent="Dialog"
+           glib:type-name="GtkRecentChooserDialog"
+           glib:get-type="gtk_recent_chooser_dialog_get_type">
     </class>
-    <function name="separator_menu_item_new"
-              c:identifier="gtk_separator_menu_item_new">
+    <function name="recent_chooser_dialog_new"
+              c:identifier="gtk_recent_chooser_dialog_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
+      <parameters>
+        <parameter name="title">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="parent">
+          <type name="Window" c:type="GtkWindow*"/>
+        </parameter>
+        <parameter name="first_button_text">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
     </function>
-    <record name="GtkSeparatorToolItemPrivate"
-            c:type="GtkSeparatorToolItemPrivate"/>
-    <class name="SeparatorToolItem"
-           c:type="GtkSeparatorToolItem"
-           parent="ToolItem"
-           glib:type-name="GtkSeparatorToolItem"
-           glib:get-type="gtk_separator_tool_item_get_type">
-      <method name="get_draw" c:identifier="gtk_separator_tool_item_get_draw">
+    <function name="recent_chooser_dialog_new_for_manager"
+              c:identifier="gtk_recent_chooser_dialog_new_for_manager">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="title">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="parent">
+          <type name="Window" c:type="GtkWindow*"/>
+        </parameter>
+        <parameter name="manager">
+          <type name="RecentManager" c:type="GtkRecentManager*"/>
+        </parameter>
+        <parameter name="first_button_text">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkRecentChooserMenuPrivate"
+            c:type="GtkRecentChooserMenuPrivate"/>
+    <class name="RecentChooserMenu"
+           c:type="GtkRecentChooserMenu"
+           parent="Menu"
+           glib:type-name="GtkRecentChooserMenu"
+           glib:get-type="gtk_recent_chooser_menu_get_type">
+      <method name="get_show_numbers"
+              c:identifier="gtk_recent_chooser_menu_get_show_numbers">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="item">
-            <type name="SeparatorToolItem" c:type="GtkSeparatorToolItem*"/>
+          <parameter name="menu">
+            <type name="RecentChooserMenu" c:type="GtkRecentChooserMenu*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_draw" c:identifier="gtk_separator_tool_item_set_draw">
+      <method name="set_show_numbers"
+              c:identifier="gtk_recent_chooser_menu_set_show_numbers">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="item">
-            <type name="SeparatorToolItem" c:type="GtkSeparatorToolItem*"/>
+          <parameter name="menu">
+            <type name="RecentChooserMenu" c:type="GtkRecentChooserMenu*"/>
           </parameter>
-          <parameter name="draw">
+          <parameter name="show_numbers">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <property name="draw">
+      <property name="show-numbers">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_recent1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_recent2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_recent3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_recent4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
-    <function name="separator_tool_item_new"
-              c:identifier="gtk_separator_tool_item_new">
+    <function name="recent_chooser_menu_new"
+              c:identifier="gtk_recent_chooser_menu_new">
       <return-value>
-        <type name="ToolItem" c:type="GtkToolItem*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
-    <class name="SizeGroup"
-           c:type="GtkSizeGroup"
-           parent="GObject.Object"
-           glib:type-name="GtkSizeGroup"
-           glib:get-type="gtk_size_group_get_type">
-      <constructor name="new" c:identifier="gtk_size_group_new">
-        <return-value>
-          <type name="SizeGroup" c:type="GtkSizeGroup*"/>
-        </return-value>
-        <parameters>
-          <parameter name="mode">
-            <type name="SizeGroupMode" c:type="GtkSizeGroupMode"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="set_mode" c:identifier="gtk_size_group_set_mode">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="size_group">
-            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
-          </parameter>
-          <parameter name="mode">
-            <type name="SizeGroupMode" c:type="GtkSizeGroupMode"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_mode" c:identifier="gtk_size_group_get_mode">
-        <return-value>
-          <type name="SizeGroupMode" c:type="GtkSizeGroupMode"/>
-        </return-value>
-        <parameters>
-          <parameter name="size_group">
-            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_ignore_hidden"
-              c:identifier="gtk_size_group_set_ignore_hidden">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="size_group">
-            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
-          </parameter>
-          <parameter name="ignore_hidden">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_ignore_hidden"
-              c:identifier="gtk_size_group_get_ignore_hidden">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="size_group">
-            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_widget" c:identifier="gtk_size_group_add_widget">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="size_group">
-            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="remove_widget" c:identifier="gtk_size_group_remove_widget">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="size_group">
-            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_widgets" c:identifier="gtk_size_group_get_widgets">
-        <return-value>
-          <type name="GLib.GSList" c:type="GSList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="size_group">
-            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="mode">
-        <type name="SizeGroupMode" c:type="GtkSizeGroupMode"/>
-      </property>
-      <property name="ignore-hidden">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-    </class>
-    <function name="size_group_get_child_requisition"
-              c:identifier="_gtk_size_group_get_child_requisition">
+    <function name="recent_chooser_menu_new_for_manager"
+              c:identifier="gtk_recent_chooser_menu_new_for_manager">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="requisition">
-          <type name="Requisition" c:type="GtkRequisition*"/>
+        <parameter name="manager">
+          <type name="RecentManager" c:type="GtkRecentManager*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="size_group_compute_requisition"
-              c:identifier="_gtk_size_group_compute_requisition">
+    <record name="GtkRecentChooserWidgetPrivate"
+            c:type="GtkRecentChooserWidgetPrivate"/>
+    <class name="RecentChooserWidget"
+           c:type="GtkRecentChooserWidget"
+           parent="VBox"
+           glib:type-name="GtkRecentChooserWidget"
+           glib:get-type="gtk_recent_chooser_widget_get_type">
+    </class>
+    <function name="recent_chooser_widget_new"
+              c:identifier="gtk_recent_chooser_widget_new">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="requisition">
-          <type name="Requisition" c:type="GtkRequisition*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="size_group_queue_resize"
-              c:identifier="_gtk_size_group_queue_resize">
+    <function name="recent_chooser_widget_new_for_manager"
+              c:identifier="gtk_recent_chooser_widget_new_for_manager">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="manager">
+          <type name="RecentManager" c:type="GtkRecentManager*"/>
         </parameter>
       </parameters>
     </function>
-    <class name="SpinButton"
-           c:type="GtkSpinButton"
-           parent="Entry"
-           glib:type-name="GtkSpinButton"
-           glib:get-type="gtk_spin_button_get_type">
-      <method name="configure" c:identifier="gtk_spin_button_configure">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
-          </parameter>
-          <parameter name="adjustment" allow-none="1">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
-          </parameter>
-          <parameter name="climb_rate">
-            <type name="double" c:type="gdouble"/>
-          </parameter>
-          <parameter name="digits">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_adjustment"
-              c:identifier="gtk_spin_button_set_adjustment">
+    <record name="GtkScaleButtonPrivate" c:type="GtkScaleButtonPrivate"/>
+    <class name="ScaleButton"
+           c:type="GtkScaleButton"
+           parent="Button"
+           glib:type-name="GtkScaleButton"
+           glib:get-type="gtk_scale_button_get_type">
+      <method name="set_icons" c:identifier="gtk_scale_button_set_icons">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="button">
+            <type name="ScaleButton" c:type="GtkScaleButton*"/>
           </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="icons">
+            <type name="GLib.gchar" c:type="gchar**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_adjustment"
-              c:identifier="gtk_spin_button_get_adjustment">
+      <method name="get_value" c:identifier="gtk_scale_button_get_value">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="button">
+            <type name="ScaleButton" c:type="GtkScaleButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_digits" c:identifier="gtk_spin_button_set_digits">
+      <method name="set_value" c:identifier="gtk_scale_button_set_value">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="button">
+            <type name="ScaleButton" c:type="GtkScaleButton*"/>
           </parameter>
-          <parameter name="digits">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_digits" c:identifier="gtk_spin_button_get_digits">
+      <method name="get_adjustment"
+              c:identifier="gtk_scale_button_get_adjustment">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="button">
+            <type name="ScaleButton" c:type="GtkScaleButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_increments"
-              c:identifier="gtk_spin_button_set_increments">
+      <method name="set_adjustment"
+              c:identifier="gtk_scale_button_set_adjustment">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
-          </parameter>
-          <parameter name="step">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="button">
+            <type name="ScaleButton" c:type="GtkScaleButton*"/>
           </parameter>
-          <parameter name="page">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_increments"
-              c:identifier="gtk_spin_button_get_increments">
+      <property name="value">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="size">
+        <type name="IconSize" c:type="GtkIconSize"/>
+      </property>
+      <property name="adjustment">
+        <type name="Adjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="icons">
+        <type name="GStrv" c:type="GStrv"/>
+      </property>
+      <callback name="value_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
-          </parameter>
-          <parameter name="step">
-            <type name="GLib.gdouble" c:type="gdouble*"/>
+          <parameter name="button">
+            <type name="ScaleButton" c:type="GtkScaleButton*"/>
           </parameter>
-          <parameter name="page">
-            <type name="GLib.gdouble" c:type="gdouble*"/>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_range" c:identifier="gtk_spin_button_set_range">
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="value-changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
-          </parameter>
-          <parameter name="min">
-            <type name="double" c:type="gdouble"/>
-          </parameter>
-          <parameter name="max">
+          <parameter name="object">
             <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_range" c:identifier="gtk_spin_button_get_range">
+      </glib:signal>
+      <glib:signal name="popup">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
-          </parameter>
-          <parameter name="min">
-            <type name="GLib.gdouble" c:type="gdouble*"/>
-          </parameter>
-          <parameter name="max">
-            <type name="GLib.gdouble" c:type="gdouble*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_value" c:identifier="gtk_spin_button_get_value">
+      </glib:signal>
+      <glib:signal name="popdown">
         <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="scale_button_new" c:identifier="gtk_scale_button_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="size">
+          <type name="IconSize" c:type="GtkIconSize"/>
+        </parameter>
+        <parameter name="min">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+        <parameter name="max">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+        <parameter name="step">
           <type name="double" c:type="gdouble"/>
+        </parameter>
+        <parameter name="icons">
+          <type name="GLib.gchar" c:type="gchar**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="Viewport"
+           c:type="GtkViewport"
+           parent="Bin"
+           glib:type-name="GtkViewport"
+           glib:get-type="gtk_viewport_get_type">
+      <method name="get_hadjustment"
+              c:identifier="gtk_viewport_get_hadjustment">
+        <return-value>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="viewport">
+            <type name="Viewport" c:type="GtkViewport*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_value_as_int"
-              c:identifier="gtk_spin_button_get_value_as_int">
+      <method name="get_vadjustment"
+              c:identifier="gtk_viewport_get_vadjustment">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="viewport">
+            <type name="Viewport" c:type="GtkViewport*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_value" c:identifier="gtk_spin_button_set_value">
+      <method name="set_hadjustment"
+              c:identifier="gtk_viewport_set_hadjustment">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="viewport">
+            <type name="Viewport" c:type="GtkViewport*"/>
           </parameter>
-          <parameter name="value">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="adjustment" allow-none="1">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_update_policy"
-              c:identifier="gtk_spin_button_set_update_policy">
+      <method name="set_vadjustment"
+              c:identifier="gtk_viewport_set_vadjustment">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
-          </parameter>
-          <parameter name="policy">
-            <type name="SpinButtonUpdatePolicy"
-                  c:type="GtkSpinButtonUpdatePolicy"/>
+          <parameter name="viewport">
+            <type name="Viewport" c:type="GtkViewport*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_update_policy"
-              c:identifier="gtk_spin_button_get_update_policy">
-        <return-value>
-          <type name="SpinButtonUpdatePolicy"
-                c:type="GtkSpinButtonUpdatePolicy"/>
-        </return-value>
-        <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="adjustment" allow-none="1">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_numeric" c:identifier="gtk_spin_button_set_numeric">
+      <method name="set_shadow_type"
+              c:identifier="gtk_viewport_set_shadow_type">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="viewport">
+            <type name="Viewport" c:type="GtkViewport*"/>
           </parameter>
-          <parameter name="numeric">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="type">
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_numeric" c:identifier="gtk_spin_button_get_numeric">
+      <method name="get_shadow_type"
+              c:identifier="gtk_viewport_get_shadow_type">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="ShadowType" c:type="GtkShadowType"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="viewport">
+            <type name="Viewport" c:type="GtkViewport*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="spin" c:identifier="gtk_spin_button_spin">
+      <property name="hadjustment">
+        <type name="Adjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="vadjustment">
+        <type name="Adjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="shadow-type">
+        <type name="ShadowType" c:type="GtkShadowType"/>
+      </property>
+      <callback name="set_scroll_adjustments">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="viewport">
+            <type name="Viewport" c:type="GtkViewport*"/>
           </parameter>
-          <parameter name="direction">
-            <type name="SpinType" c:type="GtkSpinType"/>
+          <parameter name="hadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
-          <parameter name="increment">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="vadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_wrap" c:identifier="gtk_spin_button_set_wrap">
+      </callback>
+      <glib:signal name="set-scroll-adjustments">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="object">
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
-          <parameter name="wrap">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="p0">
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_wrap" c:identifier="gtk_spin_button_get_wrap">
+      </glib:signal>
+    </class>
+    <function name="viewport_new" c:identifier="gtk_viewport_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="hadjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </parameter>
+        <parameter name="vadjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="ScrolledWindow"
+           c:type="GtkScrolledWindow"
+           parent="Bin"
+           glib:type-name="GtkScrolledWindow"
+           glib:get-type="gtk_scrolled_window_get_type">
+      <method name="set_hadjustment"
+              c:identifier="gtk_scrolled_window_set_hadjustment">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          </parameter>
+          <parameter name="hadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_snap_to_ticks"
-              c:identifier="gtk_spin_button_set_snap_to_ticks">
+      <method name="set_vadjustment"
+              c:identifier="gtk_scrolled_window_set_vadjustment">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
-          <parameter name="snap_to_ticks">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="vadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_snap_to_ticks"
-              c:identifier="gtk_spin_button_get_snap_to_ticks">
+      <method name="get_hadjustment"
+              c:identifier="gtk_scrolled_window_get_hadjustment">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="update" c:identifier="gtk_spin_button_update">
+      <method name="get_vadjustment"
+              c:identifier="gtk_scrolled_window_get_vadjustment">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="adjustment">
-        <type name="Adjustment" c:type="GtkAdjustment"/>
-      </property>
-      <property name="climb-rate">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <property name="digits">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <property name="snap-to-ticks">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="numeric">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="wrap">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="update-policy">
-        <type name="SpinButtonUpdatePolicy"
-              c:type="GtkSpinButtonUpdatePolicy"/>
-      </property>
-      <property name="value">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <callback name="input">
+      <method name="get_hscrollbar"
+              c:identifier="gtk_scrolled_window_get_hscrollbar">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
-          </parameter>
-          <parameter name="new_value">
-            <type name="GLib.gdouble" c:type="gdouble*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="output">
+      </method>
+      <method name="get_vscrollbar"
+              c:identifier="gtk_scrolled_window_get_vscrollbar">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="value_changed">
+      </method>
+      <method name="set_policy" c:identifier="gtk_scrolled_window_set_policy">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="change_value">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="hscrollbar_policy">
+            <type name="PolicyType" c:type="GtkPolicyType"/>
           </parameter>
-          <parameter name="scroll">
-            <type name="ScrollType" c:type="GtkScrollType"/>
+          <parameter name="vscrollbar_policy">
+            <type name="PolicyType" c:type="GtkPolicyType"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="wrapped">
+      </method>
+      <method name="get_policy" c:identifier="gtk_scrolled_window_get_policy">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="value-changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="change-value">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="ScrollType" c:type="GtkScrollType"/>
+          <parameter name="hscrollbar_policy">
+            <type name="PolicyType" c:type="GtkPolicyType*"/>
           </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="input">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="vscrollbar_policy">
+            <type name="PolicyType" c:type="GtkPolicyType*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="output">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="wrapped">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="spin_button_new" c:identifier="gtk_spin_button_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="adjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
-        </parameter>
-        <parameter name="climb_rate">
-          <type name="double" c:type="gdouble"/>
-        </parameter>
-        <parameter name="digits">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="spin_button_new_with_range"
-              c:identifier="gtk_spin_button_new_with_range">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="min">
-          <type name="double" c:type="gdouble"/>
-        </parameter>
-        <parameter name="max">
-          <type name="double" c:type="gdouble"/>
-        </parameter>
-        <parameter name="step">
-          <type name="double" c:type="gdouble"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="Statusbar"
-           c:type="GtkStatusbar"
-           parent="HBox"
-           glib:type-name="GtkStatusbar"
-           glib:get-type="gtk_statusbar_get_type">
-      <method name="get_context_id"
-              c:identifier="gtk_statusbar_get_context_id">
+      </method>
+      <method name="set_placement"
+              c:identifier="gtk_scrolled_window_set_placement">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="statusbar">
-            <type name="Statusbar" c:type="GtkStatusbar*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
-          <parameter name="context_description">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="window_placement">
+            <type name="CornerType" c:type="GtkCornerType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="push" c:identifier="gtk_statusbar_push">
+      <method name="unset_placement"
+              c:identifier="gtk_scrolled_window_unset_placement">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="statusbar">
-            <type name="Statusbar" c:type="GtkStatusbar*"/>
-          </parameter>
-          <parameter name="context_id">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="pop" c:identifier="gtk_statusbar_pop">
+      <method name="get_placement"
+              c:identifier="gtk_scrolled_window_get_placement">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="CornerType" c:type="GtkCornerType"/>
         </return-value>
         <parameters>
-          <parameter name="statusbar">
-            <type name="Statusbar" c:type="GtkStatusbar*"/>
-          </parameter>
-          <parameter name="context_id">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove" c:identifier="gtk_statusbar_remove">
+      <method name="set_shadow_type"
+              c:identifier="gtk_scrolled_window_set_shadow_type">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="statusbar">
-            <type name="Statusbar" c:type="GtkStatusbar*"/>
-          </parameter>
-          <parameter name="context_id">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
-          <parameter name="message_id">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="type">
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_has_resize_grip"
-              c:identifier="gtk_statusbar_set_has_resize_grip">
+      <method name="get_shadow_type"
+              c:identifier="gtk_scrolled_window_get_shadow_type">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="ShadowType" c:type="GtkShadowType"/>
         </return-value>
         <parameters>
-          <parameter name="statusbar">
-            <type name="Statusbar" c:type="GtkStatusbar*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_has_resize_grip"
-              c:identifier="gtk_statusbar_get_has_resize_grip">
+      <method name="add_with_viewport"
+              c:identifier="gtk_scrolled_window_add_with_viewport">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="statusbar">
-            <type name="Statusbar" c:type="GtkStatusbar*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="has-resize-grip">
+      <property name="hadjustment">
+        <type name="Adjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="vadjustment">
+        <type name="Adjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="hscrollbar-policy">
+        <type name="PolicyType" c:type="GtkPolicyType"/>
+      </property>
+      <property name="vscrollbar-policy">
+        <type name="PolicyType" c:type="GtkPolicyType"/>
+      </property>
+      <property name="window-placement">
+        <type name="CornerType" c:type="GtkCornerType"/>
+      </property>
+      <property name="window-placement-set">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <field name="reserved">
-        <type name="any" c:type="gpointer"/>
+      <property name="shadow-type">
+        <type name="ShadowType" c:type="GtkShadowType"/>
+      </property>
+      <field name="scrollbar_spacing">
+        <type name="int32" c:type="gint"/>
       </field>
-      <callback name="text_pushed">
+      <callback name="scroll_child">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="statusbar">
-            <type name="Statusbar" c:type="GtkStatusbar*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
-          <parameter name="context_id">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="scroll">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="horizontal">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="text_popped">
+      <callback name="move_focus_out">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="statusbar">
-            <type name="Statusbar" c:type="GtkStatusbar*"/>
-          </parameter>
-          <parameter name="context_id">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="direction">
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
       </callback>
@@ -58591,873 +56159,669 @@
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="text-pushed">
+      <glib:signal name="move-focus-out">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="string" c:type="gchararray"/>
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="text-popped">
+      <glib:signal name="scroll-child">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="uint32" c:type="guint"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
           <parameter name="p0">
-            <type name="string" c:type="gchararray"/>
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </glib:signal>
     </class>
-    <function name="statusbar_new" c:identifier="gtk_statusbar_new">
+    <function name="scrolled_window_new"
+              c:identifier="gtk_scrolled_window_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
+      <parameters>
+        <parameter name="hadjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </parameter>
+        <parameter name="vadjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </parameter>
+      </parameters>
     </function>
-    <record name="GtkStatusIconPrivate" c:type="GtkStatusIconPrivate"/>
-    <class name="StatusIcon"
-           c:type="GtkStatusIcon"
-           parent="GObject.Object"
-           glib:type-name="GtkStatusIcon"
-           glib:get-type="gtk_status_icon_get_type">
-      <constructor name="new" c:identifier="gtk_status_icon_new">
-        <return-value>
-          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
-        </return-value>
-      </constructor>
-      <constructor name="new_from_pixbuf"
-                   c:identifier="gtk_status_icon_new_from_pixbuf">
+    <function name="scrolled_window_get_scrollbar_spacing"
+              c:identifier="_gtk_scrolled_window_get_scrollbar_spacing">
+      <return-value>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="scrolled_window">
+          <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="SeparatorMenuItem"
+           c:type="GtkSeparatorMenuItem"
+           parent="MenuItem"
+           glib:type-name="GtkSeparatorMenuItem"
+           glib:get-type="gtk_separator_menu_item_get_type">
+    </class>
+    <function name="separator_menu_item_new"
+              c:identifier="gtk_separator_menu_item_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <record name="GtkSeparatorToolItemPrivate"
+            c:type="GtkSeparatorToolItemPrivate"/>
+    <class name="SeparatorToolItem"
+           c:type="GtkSeparatorToolItem"
+           parent="ToolItem"
+           glib:type-name="GtkSeparatorToolItem"
+           glib:get-type="gtk_separator_tool_item_get_type">
+      <method name="get_draw" c:identifier="gtk_separator_tool_item_get_draw">
         <return-value>
-          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="item">
+            <type name="SeparatorToolItem" c:type="GtkSeparatorToolItem*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="new_from_file"
-                   c:identifier="gtk_status_icon_new_from_file">
+      </method>
+      <method name="set_draw" c:identifier="gtk_separator_tool_item_set_draw">
         <return-value>
-          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filename">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="item">
+            <type name="SeparatorToolItem" c:type="GtkSeparatorToolItem*"/>
+          </parameter>
+          <parameter name="draw">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="new_from_stock"
-                   c:identifier="gtk_status_icon_new_from_stock">
+      </method>
+      <property name="draw">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="separator_tool_item_new"
+              c:identifier="gtk_separator_tool_item_new">
+      <return-value>
+        <type name="ToolItem" c:type="GtkToolItem*"/>
+      </return-value>
+    </function>
+    <class name="SizeGroup"
+           c:type="GtkSizeGroup"
+           parent="GObject.Object"
+           glib:type-name="GtkSizeGroup"
+           glib:get-type="gtk_size_group_get_type">
+      <constructor name="new" c:identifier="gtk_size_group_new">
+        <return-value>
+          <type name="SizeGroup" c:type="GtkSizeGroup*"/>
         </return-value>
         <parameters>
-          <parameter name="stock_id">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="mode">
+            <type name="SizeGroupMode" c:type="GtkSizeGroupMode"/>
           </parameter>
         </parameters>
       </constructor>
-      <constructor name="new_from_icon_name"
-                   c:identifier="gtk_status_icon_new_from_icon_name">
+      <method name="set_mode" c:identifier="gtk_size_group_set_mode">
         <return-value>
-          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="size_group">
+            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
+          </parameter>
+          <parameter name="mode">
+            <type name="SizeGroupMode" c:type="GtkSizeGroupMode"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="set_from_pixbuf"
-              c:identifier="gtk_status_icon_set_from_pixbuf">
+      </method>
+      <method name="get_mode" c:identifier="gtk_size_group_get_mode">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="SizeGroupMode" c:type="GtkSizeGroupMode"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
-          </parameter>
-          <parameter name="pixbuf" allow-none="1">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="size_group">
+            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_from_file"
-              c:identifier="gtk_status_icon_set_from_file">
+      <method name="set_ignore_hidden"
+              c:identifier="gtk_size_group_set_ignore_hidden">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="size_group">
+            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
           </parameter>
-          <parameter name="filename">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="ignore_hidden">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_from_stock"
-              c:identifier="gtk_status_icon_set_from_stock">
+      <method name="get_ignore_hidden"
+              c:identifier="gtk_size_group_get_ignore_hidden">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
-          </parameter>
-          <parameter name="stock_id">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="size_group">
+            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_from_icon_name"
-              c:identifier="gtk_status_icon_set_from_icon_name">
+      <method name="add_widget" c:identifier="gtk_size_group_add_widget">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="size_group">
+            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
           </parameter>
-          <parameter name="icon_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_storage_type"
-              c:identifier="gtk_status_icon_get_storage_type">
+      <method name="remove_widget" c:identifier="gtk_size_group_remove_widget">
         <return-value>
-          <type name="ImageType" c:type="GtkImageType"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="size_group">
+            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_pixbuf" c:identifier="gtk_status_icon_get_pixbuf">
+      <method name="get_widgets" c:identifier="gtk_size_group_get_widgets">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="size_group">
+            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_stock" c:identifier="gtk_status_icon_get_stock">
+      <property name="mode">
+        <type name="SizeGroupMode" c:type="GtkSizeGroupMode"/>
+      </property>
+      <property name="ignore-hidden">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="size_group_get_child_requisition"
+              c:identifier="_gtk_size_group_get_child_requisition">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="requisition">
+          <type name="Requisition" c:type="GtkRequisition*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="size_group_compute_requisition"
+              c:identifier="_gtk_size_group_compute_requisition">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="requisition">
+          <type name="Requisition" c:type="GtkRequisition*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="size_group_queue_resize"
+              c:identifier="_gtk_size_group_queue_resize">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="SpinButton"
+           c:type="GtkSpinButton"
+           parent="Entry"
+           glib:type-name="GtkSpinButton"
+           glib:get-type="gtk_spin_button_get_type">
+      <method name="configure" c:identifier="gtk_spin_button_configure">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+          <parameter name="adjustment" allow-none="1">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+          <parameter name="climb_rate">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="digits">
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_icon_name"
-              c:identifier="gtk_status_icon_get_icon_name">
+      <method name="set_adjustment"
+              c:identifier="gtk_spin_button_set_adjustment">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_size" c:identifier="gtk_status_icon_get_size">
+      <method name="get_adjustment"
+              c:identifier="gtk_spin_button_get_adjustment">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_screen" c:identifier="gtk_status_icon_set_screen">
+      <method name="set_digits" c:identifier="gtk_spin_button_set_digits">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <parameter name="digits">
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_screen" c:identifier="gtk_status_icon_get_screen">
+      <method name="get_digits" c:identifier="gtk_spin_button_get_digits">
         <return-value>
-          <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tooltip" c:identifier="gtk_status_icon_set_tooltip">
+      <method name="set_increments"
+              c:identifier="gtk_spin_button_set_increments">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="tooltip_text" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="step">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="page">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_visible" c:identifier="gtk_status_icon_set_visible">
+      <method name="get_increments"
+              c:identifier="gtk_spin_button_get_increments">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="visible">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="step">
+            <type name="GLib.gdouble" c:type="gdouble*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_visible" c:identifier="gtk_status_icon_get_visible">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="page">
+            <type name="GLib.gdouble" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_blinking" c:identifier="gtk_status_icon_set_blinking">
+      <method name="set_range" c:identifier="gtk_spin_button_set_range">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="blinking">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="min">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="max">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_blinking" c:identifier="gtk_status_icon_get_blinking">
+      <method name="get_range" c:identifier="gtk_spin_button_get_range">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+          <parameter name="min">
+            <type name="GLib.gdouble" c:type="gdouble*"/>
+          </parameter>
+          <parameter name="max">
+            <type name="GLib.gdouble" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="is_embedded" c:identifier="gtk_status_icon_is_embedded">
+      <method name="get_value" c:identifier="gtk_spin_button_get_value">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_geometry" c:identifier="gtk_status_icon_get_geometry">
+      <method name="get_value_as_int"
+              c:identifier="gtk_spin_button_get_value_as_int">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
-          </parameter>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen**"/>
-          </parameter>
-          <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="orientation">
-            <type name="Orientation" c:type="GtkOrientation*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="pixbuf">
-        <type name="GdkPixbuf" c:type="GdkPixbuf"/>
-      </property>
-      <property name="file">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="stock">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="icon-name">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="storage-type">
-        <type name="ImageType" c:type="GtkImageType"/>
-      </property>
-      <property name="size">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="screen">
-        <type name="Gdk.Screen" c:type="GdkScreen"/>
-      </property>
-      <property name="visible">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="orientation">
-        <type name="Orientation" c:type="GtkOrientation"/>
-      </property>
-      <property name="embedded">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="blinking">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="activate">
+      <method name="set_value" c:identifier="gtk_spin_button_set_value">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="popup_menu">
+      </method>
+      <method name="set_update_policy"
+              c:identifier="gtk_spin_button_set_update_policy">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
-          </parameter>
-          <parameter name="button">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="activate_time">
-            <type name="uint32" c:type="guint32"/>
+          <parameter name="policy">
+            <type name="SpinButtonUpdatePolicy"
+                  c:type="GtkSpinButtonUpdatePolicy"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="size_changed">
+      </method>
+      <method name="get_update_policy"
+              c:identifier="gtk_spin_button_get_update_policy">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="SpinButtonUpdatePolicy"
+                c:type="GtkSpinButtonUpdatePolicy"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
-          </parameter>
-          <parameter name="size">
-            <type name="int32" c:type="gint"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
-      </callback>
-      <field name="__gtk_reserved1">
-        <type name="any" c:type="void*"/>
-      </field>
-      <field name="__gtk_reserved2">
-        <type name="any" c:type="void*"/>
-      </field>
-      <field name="__gtk_reserved3">
-        <type name="any" c:type="void*"/>
-      </field>
-      <field name="__gtk_reserved4">
-        <type name="any" c:type="void*"/>
-      </field>
-      <field name="__gtk_reserved5">
-        <type name="any" c:type="void*"/>
-      </field>
-      <field name="__gtk_reserved6">
-        <type name="any" c:type="void*"/>
-      </field>
-      <glib:signal name="popup-menu">
+      </method>
+      <method name="set_numeric" c:identifier="gtk_spin_button_set_numeric">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="numeric">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="activate">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="size-changed">
+      </method>
+      <method name="get_numeric" c:identifier="gtk_spin_button_get_numeric">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="int32" c:type="gint"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <function name="status_icon_position_menu"
-              c:identifier="gtk_status_icon_position_menu">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="menu">
-          <type name="Menu" c:type="GtkMenu*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="GLib.gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="y">
-          <type name="GLib.gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="push_in">
-          <type name="GLib.gboolean" c:type="gboolean*"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkStockItem" c:type="GtkStockItem">
-      <field name="stock_id">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="label">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="modifier">
-        <type name="GdkModifierType" c:type="GdkModifierType"/>
-      </field>
-      <field name="keyval">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="translation_domain">
-        <type name="string" c:type="gchar*"/>
-      </field>
-    </record>
-    <function name="stock_add" c:identifier="gtk_stock_add">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="items">
-          <type name="GtkStockItem" c:type="GtkStockItem*"/>
-        </parameter>
-        <parameter name="n_items">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="stock_add_static" c:identifier="gtk_stock_add_static">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="items">
-          <type name="GtkStockItem" c:type="GtkStockItem*"/>
-        </parameter>
-        <parameter name="n_items">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="stock_lookup" c:identifier="gtk_stock_lookup">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="stock_id">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="item">
-          <type name="GtkStockItem" c:type="GtkStockItem*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="stock_list_ids" c:identifier="gtk_stock_list_ids">
-      <return-value>
-        <type name="GLib.GSList" c:type="GSList*"/>
-      </return-value>
-    </function>
-    <function name="stock_item_copy" c:identifier="gtk_stock_item_copy">
-      <return-value>
-        <type name="GtkStockItem" c:type="GtkStockItem*"/>
-      </return-value>
-      <parameters>
-        <parameter name="item">
-          <type name="GtkStockItem" c:type="GtkStockItem*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="stock_item_free" c:identifier="gtk_stock_item_free">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="item">
-          <type name="GtkStockItem" c:type="GtkStockItem*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="stock_set_translate_func"
-              c:identifier="gtk_stock_set_translate_func">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="domain">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GtkTranslateFunc" c:type="GtkTranslateFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="notify">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkTableChild" c:type="GtkTableChild">
-      <field name="widget">
-        <type name="Widget" c:type="GtkWidget*"/>
-      </field>
-      <field name="left_attach">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="right_attach">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="top_attach">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="bottom_attach">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="xpadding">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="ypadding">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="xexpand">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="yexpand">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="xshrink">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="yshrink">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="xfill">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="yfill">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GtkTableRowCol" c:type="GtkTableRowCol">
-      <field name="requisition">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="allocation">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="spacing">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="need_expand">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="need_shrink">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="expand">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="shrink">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="empty">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <class name="Table"
-           c:type="GtkTable"
-           parent="Container"
-           glib:type-name="GtkTable"
-           glib:get-type="gtk_table_get_type">
-      <method name="resize" c:identifier="gtk_table_resize">
+      </method>
+      <method name="spin" c:identifier="gtk_spin_button_spin">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="rows">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="direction">
+            <type name="SpinType" c:type="GtkSpinType"/>
           </parameter>
-          <parameter name="columns">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="increment">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="attach" c:identifier="gtk_table_attach">
+      <method name="set_wrap" c:identifier="gtk_spin_button_set_wrap">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="left_attach">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="right_attach">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="top_attach">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="bottom_attach">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="xoptions">
-            <type name="AttachOptions" c:type="GtkAttachOptions"/>
-          </parameter>
-          <parameter name="yoptions">
-            <type name="AttachOptions" c:type="GtkAttachOptions"/>
-          </parameter>
-          <parameter name="xpadding">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="ypadding">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="wrap">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="attach_defaults" c:identifier="gtk_table_attach_defaults">
+      <method name="get_wrap" c:identifier="gtk_spin_button_get_wrap">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="left_attach">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="right_attach">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="top_attach">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="bottom_attach">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_row_spacing" c:identifier="gtk_table_set_row_spacing">
+      <method name="set_snap_to_ticks"
+              c:identifier="gtk_spin_button_set_snap_to_ticks">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="spacing">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="snap_to_ticks">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_row_spacing" c:identifier="gtk_table_get_row_spacing">
+      <method name="get_snap_to_ticks"
+              c:identifier="gtk_spin_button_get_snap_to_ticks">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_col_spacing" c:identifier="gtk_table_set_col_spacing">
+      <method name="update" c:identifier="gtk_spin_button_update">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="spacing">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_col_spacing" c:identifier="gtk_table_get_col_spacing">
-        <return-value>
-          <type name="uint32" c:type="guint"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_row_spacings"
-              c:identifier="gtk_table_set_row_spacings">
+      <property name="adjustment">
+        <type name="Adjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="climb-rate">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="digits">
+        <type name="uint32" c:type="guint"/>
+      </property>
+      <property name="snap-to-ticks">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="numeric">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="wrap">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="update-policy">
+        <type name="SpinButtonUpdatePolicy"
+              c:type="GtkSpinButtonUpdatePolicy"/>
+      </property>
+      <property name="value">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <callback name="input">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="spacing">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="new_value">
+            <type name="GLib.gdouble" c:type="gdouble*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_default_row_spacing"
-              c:identifier="gtk_table_get_default_row_spacing">
+      </callback>
+      <callback name="output">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_col_spacings"
-              c:identifier="gtk_table_set_col_spacings">
+      </callback>
+      <callback name="value_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
-          </parameter>
-          <parameter name="spacing">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_default_col_spacing"
-              c:identifier="gtk_table_get_default_col_spacing">
-        <return-value>
-          <type name="uint32" c:type="guint"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_homogeneous" c:identifier="gtk_table_set_homogeneous">
+      </callback>
+      <callback name="change_value">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="homogeneous">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="scroll">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_homogeneous" c:identifier="gtk_table_get_homogeneous">
+      </callback>
+      <callback name="wrapped">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="n-rows">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <property name="n-columns">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <property name="column-spacing">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <property name="row-spacing">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <property name="homogeneous">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-    </class>
-    <function name="table_new" c:identifier="gtk_table_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="rows">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="columns">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="homogeneous">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="TearoffMenuItem"
-           c:type="GtkTearoffMenuItem"
-           parent="MenuItem"
-           glib:type-name="GtkTearoffMenuItem"
-           glib:get-type="gtk_tearoff_menu_item_get_type">
+      </callback>
       <callback name="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
@@ -59473,133 +56837,199 @@
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <glib:signal name="value-changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
+      </glib:signal>
+      <glib:signal name="change-value">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="ScrollType" c:type="GtkScrollType"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="input">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="output">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="wrapped">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
     </class>
-    <function name="tearoff_menu_item_new"
-              c:identifier="gtk_tearoff_menu_item_new">
+    <function name="spin_button_new" c:identifier="gtk_spin_button_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
+      <parameters>
+        <parameter name="adjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </parameter>
+        <parameter name="climb_rate">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+        <parameter name="digits">
+          <type name="uint32" c:type="guint"/>
+        </parameter>
+      </parameters>
     </function>
-    <callback name="GtkTextTagTableForeach">
+    <function name="spin_button_new_with_range"
+              c:identifier="gtk_spin_button_new_with_range">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="tag">
-          <type name="TextTag" c:type="GtkTextTag*"/>
+        <parameter name="min">
+          <type name="double" c:type="gdouble"/>
         </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="max">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+        <parameter name="step">
+          <type name="double" c:type="gdouble"/>
         </parameter>
       </parameters>
-    </callback>
-    <class name="TextTagTable"
-           c:type="GtkTextTagTable"
-           parent="GObject.Object"
-           glib:type-name="GtkTextTagTable"
-           glib:get-type="gtk_text_tag_table_get_type">
-      <constructor name="new" c:identifier="gtk_text_tag_table_new">
+    </function>
+    <class name="Statusbar"
+           c:type="GtkStatusbar"
+           parent="HBox"
+           glib:type-name="GtkStatusbar"
+           glib:get-type="gtk_statusbar_get_type">
+      <method name="get_context_id"
+              c:identifier="gtk_statusbar_get_context_id">
         <return-value>
-          <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
-      </constructor>
-      <method name="add" c:identifier="gtk_text_tag_table_add">
+        <parameters>
+          <parameter name="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
+          </parameter>
+          <parameter name="context_description">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="push" c:identifier="gtk_statusbar_push">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <parameter name="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
           </parameter>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
+          <parameter name="context_id">
+            <type name="uint32" c:type="guint"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove" c:identifier="gtk_text_tag_table_remove">
+      <method name="pop" c:identifier="gtk_statusbar_pop">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <parameter name="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
           </parameter>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
+          <parameter name="context_id">
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="foreach" c:identifier="gtk_text_tag_table_foreach">
+      <method name="remove" c:identifier="gtk_statusbar_remove">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <parameter name="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
           </parameter>
-          <parameter name="func">
-            <type name="GtkTextTagTableForeach"
-                  c:type="GtkTextTagTableForeach"/>
+          <parameter name="context_id">
+            <type name="uint32" c:type="guint"/>
           </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="message_id">
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_size" c:identifier="gtk_text_tag_table_get_size">
+      <method name="set_has_resize_grip"
+              c:identifier="gtk_statusbar_set_has_resize_grip">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <parameter name="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
+          </parameter>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <callback name="tag_changed">
+      <method name="get_has_resize_grip"
+              c:identifier="gtk_statusbar_get_has_resize_grip">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
-          </parameter>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
-          </parameter>
-          <parameter name="size_changed">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="tag_added">
+      </method>
+      <property name="has-resize-grip">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <field name="reserved">
+        <type name="any" c:type="gpointer"/>
+      </field>
+      <callback name="text_pushed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <parameter name="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
           </parameter>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
+          <parameter name="context_id">
+            <type name="uint32" c:type="guint"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="tag_removed">
+      <callback name="text_popped">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <parameter name="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
           </parameter>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
+          <parameter name="context_id">
+            <type name="uint32" c:type="guint"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
@@ -59623,974 +57053,1230 @@
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="tag-changed">
+      <glib:signal name="text-pushed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="TextTag" c:type="GtkTextTag"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="p0">
-            <type name="boolean" c:type="gboolean"/>
+            <type name="string" c:type="gchararray"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="tag-added">
+      <glib:signal name="text-popped">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="TextTag" c:type="GtkTextTag"/>
+            <type name="uint32" c:type="guint"/>
           </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="tag-removed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="TextTag" c:type="GtkTextTag"/>
+          <parameter name="p0">
+            <type name="string" c:type="gchararray"/>
           </parameter>
         </parameters>
       </glib:signal>
     </class>
-    <function name="text_tag_table_add_buffer"
-              c:identifier="_gtk_text_tag_table_add_buffer">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="TextTagTable" c:type="GtkTextTagTable*"/>
-        </parameter>
-        <parameter name="buffer">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_tag_table_remove_buffer"
-              c:identifier="_gtk_text_tag_table_remove_buffer">
+    <function name="statusbar_new" c:identifier="gtk_statusbar_new">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="table">
-          <type name="TextTagTable" c:type="GtkTextTagTable*"/>
-        </parameter>
-        <parameter name="buffer">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
     </function>
-    <class name="TextMark"
-           c:type="GtkTextMark"
+    <record name="GtkStatusIconPrivate" c:type="GtkStatusIconPrivate"/>
+    <class name="StatusIcon"
+           c:type="GtkStatusIcon"
            parent="GObject.Object"
-           glib:type-name="GtkTextMark"
-           glib:get-type="gtk_text_mark_get_type">
-      <constructor name="new" c:identifier="gtk_text_mark_new">
+           glib:type-name="GtkStatusIcon"
+           glib:get-type="gtk_status_icon_get_type">
+      <constructor name="new" c:identifier="gtk_status_icon_new">
         <return-value>
-          <type name="TextMark" c:type="GtkTextMark*"/>
+          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+        </return-value>
+      </constructor>
+      <constructor name="new_from_pixbuf"
+                   c:identifier="gtk_status_icon_new_from_pixbuf">
+        <return-value>
+          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
         </return-value>
         <parameters>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="left_gravity">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="pixbuf">
+            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </constructor>
-      <method name="set_visible" c:identifier="gtk_text_mark_set_visible">
+      <constructor name="new_from_file"
+                   c:identifier="gtk_status_icon_new_from_file">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
         </return-value>
         <parameters>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="filename">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_visible" c:identifier="gtk_text_mark_get_visible">
+      </constructor>
+      <constructor name="new_from_stock"
+                   c:identifier="gtk_status_icon_new_from_stock">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
         </return-value>
         <parameters>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_name" c:identifier="gtk_text_mark_get_name">
+      </constructor>
+      <constructor name="new_from_icon_name"
+                   c:identifier="gtk_status_icon_new_from_icon_name">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
         </return-value>
         <parameters>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="icon_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_deleted" c:identifier="gtk_text_mark_get_deleted">
+      </constructor>
+      <method name="set_from_pixbuf"
+              c:identifier="gtk_status_icon_set_from_pixbuf">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          </parameter>
+          <parameter name="pixbuf" allow-none="1">
+            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_buffer" c:identifier="gtk_text_mark_get_buffer">
+      <method name="set_from_file"
+              c:identifier="gtk_status_icon_set_from_file">
         <return-value>
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          </parameter>
+          <parameter name="filename">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_left_gravity"
-              c:identifier="gtk_text_mark_get_left_gravity">
+      <method name="set_from_stock"
+              c:identifier="gtk_status_icon_set_from_stock">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          </parameter>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="name">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="left-gravity">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="_gtk_reserved1">
+      <method name="set_from_icon_name"
+              c:identifier="gtk_status_icon_set_from_icon_name">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+        <parameters>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          </parameter>
+          <parameter name="icon_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_storage_type"
+              c:identifier="gtk_status_icon_get_storage_type">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="ImageType" c:type="GtkImageType"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_pixbuf" c:identifier="gtk_status_icon_get_pixbuf">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_stock" c:identifier="gtk_status_icon_get_stock">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
-      </callback>
-    </class>
-    <record name="GtkTextBTree" c:type="GtkTextBTree"/>
-    <record name="GtkTextLogAttrCache" c:type="GtkTextLogAttrCache"/>
-    <class name="TextBuffer"
-           c:type="GtkTextBuffer"
-           parent="GObject.Object"
-           glib:type-name="GtkTextBuffer"
-           glib:get-type="gtk_text_buffer_get_type">
-      <constructor name="new" c:identifier="gtk_text_buffer_new">
+        <parameters>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_icon_name"
+              c:identifier="gtk_status_icon_get_icon_name">
         <return-value>
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="get_line_count"
-              c:identifier="gtk_text_buffer_get_line_count">
+      </method>
+      <method name="get_size" c:identifier="gtk_status_icon_get_size">
         <return-value>
           <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_char_count"
-              c:identifier="gtk_text_buffer_get_char_count">
+      <method name="set_screen" c:identifier="gtk_status_icon_set_screen">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          </parameter>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_tag_table"
-              c:identifier="gtk_text_buffer_get_tag_table">
+      <method name="get_screen" c:identifier="gtk_status_icon_get_screen">
         <return-value>
-          <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <type name="Gdk.Screen" c:type="GdkScreen*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_text" c:identifier="gtk_text_buffer_set_text">
+      <method name="set_tooltip" c:identifier="gtk_status_icon_set_tooltip">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
-          <parameter name="text">
+          <parameter name="tooltip_text" allow-none="1">
             <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="len">
-            <type name="int32" c:type="gint"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="insert" c:identifier="gtk_text_buffer_insert">
+      <method name="set_visible" c:identifier="gtk_status_icon_set_visible">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
-          <parameter name="len">
-            <type name="int32" c:type="gint"/>
+          <parameter name="visible">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_at_cursor"
-              c:identifier="gtk_text_buffer_insert_at_cursor">
+      <method name="get_visible" c:identifier="gtk_status_icon_get_visible">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="len">
-            <type name="int32" c:type="gint"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_interactive"
-              c:identifier="gtk_text_buffer_insert_interactive">
+      <method name="set_blinking" c:identifier="gtk_status_icon_set_blinking">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="len">
-            <type name="int32" c:type="gint"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
-          <parameter name="default_editable">
+          <parameter name="blinking">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_interactive_at_cursor"
-              c:identifier="gtk_text_buffer_insert_interactive_at_cursor">
+      <method name="get_blinking" c:identifier="gtk_status_icon_get_blinking">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="len">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="default_editable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_range" c:identifier="gtk_text_buffer_insert_range">
+      <method name="is_embedded" c:identifier="gtk_status_icon_is_embedded">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_range_interactive"
-              c:identifier="gtk_text_buffer_insert_range_interactive">
+      <method name="get_geometry" c:identifier="gtk_status_icon_get_geometry">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen**"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="area">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
           </parameter>
-          <parameter name="default_editable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="orientation">
+            <type name="Orientation" c:type="GtkOrientation*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_with_tags"
-              c:identifier="gtk_text_buffer_insert_with_tags">
+      <property name="pixbuf">
+        <type name="GdkPixbuf" c:type="GdkPixbuf"/>
+      </property>
+      <property name="file">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="stock">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="icon-name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="storage-type">
+        <type name="ImageType" c:type="GtkImageType"/>
+      </property>
+      <property name="size">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="screen">
+        <type name="Gdk.Screen" c:type="GdkScreen"/>
+      </property>
+      <property name="visible">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="orientation">
+        <type name="Orientation" c:type="GtkOrientation"/>
+      </property>
+      <property name="embedded">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="blinking">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="activate">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="len">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="first_tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="insert_with_tags_by_name"
-              c:identifier="gtk_text_buffer_insert_with_tags_by_name">
+      </callback>
+      <callback name="popup_menu">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="button">
+            <type name="uint32" c:type="guint"/>
           </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="activate_time">
+            <type name="uint32" c:type="guint32"/>
           </parameter>
-          <parameter name="len">
-            <type name="int32" c:type="gint"/>
+        </parameters>
+      </callback>
+      <callback name="size_changed">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
-          <parameter name="first_tag_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="size">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="delete" c:identifier="gtk_text_buffer_delete">
+      </callback>
+      <field name="__gtk_reserved1">
+        <type name="any" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved2">
+        <type name="any" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved3">
+        <type name="any" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved4">
+        <type name="any" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved5">
+        <type name="any" c:type="void*"/>
+      </field>
+      <field name="__gtk_reserved6">
+        <type name="any" c:type="void*"/>
+      </field>
+      <glib:signal name="popup-menu">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="object">
+            <type name="uint32" c:type="guint"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="p0">
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="delete_interactive"
-              c:identifier="gtk_text_buffer_delete_interactive">
+      </glib:signal>
+      <glib:signal name="activate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="size-changed">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="start_iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end_iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="default_editable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="object">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="backspace" c:identifier="gtk_text_buffer_backspace">
+      </glib:signal>
+    </class>
+    <function name="status_icon_position_menu"
+              c:identifier="gtk_status_icon_position_menu">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="menu">
+          <type name="Menu" c:type="GtkMenu*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="GLib.gint" c:type="gint*"/>
+        </parameter>
+        <parameter name="y">
+          <type name="GLib.gint" c:type="gint*"/>
+        </parameter>
+        <parameter name="push_in">
+          <type name="GLib.gboolean" c:type="gboolean*"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkStockItem" c:type="GtkStockItem">
+      <field name="stock_id">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="label">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="modifier">
+        <type name="GdkModifierType" c:type="GdkModifierType"/>
+      </field>
+      <field name="keyval">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="translation_domain">
+        <type name="string" c:type="gchar*"/>
+      </field>
+    </record>
+    <function name="stock_add" c:identifier="gtk_stock_add">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="items">
+          <type name="GtkStockItem" c:type="GtkStockItem*"/>
+        </parameter>
+        <parameter name="n_items">
+          <type name="uint32" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="stock_add_static" c:identifier="gtk_stock_add_static">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="items">
+          <type name="GtkStockItem" c:type="GtkStockItem*"/>
+        </parameter>
+        <parameter name="n_items">
+          <type name="uint32" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="stock_lookup" c:identifier="gtk_stock_lookup">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="item">
+          <type name="GtkStockItem" c:type="GtkStockItem*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="stock_list_ids" c:identifier="gtk_stock_list_ids">
+      <return-value>
+        <type name="GLib.GSList" c:type="GSList*"/>
+      </return-value>
+    </function>
+    <function name="stock_item_copy" c:identifier="gtk_stock_item_copy">
+      <return-value>
+        <type name="GtkStockItem" c:type="GtkStockItem*"/>
+      </return-value>
+      <parameters>
+        <parameter name="item">
+          <type name="GtkStockItem" c:type="GtkStockItem*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="stock_item_free" c:identifier="gtk_stock_item_free">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="item">
+          <type name="GtkStockItem" c:type="GtkStockItem*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="stock_set_translate_func"
+              c:identifier="gtk_stock_set_translate_func">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="domain">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="func">
+          <type name="GtkTranslateFunc" c:type="GtkTranslateFunc"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="notify">
+          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkTableChild" c:type="GtkTableChild">
+      <field name="widget">
+        <type name="Widget" c:type="GtkWidget*"/>
+      </field>
+      <field name="left_attach">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="right_attach">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="top_attach">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="bottom_attach">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="xpadding">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="ypadding">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="xexpand">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="yexpand">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="xshrink">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="yshrink">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="xfill">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="yfill">
+        <type name="uint32" c:type="guint"/>
+      </field>
+    </record>
+    <record name="GtkTableRowCol" c:type="GtkTableRowCol">
+      <field name="requisition">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="allocation">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="spacing">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="need_expand">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="need_shrink">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="expand">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="shrink">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="empty">
+        <type name="uint32" c:type="guint"/>
+      </field>
+    </record>
+    <class name="Table"
+           c:type="GtkTable"
+           parent="Container"
+           glib:type-name="GtkTable"
+           glib:get-type="gtk_table_get_type">
+      <method name="resize" c:identifier="gtk_table_resize">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
-          <parameter name="interactive">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="rows">
+            <type name="uint32" c:type="guint"/>
           </parameter>
-          <parameter name="default_editable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="columns">
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_text" c:identifier="gtk_text_buffer_get_text">
+      <method name="attach" c:identifier="gtk_table_attach">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="left_attach">
+            <type name="uint32" c:type="guint"/>
           </parameter>
-          <parameter name="include_hidden_chars">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="right_attach">
+            <type name="uint32" c:type="guint"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_slice" c:identifier="gtk_text_buffer_get_slice">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="top_attach">
+            <type name="uint32" c:type="guint"/>
           </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="bottom_attach">
+            <type name="uint32" c:type="guint"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="xoptions">
+            <type name="AttachOptions" c:type="GtkAttachOptions"/>
           </parameter>
-          <parameter name="include_hidden_chars">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="yoptions">
+            <type name="AttachOptions" c:type="GtkAttachOptions"/>
+          </parameter>
+          <parameter name="xpadding">
+            <type name="uint32" c:type="guint"/>
+          </parameter>
+          <parameter name="ypadding">
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_pixbuf"
-              c:identifier="gtk_text_buffer_insert_pixbuf">
+      <method name="attach_defaults" c:identifier="gtk_table_attach_defaults">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="left_attach">
+            <type name="uint32" c:type="guint"/>
+          </parameter>
+          <parameter name="right_attach">
+            <type name="uint32" c:type="guint"/>
+          </parameter>
+          <parameter name="top_attach">
+            <type name="uint32" c:type="guint"/>
+          </parameter>
+          <parameter name="bottom_attach">
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_child_anchor"
-              c:identifier="gtk_text_buffer_insert_child_anchor">
+      <method name="set_row_spacing" c:identifier="gtk_table_set_row_spacing">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="row">
+            <type name="uint32" c:type="guint"/>
           </parameter>
-          <parameter name="anchor">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          <parameter name="spacing">
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="create_child_anchor"
-              c:identifier="gtk_text_buffer_create_child_anchor">
+      <method name="get_row_spacing" c:identifier="gtk_table_get_row_spacing">
         <return-value>
-          <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="row">
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_mark" c:identifier="gtk_text_buffer_add_mark">
+      <method name="set_col_spacing" c:identifier="gtk_table_set_col_spacing">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="column">
+            <type name="uint32" c:type="guint"/>
           </parameter>
-          <parameter name="where">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="spacing">
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="create_mark" c:identifier="gtk_text_buffer_create_mark">
+      <method name="get_col_spacing" c:identifier="gtk_table_get_col_spacing">
         <return-value>
-          <type name="TextMark" c:type="GtkTextMark*"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="mark_name" allow-none="1">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="where">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
-          <parameter name="left_gravity">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="column">
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_mark" c:identifier="gtk_text_buffer_move_mark">
+      <method name="set_row_spacings"
+              c:identifier="gtk_table_set_row_spacings">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
-          <parameter name="where">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="spacing">
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="delete_mark" c:identifier="gtk_text_buffer_delete_mark">
+      <method name="get_default_row_spacing"
+              c:identifier="gtk_table_get_default_row_spacing">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_mark" c:identifier="gtk_text_buffer_get_mark">
+      <method name="set_col_spacings"
+              c:identifier="gtk_table_set_col_spacings">
         <return-value>
-          <type name="TextMark" c:type="GtkTextMark*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="spacing">
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_mark_by_name"
-              c:identifier="gtk_text_buffer_move_mark_by_name">
+      <method name="get_default_col_spacing"
+              c:identifier="gtk_table_get_default_col_spacing">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="where">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="delete_mark_by_name"
-              c:identifier="gtk_text_buffer_delete_mark_by_name">
+      <method name="set_homogeneous" c:identifier="gtk_table_set_homogeneous">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="homogeneous">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_insert" c:identifier="gtk_text_buffer_get_insert">
+      <method name="get_homogeneous" c:identifier="gtk_table_get_homogeneous">
         <return-value>
-          <type name="TextMark" c:type="GtkTextMark*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_selection_bound"
-              c:identifier="gtk_text_buffer_get_selection_bound">
+      <property name="n-rows">
+        <type name="uint32" c:type="guint"/>
+      </property>
+      <property name="n-columns">
+        <type name="uint32" c:type="guint"/>
+      </property>
+      <property name="column-spacing">
+        <type name="uint32" c:type="guint"/>
+      </property>
+      <property name="row-spacing">
+        <type name="uint32" c:type="guint"/>
+      </property>
+      <property name="homogeneous">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+    </class>
+    <function name="table_new" c:identifier="gtk_table_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="rows">
+          <type name="uint32" c:type="guint"/>
+        </parameter>
+        <parameter name="columns">
+          <type name="uint32" c:type="guint"/>
+        </parameter>
+        <parameter name="homogeneous">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="TearoffMenuItem"
+           c:type="GtkTearoffMenuItem"
+           parent="MenuItem"
+           glib:type-name="GtkTearoffMenuItem"
+           glib:get-type="gtk_tearoff_menu_item_get_type">
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="TextMark" c:type="GtkTextMark*"/>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="tearoff_menu_item_new"
+              c:identifier="gtk_tearoff_menu_item_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <callback name="GtkTextTagTableForeach">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="tag">
+          <type name="TextTag" c:type="GtkTextTag*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <class name="TextTagTable"
+           c:type="GtkTextTagTable"
+           parent="GObject.Object"
+           glib:type-name="GtkTextTagTable"
+           glib:get-type="gtk_text_tag_table_get_type">
+      <constructor name="new" c:identifier="gtk_text_tag_table_new">
+        <return-value>
+          <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+        </return-value>
+      </constructor>
+      <method name="add" c:identifier="gtk_text_tag_table_add">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          </parameter>
+          <parameter name="tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="place_cursor" c:identifier="gtk_text_buffer_place_cursor">
+      <method name="remove" c:identifier="gtk_text_tag_table_remove">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
           </parameter>
-          <parameter name="where">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="select_range" c:identifier="gtk_text_buffer_select_range">
+      <method name="foreach" c:identifier="gtk_text_tag_table_foreach">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
           </parameter>
-          <parameter name="ins">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="func">
+            <type name="GtkTextTagTableForeach"
+                  c:type="GtkTextTagTableForeach"/>
           </parameter>
-          <parameter name="bound">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="apply_tag" c:identifier="gtk_text_buffer_apply_tag">
+      <method name="get_size" c:identifier="gtk_text_tag_table_get_size">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_tag" c:identifier="gtk_text_buffer_remove_tag">
+      <callback name="tag_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
           </parameter>
           <parameter name="tag">
             <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="size_changed">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="apply_tag_by_name"
-              c:identifier="gtk_text_buffer_apply_tag_by_name">
+      </callback>
+      <callback name="tag_added">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="remove_tag_by_name"
-              c:identifier="gtk_text_buffer_remove_tag_by_name">
+      </callback>
+      <callback name="tag_removed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="remove_all_tags"
-              c:identifier="gtk_text_buffer_remove_all_tags">
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="tag-changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="object">
+            <type name="TextTag" c:type="GtkTextTag"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="p0">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="create_tag" c:identifier="gtk_text_buffer_create_tag">
+      </glib:signal>
+      <glib:signal name="tag-added">
         <return-value>
-          <type name="TextTag" c:type="GtkTextTag*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="tag_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="first_property_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="object">
+            <type name="TextTag" c:type="GtkTextTag"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_iter_at_line_offset"
-              c:identifier="gtk_text_buffer_get_iter_at_line_offset">
+      </glib:signal>
+      <glib:signal name="tag-removed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="line_number">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="char_offset">
-            <type name="int32" c:type="gint"/>
+          <parameter name="object">
+            <type name="TextTag" c:type="GtkTextTag"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_iter_at_line_index"
-              c:identifier="gtk_text_buffer_get_iter_at_line_index">
+      </glib:signal>
+    </class>
+    <function name="text_tag_table_add_buffer"
+              c:identifier="_gtk_text_tag_table_add_buffer">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="table">
+          <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+        </parameter>
+        <parameter name="buffer">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_tag_table_remove_buffer"
+              c:identifier="_gtk_text_tag_table_remove_buffer">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="table">
+          <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+        </parameter>
+        <parameter name="buffer">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="TextMark"
+           c:type="GtkTextMark"
+           parent="GObject.Object"
+           glib:type-name="GtkTextMark"
+           glib:get-type="gtk_text_mark_get_type">
+      <constructor name="new" c:identifier="gtk_text_mark_new">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TextMark" c:type="GtkTextMark*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="line_number">
-            <type name="int32" c:type="gint"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="byte_index">
-            <type name="int32" c:type="gint"/>
+          <parameter name="left_gravity">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_iter_at_offset"
-              c:identifier="gtk_text_buffer_get_iter_at_offset">
+      </constructor>
+      <method name="set_visible" c:identifier="gtk_text_mark_set_visible">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
           </parameter>
-          <parameter name="char_offset">
-            <type name="int32" c:type="gint"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_iter_at_line"
-              c:identifier="gtk_text_buffer_get_iter_at_line">
+      <method name="get_visible" c:identifier="gtk_text_mark_get_visible">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="line_number">
-            <type name="int32" c:type="gint"/>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_start_iter"
-              c:identifier="gtk_text_buffer_get_start_iter">
+      <method name="get_name" c:identifier="gtk_text_mark_get_name">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_end_iter" c:identifier="gtk_text_buffer_get_end_iter">
+      <method name="get_deleted" c:identifier="gtk_text_mark_get_deleted">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_bounds" c:identifier="gtk_text_buffer_get_bounds">
+      <method name="get_buffer" c:identifier="gtk_text_mark_get_buffer">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_iter_at_mark"
-              c:identifier="gtk_text_buffer_get_iter_at_mark">
+      <method name="get_left_gravity"
+              c:identifier="gtk_text_mark_get_left_gravity">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
           <parameter name="mark">
             <type name="TextMark" c:type="GtkTextMark*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_iter_at_child_anchor"
-              c:identifier="gtk_text_buffer_get_iter_at_child_anchor">
+      <property name="name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="left-gravity">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+      </callback>
+    </class>
+    <record name="GtkTextBTree" c:type="GtkTextBTree"/>
+    <record name="GtkTextLogAttrCache" c:type="GtkTextLogAttrCache"/>
+    <class name="TextBuffer"
+           c:type="GtkTextBuffer"
+           parent="GObject.Object"
+           glib:type-name="GtkTextBuffer"
+           glib:get-type="gtk_text_buffer_get_type">
+      <constructor name="new" c:identifier="gtk_text_buffer_new">
+        <return-value>
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="anchor">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          <parameter name="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_modified" c:identifier="gtk_text_buffer_get_modified">
+      </constructor>
+      <method name="get_line_count"
+              c:identifier="gtk_text_buffer_get_line_count">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
@@ -60598,23 +58284,21 @@
           </parameter>
         </parameters>
       </method>
-      <method name="set_modified" c:identifier="gtk_text_buffer_set_modified">
+      <method name="get_char_count"
+              c:identifier="gtk_text_buffer_get_char_count">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="get_has_selection"
-              c:identifier="gtk_text_buffer_get_has_selection">
+      <method name="get_tag_table"
+              c:identifier="gtk_text_buffer_get_tag_table">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="TextTagTable" c:type="GtkTextTagTable*"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
@@ -60622,8 +58306,7 @@
           </parameter>
         </parameters>
       </method>
-      <method name="add_selection_clipboard"
-              c:identifier="gtk_text_buffer_add_selection_clipboard">
+      <method name="set_text" c:identifier="gtk_text_buffer_set_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -60631,13 +58314,15 @@
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="len">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_selection_clipboard"
-              c:identifier="gtk_text_buffer_remove_selection_clipboard">
+      <method name="insert" c:identifier="gtk_text_buffer_insert">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -60645,13 +58330,19 @@
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="len">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="cut_clipboard"
-              c:identifier="gtk_text_buffer_cut_clipboard">
+      <method name="insert_at_cursor"
+              c:identifier="gtk_text_buffer_insert_at_cursor">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -60659,57 +58350,68 @@
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="default_editable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="len">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="copy_clipboard"
-              c:identifier="gtk_text_buffer_copy_clipboard">
+      <method name="insert_interactive"
+              c:identifier="gtk_text_buffer_insert_interactive">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="len">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="default_editable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="paste_clipboard"
-              c:identifier="gtk_text_buffer_paste_clipboard">
+      <method name="insert_interactive_at_cursor"
+              c:identifier="gtk_text_buffer_insert_interactive_at_cursor">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="override_location" allow-none="1">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="len">
+            <type name="int32" c:type="gint"/>
           </parameter>
           <parameter name="default_editable">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_selection_bounds"
-              c:identifier="gtk_text_buffer_get_selection_bounds">
+      <method name="insert_range" c:identifier="gtk_text_buffer_insert_range">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
           <parameter name="start">
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
@@ -60718,8 +58420,8 @@
           </parameter>
         </parameters>
       </method>
-      <method name="delete_selection"
-              c:identifier="gtk_text_buffer_delete_selection">
+      <method name="insert_range_interactive"
+              c:identifier="gtk_text_buffer_insert_range_interactive">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -60727,16 +58429,22 @@
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="interactive">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="default_editable">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="begin_user_action"
-              c:identifier="gtk_text_buffer_begin_user_action">
+      <method name="insert_with_tags"
+              c:identifier="gtk_text_buffer_insert_with_tags">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -60744,147 +58452,138 @@
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="end_user_action"
-              c:identifier="gtk_text_buffer_end_user_action">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_copy_target_list"
-              c:identifier="gtk_text_buffer_get_copy_target_list">
-        <return-value>
-          <type name="TargetList" c:type="GtkTargetList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_paste_target_list"
-              c:identifier="gtk_text_buffer_get_paste_target_list">
-        <return-value>
-          <type name="TargetList" c:type="GtkTargetList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="len">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="first_tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="register_serialize_format"
-              c:identifier="gtk_text_buffer_register_serialize_format">
+      <method name="insert_with_tags_by_name"
+              c:identifier="gtk_text_buffer_insert_with_tags_by_name">
         <return-value>
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="mime_type">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="function">
-            <type name="GtkTextBufferSerializeFunc"
-                  c:type="GtkTextBufferSerializeFunc"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="len">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="user_data_destroy">
-            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+          <parameter name="first_tag_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="register_serialize_tagset"
-              c:identifier="gtk_text_buffer_register_serialize_tagset">
+      <method name="delete" c:identifier="gtk_text_buffer_delete">
         <return-value>
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="tagset_name" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="register_deserialize_format"
-              c:identifier="gtk_text_buffer_register_deserialize_format">
+      <method name="delete_interactive"
+              c:identifier="gtk_text_buffer_delete_interactive">
         <return-value>
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="mime_type">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="function">
-            <type name="GtkTextBufferDeserializeFunc"
-                  c:type="GtkTextBufferDeserializeFunc"/>
+          <parameter name="start_iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="end_iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="user_data_destroy">
-            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+          <parameter name="default_editable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="register_deserialize_tagset"
-              c:identifier="gtk_text_buffer_register_deserialize_tagset">
+      <method name="backspace" c:identifier="gtk_text_buffer_backspace">
         <return-value>
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="tagset_name" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="interactive">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="default_editable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unregister_serialize_format"
-              c:identifier="gtk_text_buffer_unregister_serialize_format">
+      <method name="get_text" c:identifier="gtk_text_buffer_get_text">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="include_hidden_chars">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unregister_deserialize_format"
-              c:identifier="gtk_text_buffer_unregister_deserialize_format">
+      <method name="get_slice" c:identifier="gtk_text_buffer_get_slice">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="include_hidden_chars">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="deserialize_set_can_create_tags"
-              c:identifier="gtk_text_buffer_deserialize_set_can_create_tags">
+      <method name="insert_pixbuf"
+              c:identifier="gtk_text_buffer_insert_pixbuf">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -60892,128 +58591,97 @@
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="can_create_tags">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="pixbuf">
+            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="deserialize_get_can_create_tags"
-              c:identifier="gtk_text_buffer_deserialize_get_can_create_tags">
+      <method name="insert_child_anchor"
+              c:identifier="gtk_text_buffer_insert_child_anchor">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="anchor">
+            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_serialize_formats"
-              c:identifier="gtk_text_buffer_get_serialize_formats">
+      <method name="create_child_anchor"
+              c:identifier="gtk_text_buffer_create_child_anchor">
         <return-value>
-          <type name="GdkAtom" c:type="GdkAtom*"/>
+          <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="n_formats">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_deserialize_formats"
-              c:identifier="gtk_text_buffer_get_deserialize_formats">
+      <method name="add_mark" c:identifier="gtk_text_buffer_add_mark">
         <return-value>
-          <type name="GdkAtom" c:type="GdkAtom*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="n_formats">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
+          </parameter>
+          <parameter name="where">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="serialize" c:identifier="gtk_text_buffer_serialize">
+      <method name="create_mark" c:identifier="gtk_text_buffer_create_mark">
         <return-value>
-          <type name="guint8" c:type="guint8*"/>
+          <type name="TextMark" c:type="GtkTextMark*"/>
         </return-value>
         <parameters>
-          <parameter name="register_buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="content_buffer">
+          <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="mark_name" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="end">
+          <parameter name="where">
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="length">
-            <type name="gsize" c:type="gsize*"/>
+          <parameter name="left_gravity">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="deserialize" c:identifier="gtk_text_buffer_deserialize">
+      <method name="move_mark" c:identifier="gtk_text_buffer_move_mark">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="register_buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="content_buffer">
+          <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="data">
-            <type name="guint8" c:type="guint8*"/>
-          </parameter>
-          <parameter name="length">
-            <type name="size" c:type="gsize"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
           </parameter>
-        </parameters>
-      </method>
-      <property name="tag-table">
-        <type name="TextTagTable" c:type="GtkTextTagTable"/>
-      </property>
-      <property name="text">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="has-selection">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="cursor-position">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="copy-target-list">
-        <type name="TargetList" c:type="GtkTargetList"/>
-      </property>
-      <property name="paste-target-list">
-        <type name="TargetList" c:type="GtkTargetList"/>
-      </property>
-      <callback name="insert_text">
+          <parameter name="where">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="delete_mark" c:identifier="gtk_text_buffer_delete_mark">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -61021,34 +58689,26 @@
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="pos">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="length">
-            <type name="int32" c:type="gint"/>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="insert_pixbuf">
+      </method>
+      <method name="get_mark" c:identifier="gtk_text_buffer_get_mark">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TextMark" c:type="GtkTextMark*"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="pos">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="insert_child_anchor">
+      </method>
+      <method name="move_mark_by_name"
+              c:identifier="gtk_text_buffer_move_mark_by_name">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -61056,15 +58716,16 @@
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="pos">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="anchor">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          <parameter name="where">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="delete_range">
+      </method>
+      <method name="delete_mark_by_name"
+              c:identifier="gtk_text_buffer_delete_mark_by_name">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -61072,35 +58733,33 @@
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="changed">
+      </method>
+      <method name="get_insert" c:identifier="gtk_text_buffer_get_insert">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TextMark" c:type="GtkTextMark*"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="modified_changed">
+      </method>
+      <method name="get_selection_bound"
+              c:identifier="gtk_text_buffer_get_selection_bound">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TextMark" c:type="GtkTextMark*"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="mark_set">
+      </method>
+      <method name="place_cursor" c:identifier="gtk_text_buffer_place_cursor">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -61108,15 +58767,12 @@
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="location">
+          <parameter name="where">
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
-          </parameter>
         </parameters>
-      </callback>
-      <callback name="mark_deleted">
+      </method>
+      <method name="select_range" c:identifier="gtk_text_buffer_select_range">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -61124,12 +58780,15 @@
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="ins">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="bound">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="apply_tag">
+      </method>
+      <method name="apply_tag" c:identifier="gtk_text_buffer_apply_tag">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -61140,15 +58799,15 @@
           <parameter name="tag">
             <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
-          <parameter name="start_char">
+          <parameter name="start">
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="end_char">
+          <parameter name="end">
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="remove_tag">
+      </method>
+      <method name="remove_tag" c:identifier="gtk_text_buffer_remove_tag">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -61159,15 +58818,16 @@
           <parameter name="tag">
             <type name="TextTag" c:type="GtkTextTag*"/>
           </parameter>
-          <parameter name="start_char">
+          <parameter name="start">
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="end_char">
+          <parameter name="end">
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="begin_user_action">
+      </method>
+      <method name="apply_tag_by_name"
+              c:identifier="gtk_text_buffer_apply_tag_by_name">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -61175,9 +58835,19 @@
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
         </parameters>
-      </callback>
-      <callback name="end_user_action">
+      </method>
+      <method name="remove_tag_by_name"
+              c:identifier="gtk_text_buffer_remove_tag_by_name">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -61185,1135 +58855,1077 @@
           <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved5">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved6">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="insert-text">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="TextIter" c:type="GtkTextIter"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="string" c:type="gchararray"/>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="p1">
-            <type name="int32" c:type="gint"/>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="insert-pixbuf">
+      </method>
+      <method name="remove_all_tags"
+              c:identifier="gtk_text_buffer_remove_all_tags">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="TextIter" c:type="GtkTextIter"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="GdkPixbuf" c:type="GdkPixbuf"/>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="insert-child-anchor">
+      </method>
+      <method name="create_tag" c:identifier="gtk_text_buffer_create_tag">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TextTag" c:type="GtkTextTag*"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="TextIter" c:type="GtkTextIter"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor"/>
+          <parameter name="tag_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="first_property_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="delete-range">
+      </method>
+      <method name="get_iter_at_line_offset"
+              c:identifier="gtk_text_buffer_get_iter_at_line_offset">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="TextIter" c:type="GtkTextIter"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="TextIter" c:type="GtkTextIter"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="line_number">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="char_offset">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="modified-changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="mark-set">
+      </method>
+      <method name="get_iter_at_line_index"
+              c:identifier="gtk_text_buffer_get_iter_at_line_index">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="TextIter" c:type="GtkTextIter"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="TextMark" c:type="GtkTextMark"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="line_number">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="byte_index">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="mark-deleted">
+      </method>
+      <method name="get_iter_at_offset"
+              c:identifier="gtk_text_buffer_get_iter_at_offset">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="TextMark" c:type="GtkTextMark"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="char_offset">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="apply-tag">
+      </method>
+      <method name="get_iter_at_line"
+              c:identifier="gtk_text_buffer_get_iter_at_line">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="TextTag" c:type="GtkTextTag"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="TextIter" c:type="GtkTextIter"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="p1">
-            <type name="TextIter" c:type="GtkTextIter"/>
+          <parameter name="line_number">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="remove-tag">
+      </method>
+      <method name="get_start_iter"
+              c:identifier="gtk_text_buffer_get_start_iter">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="TextTag" c:type="GtkTextTag"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="TextIter" c:type="GtkTextIter"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="p1">
-            <type name="TextIter" c:type="GtkTextIter"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="begin-user-action">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="end-user-action">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="text_buffer_spew" c:identifier="_gtk_text_buffer_spew">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="buffer">
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_buffer_get_btree"
-              c:identifier="_gtk_text_buffer_get_btree">
-      <return-value>
-        <type name="GtkTextBTree" c:type="GtkTextBTree*"/>
-      </return-value>
-      <parameters>
-        <parameter name="buffer">
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_buffer_get_line_log_attrs"
-              c:identifier="_gtk_text_buffer_get_line_log_attrs">
-      <return-value>
-        <type name="Pango.PangoLogAttr" c:type="PangoLogAttr*"/>
-      </return-value>
-      <parameters>
-        <parameter name="buffer">
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-        </parameter>
-        <parameter name="anywhere_in_line">
-          <type name="TextIter" c:type="GtkTextIter*"/>
-        </parameter>
-        <parameter name="char_len">
-          <type name="GLib.gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_buffer_notify_will_remove_tag"
-              c:identifier="_gtk_text_buffer_notify_will_remove_tag">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="buffer">
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-        </parameter>
-        <parameter name="tag">
-          <type name="TextTag" c:type="GtkTextTag*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <callback name="GtkTextBufferSerializeFunc">
-      <return-value>
-        <type name="guint8" c:type="guint8*"/>
-      </return-value>
-      <parameters>
-        <parameter name="register_buffer">
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-        </parameter>
-        <parameter name="content_buffer">
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-        </parameter>
-        <parameter name="start">
-          <type name="TextIter" c:type="GtkTextIter*"/>
-        </parameter>
-        <parameter name="end">
-          <type name="TextIter" c:type="GtkTextIter*"/>
-        </parameter>
-        <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkTextBufferDeserializeFunc">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="register_buffer">
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-        </parameter>
-        <parameter name="content_buffer">
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="TextIter" c:type="GtkTextIter*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="guint8" c:type="guint8*"/>
-        </parameter>
-        <parameter name="length">
-          <type name="size" c:type="gsize"/>
-        </parameter>
-        <parameter name="create_tags">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <record name="GtkTextWindow" c:type="GtkTextWindow"/>
-    <record name="GtkTextPendingScroll" c:type="GtkTextPendingScroll"/>
-    <class name="TextView"
-           c:type="GtkTextView"
-           parent="Container"
-           glib:type-name="GtkTextView"
-           glib:get-type="gtk_text_view_get_type">
-      <method name="set_buffer" c:identifier="gtk_text_view_set_buffer">
+      </method>
+      <method name="get_end_iter" c:identifier="gtk_text_buffer_get_end_iter">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="buffer" allow-none="1">
+          <parameter name="buffer">
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="get_buffer" c:identifier="gtk_text_view_get_buffer">
+      <method name="get_bounds" c:identifier="gtk_text_buffer_get_bounds">
         <return-value>
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="scroll_to_iter"
-              c:identifier="gtk_text_view_scroll_to_iter">
+      <method name="get_iter_at_mark"
+              c:identifier="gtk_text_buffer_get_iter_at_mark">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
           <parameter name="iter">
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="within_margin">
-            <type name="double" c:type="gdouble"/>
-          </parameter>
-          <parameter name="use_align">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="xalign">
-            <type name="double" c:type="gdouble"/>
-          </parameter>
-          <parameter name="yalign">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="scroll_to_mark"
-              c:identifier="gtk_text_view_scroll_to_mark">
+      <method name="get_iter_at_child_anchor"
+              c:identifier="gtk_text_buffer_get_iter_at_child_anchor">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
-          </parameter>
-          <parameter name="within_margin">
-            <type name="double" c:type="gdouble"/>
-          </parameter>
-          <parameter name="use_align">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="xalign">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="yalign">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="anchor">
+            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="scroll_mark_onscreen"
-              c:identifier="gtk_text_view_scroll_mark_onscreen">
+      <method name="get_modified" c:identifier="gtk_text_buffer_get_modified">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_mark_onscreen"
-              c:identifier="gtk_text_view_move_mark_onscreen">
+      <method name="set_modified" c:identifier="gtk_text_buffer_set_modified">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="place_cursor_onscreen"
-              c:identifier="gtk_text_view_place_cursor_onscreen">
+      <method name="get_has_selection"
+              c:identifier="gtk_text_buffer_get_has_selection">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_visible_rect"
-              c:identifier="gtk_text_view_get_visible_rect">
+      <method name="add_selection_clipboard"
+              c:identifier="gtk_text_buffer_add_selection_clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="visible_rect">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_cursor_visible"
-              c:identifier="gtk_text_view_set_cursor_visible">
+      <method name="remove_selection_clipboard"
+              c:identifier="gtk_text_buffer_remove_selection_clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_cursor_visible"
-              c:identifier="gtk_text_view_get_cursor_visible">
+      <method name="cut_clipboard"
+              c:identifier="gtk_text_buffer_cut_clipboard">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
+          </parameter>
+          <parameter name="default_editable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_iter_location"
-              c:identifier="gtk_text_view_get_iter_location">
+      <method name="copy_clipboard"
+              c:identifier="gtk_text_buffer_copy_clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="location">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_iter_at_location"
-              c:identifier="gtk_text_view_get_iter_at_location">
+      <method name="paste_clipboard"
+              c:identifier="gtk_text_buffer_paste_clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
+          <parameter name="override_location" allow-none="1">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="default_editable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_iter_at_position"
-              c:identifier="gtk_text_view_get_iter_at_position">
+      <method name="get_selection_bounds"
+              c:identifier="gtk_text_buffer_get_selection_bounds">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="iter">
+          <parameter name="start">
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="trailing">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_line_yrange"
-              c:identifier="gtk_text_view_get_line_yrange">
+      <method name="delete_selection"
+              c:identifier="gtk_text_buffer_delete_selection">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="y">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="interactive">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="height">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="default_editable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_line_at_y" c:identifier="gtk_text_view_get_line_at_y">
+      <method name="begin_user_action"
+              c:identifier="gtk_text_buffer_begin_user_action">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="target_iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="line_top">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="buffer_to_window_coords"
-              c:identifier="gtk_text_view_buffer_to_window_coords">
+      <method name="end_user_action"
+              c:identifier="gtk_text_buffer_end_user_action">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="win">
-            <type name="TextWindowType" c:type="GtkTextWindowType"/>
-          </parameter>
-          <parameter name="buffer_x">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="buffer_y">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="window_x">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="window_y">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="window_to_buffer_coords"
-              c:identifier="gtk_text_view_window_to_buffer_coords">
+      <method name="get_copy_target_list"
+              c:identifier="gtk_text_buffer_get_copy_target_list">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TargetList" c:type="GtkTargetList*"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="win">
-            <type name="TextWindowType" c:type="GtkTextWindowType"/>
-          </parameter>
-          <parameter name="window_x">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="window_y">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="buffer_x">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="buffer_y">
-            <type name="GLib.gint" c:type="gint*"/>
+        </parameters>
+      </method>
+      <method name="get_paste_target_list"
+              c:identifier="gtk_text_buffer_get_paste_target_list">
+        <return-value>
+          <type name="TargetList" c:type="GtkTargetList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_window" c:identifier="gtk_text_view_get_window">
+      <method name="register_serialize_format"
+              c:identifier="gtk_text_buffer_register_serialize_format">
         <return-value>
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
+          <type name="GdkAtom" c:type="GdkAtom"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="win">
-            <type name="TextWindowType" c:type="GtkTextWindowType"/>
+          <parameter name="mime_type">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="function">
+            <type name="GtkTextBufferSerializeFunc"
+                  c:type="GtkTextBufferSerializeFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="user_data_destroy">
+            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_window_type"
-              c:identifier="gtk_text_view_get_window_type">
+      <method name="register_serialize_tagset"
+              c:identifier="gtk_text_buffer_register_serialize_tagset">
         <return-value>
-          <type name="TextWindowType" c:type="GtkTextWindowType"/>
+          <type name="GdkAtom" c:type="GdkAtom"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="window">
-            <type name="Gdk.Window" c:type="GdkWindow*"/>
+          <parameter name="tagset_name" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_border_window_size"
-              c:identifier="gtk_text_view_set_border_window_size">
+      <method name="register_deserialize_format"
+              c:identifier="gtk_text_buffer_register_deserialize_format">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GdkAtom" c:type="GdkAtom"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="type">
-            <type name="TextWindowType" c:type="GtkTextWindowType"/>
+          <parameter name="mime_type">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="size">
-            <type name="int32" c:type="gint"/>
+          <parameter name="function">
+            <type name="GtkTextBufferDeserializeFunc"
+                  c:type="GtkTextBufferDeserializeFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="user_data_destroy">
+            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_border_window_size"
-              c:identifier="gtk_text_view_get_border_window_size">
+      <method name="register_deserialize_tagset"
+              c:identifier="gtk_text_buffer_register_deserialize_tagset">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="GdkAtom" c:type="GdkAtom"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="type">
-            <type name="TextWindowType" c:type="GtkTextWindowType"/>
+          <parameter name="tagset_name" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="forward_display_line"
-              c:identifier="gtk_text_view_forward_display_line">
+      <method name="unregister_serialize_format"
+              c:identifier="gtk_text_buffer_unregister_serialize_format">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="format">
+            <type name="GdkAtom" c:type="GdkAtom"/>
           </parameter>
         </parameters>
       </method>
-      <method name="backward_display_line"
-              c:identifier="gtk_text_view_backward_display_line">
+      <method name="unregister_deserialize_format"
+              c:identifier="gtk_text_buffer_unregister_deserialize_format">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="format">
+            <type name="GdkAtom" c:type="GdkAtom"/>
           </parameter>
         </parameters>
       </method>
-      <method name="forward_display_line_end"
-              c:identifier="gtk_text_view_forward_display_line_end">
+      <method name="deserialize_set_can_create_tags"
+              c:identifier="gtk_text_buffer_deserialize_set_can_create_tags">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="format">
+            <type name="GdkAtom" c:type="GdkAtom"/>
+          </parameter>
+          <parameter name="can_create_tags">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="backward_display_line_start"
-              c:identifier="gtk_text_view_backward_display_line_start">
+      <method name="deserialize_get_can_create_tags"
+              c:identifier="gtk_text_buffer_deserialize_get_can_create_tags">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="format">
+            <type name="GdkAtom" c:type="GdkAtom"/>
           </parameter>
         </parameters>
       </method>
-      <method name="starts_display_line"
-              c:identifier="gtk_text_view_starts_display_line">
+      <method name="get_serialize_formats"
+              c:identifier="gtk_text_buffer_get_serialize_formats">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="GdkAtom" c:type="GdkAtom*"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="n_formats">
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_visually" c:identifier="gtk_text_view_move_visually">
+      <method name="get_deserialize_formats"
+              c:identifier="gtk_text_buffer_get_deserialize_formats">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="GdkAtom" c:type="GdkAtom*"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
+          <parameter name="n_formats">
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_child_at_anchor"
-              c:identifier="gtk_text_view_add_child_at_anchor">
+      <method name="serialize" c:identifier="gtk_text_buffer_serialize">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="guint8" c:type="guint8*"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="register_buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="content_buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="anchor">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          <parameter name="format">
+            <type name="GdkAtom" c:type="GdkAtom"/>
+          </parameter>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="gsize" c:type="gsize*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_child_in_window"
-              c:identifier="gtk_text_view_add_child_in_window">
+      <method name="deserialize" c:identifier="gtk_text_buffer_deserialize">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="register_buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="content_buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="which_window">
-            <type name="TextWindowType" c:type="GtkTextWindowType"/>
+          <parameter name="format">
+            <type name="GdkAtom" c:type="GdkAtom"/>
           </parameter>
-          <parameter name="xpos">
-            <type name="int32" c:type="gint"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="ypos">
-            <type name="int32" c:type="gint"/>
+          <parameter name="data">
+            <type name="guint8" c:type="guint8*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="size" c:type="gsize"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_child" c:identifier="gtk_text_view_move_child">
+      <property name="tag-table">
+        <type name="TextTagTable" c:type="GtkTextTagTable"/>
+      </property>
+      <property name="text">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="has-selection">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="cursor-position">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="copy-target-list">
+        <type name="TargetList" c:type="GtkTargetList"/>
+      </property>
+      <property name="paste-target-list">
+        <type name="TargetList" c:type="GtkTargetList"/>
+      </property>
+      <callback name="insert_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="pos">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="xpos">
-            <type name="int32" c:type="gint"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="ypos">
+          <parameter name="length">
             <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_wrap_mode" c:identifier="gtk_text_view_set_wrap_mode">
+      </callback>
+      <callback name="insert_pixbuf">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="wrap_mode">
-            <type name="WrapMode" c:type="GtkWrapMode"/>
+          <parameter name="pos">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_wrap_mode" c:identifier="gtk_text_view_get_wrap_mode">
-        <return-value>
-          <type name="WrapMode" c:type="GtkWrapMode"/>
-        </return-value>
-        <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="pixbuf">
+            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_editable" c:identifier="gtk_text_view_set_editable">
+      </callback>
+      <callback name="insert_child_anchor">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="pos">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_editable" c:identifier="gtk_text_view_get_editable">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="anchor">
+            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_overwrite" c:identifier="gtk_text_view_set_overwrite">
+      </callback>
+      <callback name="delete_range">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="overwrite">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_overwrite" c:identifier="gtk_text_view_get_overwrite">
+      </callback>
+      <callback name="changed">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_accepts_tab"
-              c:identifier="gtk_text_view_set_accepts_tab">
+      </callback>
+      <callback name="modified_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="accepts_tab">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_accepts_tab"
-              c:identifier="gtk_text_view_get_accepts_tab">
+      </callback>
+      <callback name="mark_set">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="location">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_pixels_above_lines"
-              c:identifier="gtk_text_view_set_pixels_above_lines">
+      </callback>
+      <callback name="mark_deleted">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="pixels_above_lines">
-            <type name="int32" c:type="gint"/>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_pixels_above_lines"
-              c:identifier="gtk_text_view_get_pixels_above_lines">
+      </callback>
+      <callback name="apply_tag">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+          <parameter name="start_char">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end_char">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_pixels_below_lines"
-              c:identifier="gtk_text_view_set_pixels_below_lines">
+      </callback>
+      <callback name="remove_tag">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
-          <parameter name="pixels_below_lines">
-            <type name="int32" c:type="gint"/>
+          <parameter name="tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+          <parameter name="start_char">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end_char">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_pixels_below_lines"
-              c:identifier="gtk_text_view_get_pixels_below_lines">
+      </callback>
+      <callback name="begin_user_action">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_pixels_inside_wrap"
-              c:identifier="gtk_text_view_set_pixels_inside_wrap">
+      </callback>
+      <callback name="end_user_action">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="pixels_inside_wrap">
-            <type name="int32" c:type="gint"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_pixels_inside_wrap"
-              c:identifier="gtk_text_view_get_pixels_inside_wrap">
+      </callback>
+      <callback name="_gtk_reserved1">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_justification"
-              c:identifier="gtk_text_view_set_justification">
+      </callback>
+      <callback name="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-          <parameter name="justification">
-            <type name="Justification" c:type="GtkJustification"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_justification"
-              c:identifier="gtk_text_view_get_justification">
+      </callback>
+      <callback name="_gtk_reserved3">
         <return-value>
-          <type name="Justification" c:type="GtkJustification"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_left_margin"
-              c:identifier="gtk_text_view_set_left_margin">
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved6">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="insert-text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="object">
+            <type name="TextIter" c:type="GtkTextIter"/>
           </parameter>
-          <parameter name="left_margin">
+          <parameter name="p0">
+            <type name="string" c:type="gchararray"/>
+          </parameter>
+          <parameter name="p1">
             <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_left_margin"
-              c:identifier="gtk_text_view_get_left_margin">
+      </glib:signal>
+      <glib:signal name="insert-pixbuf">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="object">
+            <type name="TextIter" c:type="GtkTextIter"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="GdkPixbuf" c:type="GdkPixbuf"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_right_margin"
-              c:identifier="gtk_text_view_set_right_margin">
+      </glib:signal>
+      <glib:signal name="insert-child-anchor">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="object">
+            <type name="TextIter" c:type="GtkTextIter"/>
           </parameter>
-          <parameter name="right_margin">
-            <type name="int32" c:type="gint"/>
+          <parameter name="p0">
+            <type name="TextChildAnchor" c:type="GtkTextChildAnchor"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_right_margin"
-              c:identifier="gtk_text_view_get_right_margin">
+      </glib:signal>
+      <glib:signal name="delete-range">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="object">
+            <type name="TextIter" c:type="GtkTextIter"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="TextIter" c:type="GtkTextIter"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_indent" c:identifier="gtk_text_view_set_indent">
+      </glib:signal>
+      <glib:signal name="modified-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="mark-set">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="object">
+            <type name="TextIter" c:type="GtkTextIter"/>
           </parameter>
-          <parameter name="indent">
-            <type name="int32" c:type="gint"/>
+          <parameter name="p0">
+            <type name="TextMark" c:type="GtkTextMark"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_indent" c:identifier="gtk_text_view_get_indent">
+      </glib:signal>
+      <glib:signal name="mark-deleted">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="object">
+            <type name="TextMark" c:type="GtkTextMark"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_tabs" c:identifier="gtk_text_view_set_tabs">
+      </glib:signal>
+      <glib:signal name="apply-tag">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="object">
+            <type name="TextTag" c:type="GtkTextTag"/>
           </parameter>
-          <parameter name="tabs">
-            <type name="PangoTabArray" c:type="PangoTabArray*"/>
+          <parameter name="p0">
+            <type name="TextIter" c:type="GtkTextIter"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="TextIter" c:type="GtkTextIter"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_tabs" c:identifier="gtk_text_view_get_tabs">
+      </glib:signal>
+      <glib:signal name="remove-tag">
         <return-value>
-          <type name="PangoTabArray" c:type="PangoTabArray*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="object">
+            <type name="TextTag" c:type="GtkTextTag"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="TextIter" c:type="GtkTextIter"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="TextIter" c:type="GtkTextIter"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_default_attributes"
-              c:identifier="gtk_text_view_get_default_attributes">
+      </glib:signal>
+      <glib:signal name="begin-user-action">
         <return-value>
-          <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="pixels-above-lines">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="pixels-below-lines">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="pixels-inside-wrap">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="editable">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="wrap-mode">
-        <type name="WrapMode" c:type="GtkWrapMode"/>
-      </property>
-      <property name="justification">
-        <type name="Justification" c:type="GtkJustification"/>
-      </property>
-      <property name="left-margin">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="right-margin">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="indent">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="tabs">
-        <type name="PangoTabArray" c:type="PangoTabArray"/>
-      </property>
-      <property name="cursor-visible">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="buffer">
-        <type name="TextBuffer" c:type="GtkTextBuffer"/>
-      </property>
-      <property name="overwrite">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="accepts-tab">
+      </glib:signal>
+      <glib:signal name="end-user-action">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="text_buffer_spew" c:identifier="_gtk_text_buffer_spew">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="buffer">
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_buffer_get_btree"
+              c:identifier="_gtk_text_buffer_get_btree">
+      <return-value>
+        <type name="GtkTextBTree" c:type="GtkTextBTree*"/>
+      </return-value>
+      <parameters>
+        <parameter name="buffer">
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_buffer_get_line_log_attrs"
+              c:identifier="_gtk_text_buffer_get_line_log_attrs">
+      <return-value>
+        <type name="Pango.PangoLogAttr" c:type="PangoLogAttr*"/>
+      </return-value>
+      <parameters>
+        <parameter name="buffer">
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        </parameter>
+        <parameter name="anywhere_in_line">
+          <type name="TextIter" c:type="GtkTextIter*"/>
+        </parameter>
+        <parameter name="char_len">
+          <type name="GLib.gint" c:type="gint*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_buffer_notify_will_remove_tag"
+              c:identifier="_gtk_text_buffer_notify_will_remove_tag">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="buffer">
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        </parameter>
+        <parameter name="tag">
+          <type name="TextTag" c:type="GtkTextTag*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <callback name="GtkTextBufferSerializeFunc">
+      <return-value>
+        <type name="guint8" c:type="guint8*"/>
+      </return-value>
+      <parameters>
+        <parameter name="register_buffer">
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        </parameter>
+        <parameter name="content_buffer">
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        </parameter>
+        <parameter name="start">
+          <type name="TextIter" c:type="GtkTextIter*"/>
+        </parameter>
+        <parameter name="end">
+          <type name="TextIter" c:type="GtkTextIter*"/>
+        </parameter>
+        <parameter name="length">
+          <type name="gsize" c:type="gsize*"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="GtkTextBufferDeserializeFunc">
+      <return-value>
         <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="set_scroll_adjustments">
+      </return-value>
+      <parameters>
+        <parameter name="register_buffer">
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        </parameter>
+        <parameter name="content_buffer">
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="TextIter" c:type="GtkTextIter*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="guint8" c:type="guint8*"/>
+        </parameter>
+        <parameter name="length">
+          <type name="size" c:type="gsize"/>
+        </parameter>
+        <parameter name="create_tags">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.GError" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <record name="GtkTextWindow" c:type="GtkTextWindow"/>
+    <record name="GtkTextPendingScroll" c:type="GtkTextPendingScroll"/>
+    <class name="TextView"
+           c:type="GtkTextView"
+           parent="Container"
+           glib:type-name="GtkTextView"
+           glib:get-type="gtk_text_view_get_type">
+      <method name="set_buffer" c:identifier="gtk_text_view_set_buffer">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -62321,47 +59933,49 @@
           <parameter name="text_view">
             <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="hadjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
-          </parameter>
-          <parameter name="vadjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="buffer" allow-none="1">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="populate_popup">
+      </method>
+      <method name="get_buffer" c:identifier="gtk_text_view_get_buffer">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
         </return-value>
         <parameters>
           <parameter name="text_view">
             <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
-          </parameter>
         </parameters>
-      </callback>
-      <callback name="move_cursor">
+      </method>
+      <method name="scroll_to_iter"
+              c:identifier="gtk_text_view_scroll_to_iter">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="text_view">
             <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="step">
-            <type name="MovementStep" c:type="GtkMovementStep"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
+          <parameter name="within_margin">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="use_align">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="xalign">
+            <type name="double" c:type="gdouble"/>
           </parameter>
-          <parameter name="extend_selection">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="yalign">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="page_horizontally">
+      </method>
+      <method name="scroll_to_mark"
+              c:identifier="gtk_text_view_scroll_to_mark">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -62369,25 +59983,25 @@
           <parameter name="text_view">
             <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
           </parameter>
-          <parameter name="extend_selection">
+          <parameter name="within_margin">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="use_align">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_anchor">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="text_view">
-            <type name="TextView" c:type="GtkTextView*"/>
+          <parameter name="xalign">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="yalign">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="insert_at_cursor">
+      </method>
+      <method name="scroll_mark_onscreen"
+              c:identifier="gtk_text_view_scroll_mark_onscreen">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -62395,38 +60009,38 @@
           <parameter name="text_view">
             <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="str">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="delete_from_cursor">
+      </method>
+      <method name="move_mark_onscreen"
+              c:identifier="gtk_text_view_move_mark_onscreen">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="text_view">
             <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="type">
-            <type name="DeleteType" c:type="GtkDeleteType"/>
-          </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="backspace">
+      </method>
+      <method name="place_cursor_onscreen"
+              c:identifier="gtk_text_view_place_cursor_onscreen">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="text_view">
             <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="cut_clipboard">
+      </method>
+      <method name="get_visible_rect"
+              c:identifier="gtk_text_view_get_visible_rect">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -62434,9 +60048,13 @@
           <parameter name="text_view">
             <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
+          <parameter name="visible_rect">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          </parameter>
         </parameters>
-      </callback>
-      <callback name="copy_clipboard">
+      </method>
+      <method name="set_cursor_visible"
+              c:identifier="gtk_text_view_set_cursor_visible">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -62444,19 +60062,24 @@
           <parameter name="text_view">
             <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
         </parameters>
-      </callback>
-      <callback name="paste_clipboard">
+      </method>
+      <method name="get_cursor_visible"
+              c:identifier="gtk_text_view_get_cursor_visible">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="text_view">
             <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="toggle_overwrite">
+      </method>
+      <method name="get_iter_location"
+              c:identifier="gtk_text_view_get_iter_location">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -62464,9 +60087,16 @@
           <parameter name="text_view">
             <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="location">
+            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          </parameter>
         </parameters>
-      </callback>
-      <callback name="move_focus">
+      </method>
+      <method name="get_iter_at_location"
+              c:identifier="gtk_text_view_get_iter_at_location">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -62474,1441 +60104,1119 @@
           <parameter name="text_view">
             <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="direction">
-            <type name="DirectionType" c:type="GtkDirectionType"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved5">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved6">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved7">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="move-cursor">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="MovementStep" c:type="GtkMovementStep"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-          <parameter name="p0">
+          <parameter name="x">
             <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="p1">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="copy-clipboard">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="populate-popup">
+      </method>
+      <method name="get_iter_at_position"
+              c:identifier="gtk_text_view_get_iter_at_position">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Menu" c:type="GtkMenu"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="insert-at-cursor">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="string" c:type="gchararray"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="delete-from-cursor">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="DeleteType" c:type="GtkDeleteType"/>
+          <parameter name="trailing">
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
-          <parameter name="p0">
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
             <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="backspace">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="cut-clipboard">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="paste-clipboard">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="toggle-overwrite">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="set-scroll-adjustments">
+      </method>
+      <method name="get_line_yrange"
+              c:identifier="gtk_text_view_get_line_yrange">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Adjustment" c:type="GtkAdjustment"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="Adjustment" c:type="GtkAdjustment"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="select-all">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="y">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="height">
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="page-horizontally">
+      </method>
+      <method name="get_line_at_y" c:identifier="gtk_text_view_get_line_at_y">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="target_iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="y">
             <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="p0">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="line_top">
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="move-viewport">
+      </method>
+      <method name="buffer_to_window_coords"
+              c:identifier="gtk_text_view_buffer_to_window_coords">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="ScrollStep" c:type="GtkScrollStep"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="p0">
+          <parameter name="win">
+            <type name="TextWindowType" c:type="GtkTextWindowType"/>
+          </parameter>
+          <parameter name="buffer_x">
             <type name="int32" c:type="gint"/>
           </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="set-anchor">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="toggle-cursor-visible">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="text_view_new" c:identifier="gtk_text_view_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="text_view_new_with_buffer"
-              c:identifier="gtk_text_view_new_with_buffer">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="buffer">
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkTipsQuery" c:type="GtkTipsQuery">
-      <field name="label">
-        <type name="Label" c:type="GtkLabel"/>
-      </field>
-      <field name="emit_always">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="in_query">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="label_inactive">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="label_no_tip">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="caller">
-        <type name="Widget" c:type="GtkWidget*"/>
-      </field>
-      <field name="last_crossed">
-        <type name="Widget" c:type="GtkWidget*"/>
-      </field>
-      <field name="query_cursor">
-        <type name="GdkCursor" c:type="GdkCursor*"/>
-      </field>
-      <callback name="start_query">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tips_query">
-            <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
+          <parameter name="buffer_y">
+            <type name="int32" c:type="gint"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="stop_query">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tips_query">
-            <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
+          <parameter name="window_x">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="window_y">
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="widget_entered">
+      </method>
+      <method name="window_to_buffer_coords"
+              c:identifier="gtk_text_view_window_to_buffer_coords">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tips_query">
-            <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="win">
+            <type name="TextWindowType" c:type="GtkTextWindowType"/>
           </parameter>
-          <parameter name="tip_text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="window_x">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="tip_private">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="window_y">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="buffer_x">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="buffer_y">
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="widget_selected">
+      </method>
+      <method name="get_window" c:identifier="gtk_text_view_get_window">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
         </return-value>
         <parameters>
-          <parameter name="tips_query">
-            <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="tip_text">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="tip_private">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventButton" c:type="GdkEventButton*"/>
+          <parameter name="win">
+            <type name="TextWindowType" c:type="GtkTextWindowType"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-    </record>
-    <function name="tips_query_get_type"
-              c:identifier="gtk_tips_query_get_type">
-      <return-value>
-        <type name="GtkType" c:type="GtkType"/>
-      </return-value>
-    </function>
-    <function name="tips_query_new" c:identifier="gtk_tips_query_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="tips_query_start_query"
-              c:identifier="gtk_tips_query_start_query">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tips_query">
-          <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tips_query_stop_query"
-              c:identifier="gtk_tips_query_stop_query">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tips_query">
-          <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tips_query_set_caller"
-              c:identifier="gtk_tips_query_set_caller">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tips_query">
-          <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
-        </parameter>
-        <parameter name="caller">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tips_query_set_labels"
-              c:identifier="gtk_tips_query_set_labels">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tips_query">
-          <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
-        </parameter>
-        <parameter name="label_inactive">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="label_no_tip">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkToolbarChild" c:type="GtkToolbarChild">
-      <field name="type">
-        <type name="ToolbarChildType" c:type="GtkToolbarChildType"/>
-      </field>
-      <field name="widget">
-        <type name="Widget" c:type="GtkWidget*"/>
-      </field>
-      <field name="icon">
-        <type name="Widget" c:type="GtkWidget*"/>
-      </field>
-      <field name="label">
-        <type name="Widget" c:type="GtkWidget*"/>
-      </field>
-    </record>
-    <record name="GtkToolbarPrivate" c:type="GtkToolbarPrivate"/>
-    <class name="Toolbar"
-           c:type="GtkToolbar"
-           parent="Container"
-           glib:type-name="GtkToolbar"
-           glib:get-type="gtk_toolbar_get_type">
-      <method name="insert" c:identifier="gtk_toolbar_insert">
+      </method>
+      <method name="get_window_type"
+              c:identifier="gtk_text_view_get_window_type">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TextWindowType" c:type="GtkTextWindowType"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="pos">
-            <type name="int32" c:type="gint"/>
+          <parameter name="window">
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_item_index" c:identifier="gtk_toolbar_get_item_index">
+      <method name="set_border_window_size"
+              c:identifier="gtk_text_view_set_border_window_size">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="type">
+            <type name="TextWindowType" c:type="GtkTextWindowType"/>
+          </parameter>
+          <parameter name="size">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_n_items" c:identifier="gtk_toolbar_get_n_items">
+      <method name="get_border_window_size"
+              c:identifier="gtk_text_view_get_border_window_size">
         <return-value>
           <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="TextWindowType" c:type="GtkTextWindowType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_nth_item" c:identifier="gtk_toolbar_get_nth_item">
+      <method name="forward_display_line"
+              c:identifier="gtk_text_view_forward_display_line">
         <return-value>
-          <type name="ToolItem" c:type="GtkToolItem*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="n">
-            <type name="int32" c:type="gint"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_show_arrow" c:identifier="gtk_toolbar_get_show_arrow">
+      <method name="backward_display_line"
+              c:identifier="gtk_text_view_backward_display_line">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_show_arrow" c:identifier="gtk_toolbar_set_show_arrow">
+      <method name="forward_display_line_end"
+              c:identifier="gtk_text_view_forward_display_line_end">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="show_arrow">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_orientation"
-              c:identifier="gtk_toolbar_get_orientation">
+      <method name="backward_display_line_start"
+              c:identifier="gtk_text_view_backward_display_line_start">
         <return-value>
-          <type name="Orientation" c:type="GtkOrientation"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_orientation"
-              c:identifier="gtk_toolbar_set_orientation">
+      <method name="starts_display_line"
+              c:identifier="gtk_text_view_starts_display_line">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="orientation">
-            <type name="Orientation" c:type="GtkOrientation"/>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_tooltips" c:identifier="gtk_toolbar_get_tooltips">
+      <method name="move_visually" c:identifier="gtk_text_view_move_visually">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tooltips" c:identifier="gtk_toolbar_set_tooltips">
+      <method name="add_child_at_anchor"
+              c:identifier="gtk_text_view_add_child_at_anchor">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="enable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="anchor">
+            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_style" c:identifier="gtk_toolbar_get_style">
+      <method name="add_child_in_window"
+              c:identifier="gtk_text_view_add_child_in_window">
         <return-value>
-          <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="which_window">
+            <type name="TextWindowType" c:type="GtkTextWindowType"/>
+          </parameter>
+          <parameter name="xpos">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="ypos">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_style" c:identifier="gtk_toolbar_set_style">
+      <method name="move_child" c:identifier="gtk_text_view_move_child">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="style">
-            <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="xpos">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="ypos">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unset_style" c:identifier="gtk_toolbar_unset_style">
+      <method name="set_wrap_mode" c:identifier="gtk_text_view_set_wrap_mode">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="wrap_mode">
+            <type name="WrapMode" c:type="GtkWrapMode"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_icon_size" c:identifier="gtk_toolbar_get_icon_size">
+      <method name="get_wrap_mode" c:identifier="gtk_text_view_get_wrap_mode">
         <return-value>
-          <type name="IconSize" c:type="GtkIconSize"/>
+          <type name="WrapMode" c:type="GtkWrapMode"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_relief_style"
-              c:identifier="gtk_toolbar_get_relief_style">
+      <method name="set_editable" c:identifier="gtk_text_view_set_editable">
         <return-value>
-          <type name="ReliefStyle" c:type="GtkReliefStyle"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_drop_index" c:identifier="gtk_toolbar_get_drop_index">
+      <method name="get_editable" c:identifier="gtk_text_view_get_editable">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_drop_highlight_item"
-              c:identifier="gtk_toolbar_set_drop_highlight_item">
+      <method name="set_overwrite" c:identifier="gtk_text_view_set_overwrite">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="tool_item" allow-none="1">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="overwrite">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="index_">
-            <type name="int32" c:type="gint"/>
+        </parameters>
+      </method>
+      <method name="get_overwrite" c:identifier="gtk_text_view_get_overwrite">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_icon_size" c:identifier="gtk_toolbar_set_icon_size">
+      <method name="set_accepts_tab"
+              c:identifier="gtk_text_view_set_accepts_tab">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="icon_size">
-            <type name="IconSize" c:type="GtkIconSize"/>
+          <parameter name="accepts_tab">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unset_icon_size"
-              c:identifier="gtk_toolbar_unset_icon_size">
+      <method name="get_accepts_tab"
+              c:identifier="gtk_text_view_get_accepts_tab">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="append_item" c:identifier="gtk_toolbar_append_item">
+      <method name="set_pixels_above_lines"
+              c:identifier="gtk_text_view_set_pixels_above_lines">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_text">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_private_text">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="icon">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="user_data" allow-none="1">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="pixels_above_lines">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="prepend_item" c:identifier="gtk_toolbar_prepend_item">
+      <method name="get_pixels_above_lines"
+              c:identifier="gtk_text_view_get_pixels_above_lines">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_text">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_private_text">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="icon">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_item" c:identifier="gtk_toolbar_insert_item">
+      <method name="set_pixels_below_lines"
+              c:identifier="gtk_text_view_set_pixels_below_lines">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_text">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_private_text">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="icon">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="position">
+          <parameter name="pixels_below_lines">
             <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_stock" c:identifier="gtk_toolbar_insert_stock">
+      <method name="get_pixels_below_lines"
+              c:identifier="gtk_text_view_get_pixels_below_lines">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="stock_id">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="tooltip_text">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_private_text">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+        </parameters>
+      </method>
+      <method name="set_pixels_inside_wrap"
+              c:identifier="gtk_text_view_set_pixels_inside_wrap">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="position">
+          <parameter name="pixels_inside_wrap">
             <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="append_space" c:identifier="gtk_toolbar_append_space">
+      <method name="get_pixels_inside_wrap"
+              c:identifier="gtk_text_view_get_pixels_inside_wrap">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="prepend_space" c:identifier="gtk_toolbar_prepend_space">
+      <method name="set_justification"
+              c:identifier="gtk_text_view_set_justification">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="justification">
+            <type name="Justification" c:type="GtkJustification"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_space" c:identifier="gtk_toolbar_insert_space">
+      <method name="get_justification"
+              c:identifier="gtk_text_view_get_justification">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Justification" c:type="GtkJustification"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_space" c:identifier="gtk_toolbar_remove_space">
+      <method name="set_left_margin"
+              c:identifier="gtk_text_view_set_left_margin">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="position">
+          <parameter name="left_margin">
             <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="append_element" c:identifier="gtk_toolbar_append_element">
+      <method name="get_left_margin"
+              c:identifier="gtk_text_view_get_left_margin">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="ToolbarChildType" c:type="GtkToolbarChildType"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_text">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_private_text">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="icon">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="prepend_element"
-              c:identifier="gtk_toolbar_prepend_element">
+      <method name="set_right_margin"
+              c:identifier="gtk_text_view_set_right_margin">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="ToolbarChildType" c:type="GtkToolbarChildType"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_text">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_private_text">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="icon">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="right_margin">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_element" c:identifier="gtk_toolbar_insert_element">
+      <method name="get_right_margin"
+              c:identifier="gtk_text_view_get_right_margin">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="ToolbarChildType" c:type="GtkToolbarChildType"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_text">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_private_text">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="icon">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="append_widget" c:identifier="gtk_toolbar_append_widget">
+      <method name="set_indent" c:identifier="gtk_text_view_set_indent">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="tooltip_text" allow-none="1">
-            <type name="string" c:type="char*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="tooltip_private_text" allow-none="1">
-            <type name="string" c:type="char*"/>
+          <parameter name="indent">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="prepend_widget" c:identifier="gtk_toolbar_prepend_widget">
+      <method name="get_indent" c:identifier="gtk_text_view_get_indent">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="tooltip_text" allow-none="1">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="tooltip_private_text" allow-none="1">
-            <type name="string" c:type="char*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_widget" c:identifier="gtk_toolbar_insert_widget">
+      <method name="set_tabs" c:identifier="gtk_text_view_set_tabs">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="tooltip_text" allow-none="1">
-            <type name="string" c:type="char*"/>
+          <parameter name="tabs">
+            <type name="PangoTabArray" c:type="PangoTabArray*"/>
           </parameter>
-          <parameter name="tooltip_private_text" allow-none="1">
-            <type name="string" c:type="char*"/>
+        </parameters>
+      </method>
+      <method name="get_tabs" c:identifier="gtk_text_view_get_tabs">
+        <return-value>
+          <type name="PangoTabArray" c:type="PangoTabArray*"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
+        </parameters>
+      </method>
+      <method name="get_default_attributes"
+              c:identifier="gtk_text_view_get_default_attributes">
+        <return-value>
+          <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="orientation">
-        <type name="Orientation" c:type="GtkOrientation"/>
+      <property name="pixels-above-lines">
+        <type name="int32" c:type="gint"/>
       </property>
-      <property name="toolbar-style">
-        <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
+      <property name="pixels-below-lines">
+        <type name="int32" c:type="gint"/>
       </property>
-      <property name="show-arrow">
+      <property name="pixels-inside-wrap">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="editable">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="tooltips">
+      <property name="wrap-mode">
+        <type name="WrapMode" c:type="GtkWrapMode"/>
+      </property>
+      <property name="justification">
+        <type name="Justification" c:type="GtkJustification"/>
+      </property>
+      <property name="left-margin">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="right-margin">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="indent">
+        <type name="int32" c:type="gint"/>
+      </property>
+      <property name="tabs">
+        <type name="PangoTabArray" c:type="PangoTabArray"/>
+      </property>
+      <property name="cursor-visible">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="icon-size">
-        <type name="IconSize" c:type="GtkIconSize"/>
+      <property name="buffer">
+        <type name="TextBuffer" c:type="GtkTextBuffer"/>
       </property>
-      <property name="icon-size-set">
+      <property name="overwrite">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <callback name="orientation_changed">
+      <property name="accepts-tab">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="set_scroll_adjustments">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="orientation">
-            <type name="Orientation" c:type="GtkOrientation"/>
+          <parameter name="hadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+          <parameter name="vadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="style_changed">
+      <callback name="populate_popup">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="style">
-            <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="popup_context_menu">
+      <callback name="move_cursor">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toolbar">
-            <type name="Toolbar" c:type="GtkToolbar*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
+          <parameter name="step">
+            <type name="MovementStep" c:type="GtkMovementStep"/>
           </parameter>
-          <parameter name="y">
+          <parameter name="count">
             <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="button_number">
-            <type name="int32" c:type="gint"/>
+          <parameter name="extend_selection">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="page_horizontally">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="extend_selection">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
       </callback>
-      <glib:signal name="orientation-changed">
+      <callback name="set_anchor">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Orientation" c:type="GtkOrientation"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="style-changed">
+      </callback>
+      <callback name="insert_at_cursor">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="str">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="popup-context-menu">
+      </callback>
+      <callback name="delete_from_cursor">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="int32" c:type="gint"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="int32" c:type="gint"/>
+          <parameter name="type">
+            <type name="DeleteType" c:type="GtkDeleteType"/>
           </parameter>
-          <parameter name="p1">
+          <parameter name="count">
             <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="focus-home-or-end">
+      </callback>
+      <callback name="backspace">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <function name="toolbar_new" c:identifier="gtk_toolbar_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="toolbar_elide_underscores"
-              c:identifier="_gtk_toolbar_elide_underscores">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="original">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="toolbar_paint_space_line"
-              c:identifier="_gtk_toolbar_paint_space_line">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="toolbar">
-          <type name="Toolbar" c:type="GtkToolbar*"/>
-        </parameter>
-        <parameter name="area">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </parameter>
-        <parameter name="allocation">
-          <type name="GtkAllocation" c:type="GtkAllocation*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="toolbar_get_default_space_size"
-              c:identifier="_gtk_toolbar_get_default_space_size">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-    </function>
-    <function name="toolbar_rebuild_menu"
-              c:identifier="_gtk_toolbar_rebuild_menu">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="toolbar">
-          <type name="Toolbar" c:type="GtkToolbar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkTreeDragSource" c:type="GtkTreeDragSource"/>
-    <interface name="TreeDragSource"
-               c:type="GtkTreeDragSource"
-               glib:type-name="GtkTreeDragSource"
-               glib:get-type="gtk_tree_drag_source_get_type">
-      <callback name="row_draggable">
+      </callback>
+      <callback name="cut_clipboard">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="drag_source">
-            <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="drag_data_get">
+      <callback name="copy_clipboard">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="drag_source">
-            <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="selection_data">
-            <type name="SelectionData" c:type="GtkSelectionData*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="drag_data_delete">
+      <callback name="paste_clipboard">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="drag_source">
-            <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </callback>
-    </interface>
-    <function name="tree_drag_source_row_draggable"
-              c:identifier="gtk_tree_drag_source_row_draggable">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="drag_source">
-          <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_drag_source_drag_data_delete"
-              c:identifier="gtk_tree_drag_source_drag_data_delete">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="drag_source">
-          <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_drag_source_drag_data_get"
-              c:identifier="gtk_tree_drag_source_drag_data_get">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="drag_source">
-          <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </parameter>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkTreeDragDest" c:type="GtkTreeDragDest"/>
-    <interface name="TreeDragDest"
-               c:type="GtkTreeDragDest"
-               glib:type-name="GtkTreeDragDest"
-               glib:get-type="gtk_tree_drag_dest_get_type">
-      <callback name="drag_data_received">
+      <callback name="toggle_overwrite">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="drag_dest">
-            <type name="TreeDragDest" c:type="GtkTreeDragDest*"/>
-          </parameter>
-          <parameter name="dest">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="selection_data">
-            <type name="SelectionData" c:type="GtkSelectionData*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="row_drop_possible">
+      <callback name="move_focus">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="drag_dest">
-            <type name="TreeDragDest" c:type="GtkTreeDragDest*"/>
-          </parameter>
-          <parameter name="dest_path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
-          <parameter name="selection_data">
-            <type name="SelectionData" c:type="GtkSelectionData*"/>
+          <parameter name="direction">
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
       </callback>
-    </interface>
-    <function name="tree_drag_dest_drag_data_received"
-              c:identifier="gtk_tree_drag_dest_drag_data_received">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="drag_dest">
-          <type name="TreeDragDest" c:type="GtkTreeDragDest*"/>
-        </parameter>
-        <parameter name="dest">
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </parameter>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_drag_dest_row_drop_possible"
-              c:identifier="gtk_tree_drag_dest_row_drop_possible">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="drag_dest">
-          <type name="TreeDragDest" c:type="GtkTreeDragDest*"/>
-        </parameter>
-        <parameter name="dest_path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </parameter>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_set_row_drag_data"
-              c:identifier="gtk_tree_set_row_drag_data">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_get_row_drag_data"
-              c:identifier="gtk_tree_get_row_drag_data">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel**"/>
-        </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="TreeModelSort"
-           c:type="GtkTreeModelSort"
-           parent="GObject.Object"
-           glib:type-name="GtkTreeModelSort"
-           glib:get-type="gtk_tree_model_sort_get_type">
-      <method name="get_model" c:identifier="gtk_tree_model_sort_get_model">
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved6">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved7">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="move-cursor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="MovementStep" c:type="GtkMovementStep"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="copy-clipboard">
         <return-value>
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="populate-popup">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model">
-            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          <parameter name="object">
+            <type name="Menu" c:type="GtkMenu"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="convert_child_path_to_path"
-              c:identifier="gtk_tree_model_sort_convert_child_path_to_path">
+      </glib:signal>
+      <glib:signal name="insert-at-cursor">
         <return-value>
-          <type name="TreePath" c:type="GtkTreePath*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model_sort">
-            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
           </parameter>
-          <parameter name="child_path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="delete-from-cursor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="DeleteType" c:type="GtkDeleteType"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="convert_child_iter_to_iter"
-              c:identifier="gtk_tree_model_sort_convert_child_iter_to_iter">
+      </glib:signal>
+      <glib:signal name="backspace">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="cut-clipboard">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="paste-clipboard">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="toggle-overwrite">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="set-scroll-adjustments">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model_sort">
-            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          <parameter name="object">
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
-          <parameter name="sort_iter" allow-none="1">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="p0">
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
-          <parameter name="child_iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="select-all">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="convert_path_to_child_path"
-              c:identifier="gtk_tree_model_sort_convert_path_to_child_path">
+      </glib:signal>
+      <glib:signal name="page-horizontally">
         <return-value>
-          <type name="TreePath" c:type="GtkTreePath*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model_sort">
-            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          <parameter name="object">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="sorted_path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="p0">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="convert_iter_to_child_iter"
-              c:identifier="gtk_tree_model_sort_convert_iter_to_child_iter">
+      </glib:signal>
+      <glib:signal name="move-viewport">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model_sort">
-            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          <parameter name="object">
+            <type name="ScrollStep" c:type="GtkScrollStep"/>
           </parameter>
-          <parameter name="child_iter" allow-none="1">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="p0">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="sorted_iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="set-anchor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="toggle-cursor-visible">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="text_view_new" c:identifier="gtk_text_view_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="text_view_new_with_buffer"
+              c:identifier="gtk_text_view_new_with_buffer">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="buffer">
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkTipsQuery" c:type="GtkTipsQuery">
+      <field name="label">
+        <type name="Label" c:type="GtkLabel"/>
+      </field>
+      <field name="emit_always">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="in_query">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="label_inactive">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="label_no_tip">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="caller">
+        <type name="Widget" c:type="GtkWidget*"/>
+      </field>
+      <field name="last_crossed">
+        <type name="Widget" c:type="GtkWidget*"/>
+      </field>
+      <field name="query_cursor">
+        <type name="GdkCursor" c:type="GdkCursor*"/>
+      </field>
+    </record>
+    <record name="GtkTipsQueryClass" c:type="GtkTipsQueryClass">
+      <field name="parent_class">
+        <type name="GtkLabelClass" c:type="GtkLabelClass"/>
+      </field>
+      <callback name="start_query">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tips_query">
+            <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="reset_default_sort_func"
-              c:identifier="gtk_tree_model_sort_reset_default_sort_func">
+      </callback>
+      <callback name="stop_query">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model_sort">
-            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          <parameter name="tips_query">
+            <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="clear_cache"
-              c:identifier="gtk_tree_model_sort_clear_cache">
+      </callback>
+      <callback name="widget_entered">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model_sort">
-            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          <parameter name="tips_query">
+            <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="tip_text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="tip_private">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="iter_is_valid"
-              c:identifier="gtk_tree_model_sort_iter_is_valid">
+      </callback>
+      <callback name="widget_selected">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model_sort">
-            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
+          <parameter name="tips_query">
+            <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="tip_text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="tip_private">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.GdkEventButton" c:type="GdkEventButton*"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="model">
-        <type name="TreeModel" c:type="GtkTreeModel"/>
-      </property>
+      </callback>
       <callback name="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
@@ -63929,744 +61237,715 @@
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-    </class>
-    <function name="tree_model_sort_new_with_model"
-              c:identifier="gtk_tree_model_sort_new_with_model">
+    </record>
+    <function name="tips_query_get_type"
+              c:identifier="gtk_tips_query_get_type">
       <return-value>
-        <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <type name="GtkType" c:type="GtkType"/>
+      </return-value>
+    </function>
+    <function name="tips_query_new" c:identifier="gtk_tips_query_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="tips_query_start_query"
+              c:identifier="gtk_tips_query_start_query">
+      <return-value>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="child_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="tips_query">
+          <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
         </parameter>
       </parameters>
     </function>
-    <callback name="GtkTreeSelectionFunc">
+    <function name="tips_query_stop_query"
+              c:identifier="gtk_tips_query_stop_query">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="selection">
-          <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-        </parameter>
-        <parameter name="model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
+        <parameter name="tips_query">
+          <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
         </parameter>
-        <parameter name="path_currently_selected">
-          <type name="boolean" c:type="gboolean"/>
+      </parameters>
+    </function>
+    <function name="tips_query_set_caller"
+              c:identifier="gtk_tips_query_set_caller">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="tips_query">
+          <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
         </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="caller">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
-    </callback>
-    <callback name="GtkTreeSelectionForeachFunc">
+    </function>
+    <function name="tips_query_set_labels"
+              c:identifier="gtk_tips_query_set_labels">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
+        <parameter name="tips_query">
+          <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="label_inactive">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="label_no_tip">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
-    </callback>
-    <class name="TreeSelection"
-           c:type="GtkTreeSelection"
-           parent="GObject.Object"
-           glib:type-name="GtkTreeSelection"
-           glib:get-type="gtk_tree_selection_get_type">
-      <method name="set_mode" c:identifier="gtk_tree_selection_set_mode">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="SelectionMode" c:type="GtkSelectionMode"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_mode" c:identifier="gtk_tree_selection_get_mode">
-        <return-value>
-          <type name="SelectionMode" c:type="GtkSelectionMode"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_select_function"
-              c:identifier="gtk_tree_selection_set_select_function">
+    </function>
+    <record name="GtkToolbarChild" c:type="GtkToolbarChild">
+      <field name="type">
+        <type name="ToolbarChildType" c:type="GtkToolbarChildType"/>
+      </field>
+      <field name="widget">
+        <type name="Widget" c:type="GtkWidget*"/>
+      </field>
+      <field name="icon">
+        <type name="Widget" c:type="GtkWidget*"/>
+      </field>
+      <field name="label">
+        <type name="Widget" c:type="GtkWidget*"/>
+      </field>
+    </record>
+    <record name="GtkToolbarPrivate" c:type="GtkToolbarPrivate"/>
+    <class name="Toolbar"
+           c:type="GtkToolbar"
+           parent="Container"
+           glib:type-name="GtkToolbar"
+           glib:get-type="gtk_toolbar_get_type">
+      <method name="insert" c:identifier="gtk_toolbar_insert">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTreeSelectionFunc" c:type="GtkTreeSelectionFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-          <parameter name="destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_user_data"
-              c:identifier="gtk_tree_selection_get_user_data">
-        <return-value>
-          <type name="any" c:type="gpointer"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_tree_view"
-              c:identifier="gtk_tree_selection_get_tree_view">
-        <return-value>
-          <type name="TreeView" c:type="GtkTreeView*"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_selected"
-              c:identifier="gtk_tree_selection_get_selected">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="model">
-            <type name="TreeModel" c:type="GtkTreeModel**"/>
+          <parameter name="item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="pos">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_selected_rows"
-              c:identifier="gtk_tree_selection_get_selected_rows">
+      <method name="get_item_index" c:identifier="gtk_toolbar_get_item_index">
         <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="model">
-            <type name="TreeModel" c:type="GtkTreeModel**"/>
+          <parameter name="item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="count_selected_rows"
-              c:identifier="gtk_tree_selection_count_selected_rows">
+      <method name="get_n_items" c:identifier="gtk_toolbar_get_n_items">
         <return-value>
           <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="selected_foreach"
-              c:identifier="gtk_tree_selection_selected_foreach">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTreeSelectionForeachFunc"
-                  c:type="GtkTreeSelectionForeachFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="select_path" c:identifier="gtk_tree_selection_select_path">
+      <method name="get_nth_item" c:identifier="gtk_toolbar_get_nth_item">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="ToolItem" c:type="GtkToolItem*"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="n">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unselect_path"
-              c:identifier="gtk_tree_selection_unselect_path">
+      <method name="get_show_arrow" c:identifier="gtk_toolbar_get_show_arrow">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="select_iter" c:identifier="gtk_tree_selection_select_iter">
+      <method name="set_show_arrow" c:identifier="gtk_toolbar_set_show_arrow">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="show_arrow">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unselect_iter"
-              c:identifier="gtk_tree_selection_unselect_iter">
+      <method name="get_orientation"
+              c:identifier="gtk_toolbar_get_orientation">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Orientation" c:type="GtkOrientation"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="path_is_selected"
-              c:identifier="gtk_tree_selection_path_is_selected">
+      <method name="set_orientation"
+              c:identifier="gtk_toolbar_set_orientation">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="orientation">
+            <type name="Orientation" c:type="GtkOrientation"/>
           </parameter>
         </parameters>
       </method>
-      <method name="iter_is_selected"
-              c:identifier="gtk_tree_selection_iter_is_selected">
+      <method name="get_tooltips" c:identifier="gtk_toolbar_get_tooltips">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="select_all" c:identifier="gtk_tree_selection_select_all">
+      <method name="set_tooltips" c:identifier="gtk_toolbar_set_tooltips">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
+          </parameter>
+          <parameter name="enable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unselect_all"
-              c:identifier="gtk_tree_selection_unselect_all">
+      <method name="get_style" c:identifier="gtk_toolbar_get_style">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="select_range"
-              c:identifier="gtk_tree_selection_select_range">
+      <method name="set_style" c:identifier="gtk_toolbar_set_style">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="start_path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="end_path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="style">
+            <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unselect_range"
-              c:identifier="gtk_tree_selection_unselect_range">
+      <method name="unset_style" c:identifier="gtk_toolbar_unset_style">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="start_path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="end_path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
         </parameters>
       </method>
-      <callback name="changed">
+      <method name="get_icon_size" c:identifier="gtk_toolbar_get_icon_size">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="IconSize" c:type="GtkIconSize"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <class name="TreeStore"
-           c:type="GtkTreeStore"
-           parent="GObject.Object"
-           glib:type-name="GtkTreeStore"
-           glib:get-type="gtk_tree_store_get_type">
-      <constructor name="new" c:identifier="gtk_tree_store_new">
+      </method>
+      <method name="get_relief_style"
+              c:identifier="gtk_toolbar_get_relief_style">
         <return-value>
-          <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <type name="ReliefStyle" c:type="GtkReliefStyle"/>
         </return-value>
         <parameters>
-          <parameter name="n_columns">
-            <type name="int32" c:type="gint"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="newv" c:identifier="gtk_tree_store_newv">
+      </method>
+      <method name="get_drop_index" c:identifier="gtk_toolbar_get_drop_index">
         <return-value>
-          <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="n_columns">
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
+          </parameter>
+          <parameter name="x">
             <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="types">
-            <type name="GObject.GType" c:type="GType*"/>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="set_column_types"
-              c:identifier="gtk_tree_store_set_column_types">
+      </method>
+      <method name="set_drop_highlight_item"
+              c:identifier="gtk_toolbar_set_drop_highlight_item">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="n_columns">
-            <type name="int32" c:type="gint"/>
+          <parameter name="tool_item" allow-none="1">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="types">
-            <type name="GObject.GType" c:type="GType*"/>
+          <parameter name="index_">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_value" c:identifier="gtk_tree_store_set_value">
+      <method name="set_icon_size" c:identifier="gtk_toolbar_set_icon_size">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="int32" c:type="gint"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="value">
-            <type name="GObject.GValue" c:type="GValue*"/>
+          <parameter name="icon_size">
+            <type name="IconSize" c:type="GtkIconSize"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set" c:identifier="gtk_tree_store_set">
+      <method name="unset_icon_size"
+              c:identifier="gtk_toolbar_unset_icon_size">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_valuesv" c:identifier="gtk_tree_store_set_valuesv">
+      <method name="append_item" c:identifier="gtk_toolbar_append_item">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="text">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="columns">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="tooltip_text">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="values">
-            <type name="GObject.GValue" c:type="GValue*"/>
+          <parameter name="tooltip_private_text">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="n_values">
-            <type name="int32" c:type="gint"/>
+          <parameter name="icon">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+          </parameter>
+          <parameter name="user_data" allow-none="1">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_valist" c:identifier="gtk_tree_store_set_valist">
+      <method name="prepend_item" c:identifier="gtk_toolbar_prepend_item">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="tooltip_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="tooltip_private_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="icon">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
           </parameter>
-          <parameter name="var_args">
-            <type name="va_list" c:type="va_list"/>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove" c:identifier="gtk_tree_store_remove">
+      <method name="insert_item" c:identifier="gtk_toolbar_insert_item">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="tooltip_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="tooltip_private_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="icon">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert" c:identifier="gtk_tree_store_insert">
+      <method name="insert_stock" c:identifier="gtk_toolbar_insert_stock">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="parent">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="tooltip_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="tooltip_private_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="position">
             <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_before" c:identifier="gtk_tree_store_insert_before">
+      <method name="append_space" c:identifier="gtk_toolbar_append_space">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="parent">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="sibling">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_after" c:identifier="gtk_tree_store_insert_after">
+      <method name="prepend_space" c:identifier="gtk_toolbar_prepend_space">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="parent">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="sibling">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_with_values"
-              c:identifier="gtk_tree_store_insert_with_values">
+      <method name="insert_space" c:identifier="gtk_toolbar_insert_space">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="parent">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
           <parameter name="position">
             <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_with_valuesv"
-              c:identifier="gtk_tree_store_insert_with_valuesv">
+      <method name="remove_space" c:identifier="gtk_toolbar_remove_space">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="parent">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
           <parameter name="position">
             <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="columns">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="values">
-            <type name="GObject.GValue" c:type="GValue*"/>
-          </parameter>
-          <parameter name="n_values">
-            <type name="int32" c:type="gint"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="prepend" c:identifier="gtk_tree_store_prepend">
+      <method name="append_element" c:identifier="gtk_toolbar_append_element">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="type">
+            <type name="ToolbarChildType" c:type="GtkToolbarChildType"/>
           </parameter>
-          <parameter name="parent">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="append" c:identifier="gtk_tree_store_append">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <parameter name="text">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="tooltip_text">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="parent">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="tooltip_private_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="icon">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="is_ancestor" c:identifier="gtk_tree_store_is_ancestor">
+      <method name="prepend_element"
+              c:identifier="gtk_toolbar_prepend_element">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="type">
+            <type name="ToolbarChildType" c:type="GtkToolbarChildType"/>
           </parameter>
-          <parameter name="descendant">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="tooltip_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="tooltip_private_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="icon">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="iter_depth" c:identifier="gtk_tree_store_iter_depth">
+      <method name="insert_element" c:identifier="gtk_toolbar_insert_element">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="type">
+            <type name="ToolbarChildType" c:type="GtkToolbarChildType"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="tooltip_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="tooltip_private_text">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="icon">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="clear" c:identifier="gtk_tree_store_clear">
+      <method name="append_widget" c:identifier="gtk_toolbar_append_widget">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="tooltip_text" allow-none="1">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="tooltip_private_text" allow-none="1">
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="iter_is_valid" c:identifier="gtk_tree_store_iter_is_valid">
+      <method name="prepend_widget" c:identifier="gtk_toolbar_prepend_widget">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="tooltip_text" allow-none="1">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="tooltip_private_text" allow-none="1">
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="reorder" c:identifier="gtk_tree_store_reorder">
+      <method name="insert_widget" c:identifier="gtk_toolbar_insert_widget">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="parent">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="tooltip_text" allow-none="1">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="tooltip_private_text" allow-none="1">
+            <type name="string" c:type="char*"/>
           </parameter>
-          <parameter name="new_order">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="swap" c:identifier="gtk_tree_store_swap">
+      <property name="orientation">
+        <type name="Orientation" c:type="GtkOrientation"/>
+      </property>
+      <property name="toolbar-style">
+        <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
+      </property>
+      <property name="show-arrow">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="tooltips">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="icon-size">
+        <type name="IconSize" c:type="GtkIconSize"/>
+      </property>
+      <property name="icon-size-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="orientation_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="a">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="b">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="orientation">
+            <type name="Orientation" c:type="GtkOrientation"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="move_before" c:identifier="gtk_tree_store_move_before">
+      </callback>
+      <callback name="style_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="position" allow-none="1">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="style">
+            <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="move_after" c:identifier="gtk_tree_store_move_after">
+      </callback>
+      <callback name="popup_context_menu">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_store">
-            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="x">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="position" allow-none="1">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="y">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="button_number">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
+      </callback>
       <callback name="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
@@ -64682,483 +61961,421 @@
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-    </class>
-    <record name="GtkUIManagerPrivate" c:type="GtkUIManagerPrivate"/>
-    <class name="UIManager"
-           c:type="GtkUIManager"
-           parent="GObject.Object"
-           glib:type-name="GtkUIManager"
-           glib:get-type="gtk_ui_manager_get_type">
-      <constructor name="new" c:identifier="gtk_ui_manager_new">
-        <return-value>
-          <type name="UIManager" c:type="GtkUIManager*"/>
-        </return-value>
-      </constructor>
-      <method name="set_add_tearoffs"
-              c:identifier="gtk_ui_manager_set_add_tearoffs">
+      <glib:signal name="orientation-changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
-          </parameter>
-          <parameter name="add_tearoffs">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_add_tearoffs"
-              c:identifier="gtk_ui_manager_get_add_tearoffs">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="object">
+            <type name="Orientation" c:type="GtkOrientation"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="insert_action_group"
-              c:identifier="gtk_ui_manager_insert_action_group">
+      </glib:signal>
+      <glib:signal name="style-changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
-          </parameter>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
-          </parameter>
-          <parameter name="pos">
-            <type name="int32" c:type="gint"/>
+          <parameter name="object">
+            <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="remove_action_group"
-              c:identifier="gtk_ui_manager_remove_action_group">
+      </glib:signal>
+      <glib:signal name="popup-context-menu">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="object">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
+          <parameter name="p0">
+            <type name="int32" c:type="gint"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_action_groups"
-              c:identifier="gtk_ui_manager_get_action_groups">
-        <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="p1">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_accel_group"
-              c:identifier="gtk_ui_manager_get_accel_group">
+      </glib:signal>
+      <glib:signal name="focus-home-or-end">
         <return-value>
-          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="object">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_widget" c:identifier="gtk_ui_manager_get_widget">
-        <return-value>
+      </glib:signal>
+    </class>
+    <function name="toolbar_new" c:identifier="gtk_toolbar_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="toolbar_elide_underscores"
+              c:identifier="_gtk_toolbar_elide_underscores">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="original">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="toolbar_paint_space_line"
+              c:identifier="_gtk_toolbar_paint_space_line">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
           <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_toplevels" c:identifier="gtk_ui_manager_get_toplevels">
-        <return-value>
-          <type name="GLib.GSList" c:type="GSList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
-          </parameter>
-          <parameter name="types">
-            <type name="UIManagerItemType" c:type="GtkUIManagerItemType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_action" c:identifier="gtk_ui_manager_get_action">
+        </parameter>
+        <parameter name="toolbar">
+          <type name="Toolbar" c:type="GtkToolbar*"/>
+        </parameter>
+        <parameter name="area">
+          <type name="GdkRectangle" c:type="GdkRectangle*"/>
+        </parameter>
+        <parameter name="allocation">
+          <type name="GtkAllocation" c:type="GtkAllocation*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="toolbar_get_default_space_size"
+              c:identifier="_gtk_toolbar_get_default_space_size">
+      <return-value>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+    </function>
+    <function name="toolbar_rebuild_menu"
+              c:identifier="_gtk_toolbar_rebuild_menu">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="toolbar">
+          <type name="Toolbar" c:type="GtkToolbar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkTreeDragSource" c:type="GtkTreeDragSource"/>
+    <interface name="TreeDragSource"
+               c:type="GtkTreeDragSource"
+               glib:type-name="GtkTreeDragSource"
+               glib:get-type="gtk_tree_drag_source_get_type">
+      <callback name="row_draggable">
         <return-value>
-          <type name="Action" c:type="GtkAction*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="drag_source">
+            <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
           </parameter>
           <parameter name="path">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_ui_from_string"
-              c:identifier="gtk_ui_manager_add_ui_from_string">
-        <return-value>
-          <type name="uint32" c:type="guint"/>
-        </return-value>
-        <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
-          </parameter>
-          <parameter name="buffer">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="length">
-            <type name="ssize" c:type="gssize"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="add_ui_from_file"
-              c:identifier="gtk_ui_manager_add_ui_from_file">
+      </callback>
+      <callback name="drag_data_get">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="drag_source">
+            <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
           </parameter>
-          <parameter name="filename">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="selection_data">
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="add_ui" c:identifier="gtk_ui_manager_add_ui">
+      </callback>
+      <callback name="drag_data_delete">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
-          </parameter>
-          <parameter name="merge_id">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="drag_source">
+            <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
           </parameter>
           <parameter name="path">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="action" allow-none="1">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="UIManagerItemType" c:type="GtkUIManagerItemType"/>
-          </parameter>
-          <parameter name="top">
-            <type name="boolean" c:type="gboolean"/>
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="remove_ui" c:identifier="gtk_ui_manager_remove_ui">
+      </callback>
+    </interface>
+    <function name="tree_drag_source_row_draggable"
+              c:identifier="gtk_tree_drag_source_row_draggable">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="drag_source">
+          <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_drag_source_drag_data_delete"
+              c:identifier="gtk_tree_drag_source_drag_data_delete">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="drag_source">
+          <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_drag_source_drag_data_get"
+              c:identifier="gtk_tree_drag_source_drag_data_get">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="drag_source">
+          <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="GtkTreeDragDest" c:type="GtkTreeDragDest"/>
+    <interface name="TreeDragDest"
+               c:type="GtkTreeDragDest"
+               glib:type-name="GtkTreeDragDest"
+               glib:get-type="gtk_tree_drag_dest_get_type">
+      <callback name="drag_data_received">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
-          </parameter>
-          <parameter name="merge_id">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="drag_dest">
+            <type name="TreeDragDest" c:type="GtkTreeDragDest*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_ui" c:identifier="gtk_ui_manager_get_ui">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="dest">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="ensure_update" c:identifier="gtk_ui_manager_ensure_update">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="selection_data">
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="new_merge_id" c:identifier="gtk_ui_manager_new_merge_id">
+      </callback>
+      <callback name="row_drop_possible">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="self">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="drag_dest">
+            <type name="TreeDragDest" c:type="GtkTreeDragDest*"/>
           </parameter>
-        </parameters>
-      </method>
-      <property name="add-tearoffs">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="ui">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <callback name="add_widget">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="merge">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="dest_path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="selection_data">
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="actions_changed">
+    </interface>
+    <function name="tree_drag_dest_drag_data_received"
+              c:identifier="gtk_tree_drag_dest_drag_data_received">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="drag_dest">
+          <type name="TreeDragDest" c:type="GtkTreeDragDest*"/>
+        </parameter>
+        <parameter name="dest">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_drag_dest_row_drop_possible"
+              c:identifier="gtk_tree_drag_dest_row_drop_possible">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="drag_dest">
+          <type name="TreeDragDest" c:type="GtkTreeDragDest*"/>
+        </parameter>
+        <parameter name="dest_path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_set_row_drag_data"
+              c:identifier="gtk_tree_set_row_drag_data">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        </parameter>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="tree_get_row_drag_data"
+              c:identifier="gtk_tree_get_row_drag_data">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        </parameter>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel**"/>
+        </parameter>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="TreeModelSort"
+           c:type="GtkTreeModelSort"
+           parent="GObject.Object"
+           glib:type-name="GtkTreeModelSort"
+           glib:get-type="gtk_tree_model_sort_get_type">
+      <method name="get_model" c:identifier="gtk_tree_model_sort_get_model">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </return-value>
         <parameters>
-          <parameter name="merge">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="tree_model">
+            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="connect_proxy">
+      </method>
+      <method name="convert_child_path_to_path"
+              c:identifier="gtk_tree_model_sort_convert_child_path_to_path">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </return-value>
         <parameters>
-          <parameter name="merge">
-            <type name="UIManager" c:type="GtkUIManager*"/>
-          </parameter>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
+          <parameter name="tree_model_sort">
+            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
           </parameter>
-          <parameter name="proxy">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="child_path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="disconnect_proxy">
+      </method>
+      <method name="convert_child_iter_to_iter"
+              c:identifier="gtk_tree_model_sort_convert_child_iter_to_iter">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="merge">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="tree_model_sort">
+            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
           </parameter>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
+          <parameter name="sort_iter" allow-none="1">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="proxy">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="child_iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="pre_activate">
+      </method>
+      <method name="convert_path_to_child_path"
+              c:identifier="gtk_tree_model_sort_convert_path_to_child_path">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </return-value>
         <parameters>
-          <parameter name="merge">
-            <type name="UIManager" c:type="GtkUIManager*"/>
+          <parameter name="tree_model_sort">
+            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
           </parameter>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
+          <parameter name="sorted_path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="post_activate">
+      </method>
+      <method name="convert_iter_to_child_iter"
+              c:identifier="gtk_tree_model_sort_convert_iter_to_child_iter">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="merge">
-            <type name="UIManager" c:type="GtkUIManager*"/>
-          </parameter>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_widget">
-        <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="manager">
-            <type name="UIManager" c:type="GtkUIManager*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_action">
-        <return-value>
-          <type name="Action" c:type="GtkAction*"/>
-        </return-value>
-        <parameters>
-          <parameter name="manager">
-            <type name="UIManager" c:type="GtkUIManager*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="tree_model_sort">
+            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="connect-proxy">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Action" c:type="GtkAction"/>
+          <parameter name="child_iter" allow-none="1">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="Widget" c:type="GtkWidget"/>
+          <parameter name="sorted_iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="disconnect-proxy">
+      </method>
+      <method name="reset_default_sort_func"
+              c:identifier="gtk_tree_model_sort_reset_default_sort_func">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Action" c:type="GtkAction"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="Widget" c:type="GtkWidget"/>
+          <parameter name="tree_model_sort">
+            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="pre-activate">
+      </method>
+      <method name="clear_cache"
+              c:identifier="gtk_tree_model_sort_clear_cache">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Action" c:type="GtkAction"/>
+          <parameter name="tree_model_sort">
+            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="post-activate">
+      </method>
+      <method name="iter_is_valid"
+              c:identifier="gtk_tree_model_sort_iter_is_valid">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Action" c:type="GtkAction"/>
+          <parameter name="tree_model_sort">
+            <type name="TreeModelSort" c:type="GtkTreeModelSort*"/>
           </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="add-widget">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Widget" c:type="GtkWidget"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="actions-changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <class name="VButtonBox"
-           c:type="GtkVButtonBox"
-           parent="ButtonBox"
-           glib:type-name="GtkVButtonBox"
-           glib:get-type="gtk_vbutton_box_get_type">
-    </class>
-    <function name="vbutton_box_new" c:identifier="gtk_vbutton_box_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="vbutton_box_get_spacing_default"
-              c:identifier="gtk_vbutton_box_get_spacing_default">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-    </function>
-    <function name="vbutton_box_set_spacing_default"
-              c:identifier="gtk_vbutton_box_set_spacing_default">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="spacing">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="vbutton_box_get_layout_default"
-              c:identifier="gtk_vbutton_box_get_layout_default">
-      <return-value>
-        <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
-      </return-value>
-    </function>
-    <function name="vbutton_box_set_layout_default"
-              c:identifier="gtk_vbutton_box_set_layout_default">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="layout">
-          <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="VolumeButton"
-           c:type="GtkVolumeButton"
-           parent="ScaleButton"
-           glib:type-name="GtkVolumeButton"
-           glib:get-type="gtk_volume_button_get_type">
+      </method>
+      <property name="model">
+        <type name="TreeModel" c:type="GtkTreeModel"/>
+      </property>
       <callback name="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
@@ -65180,1075 +62397,1094 @@
         </return-value>
       </callback>
     </class>
-    <function name="volume_button_new" c:identifier="gtk_volume_button_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <class name="VPaned"
-           c:type="GtkVPaned"
-           parent="Paned"
-           glib:type-name="GtkVPaned"
-           glib:get-type="gtk_vpaned_get_type">
-    </class>
-    <function name="vpaned_new" c:identifier="gtk_vpaned_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <class name="VRuler"
-           c:type="GtkVRuler"
-           parent="Ruler"
-           glib:type-name="GtkVRuler"
-           glib:get-type="gtk_vruler_get_type">
-    </class>
-    <function name="vruler_new" c:identifier="gtk_vruler_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <class name="VScale"
-           c:type="GtkVScale"
-           parent="Scale"
-           glib:type-name="GtkVScale"
-           glib:get-type="gtk_vscale_get_type">
-    </class>
-    <function name="vscale_new" c:identifier="gtk_vscale_new">
+    <function name="tree_model_sort_new_with_model"
+              c:identifier="gtk_tree_model_sort_new_with_model">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="TreeModel" c:type="GtkTreeModel*"/>
       </return-value>
       <parameters>
-        <parameter name="adjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        <parameter name="child_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="vscale_new_with_range"
-              c:identifier="gtk_vscale_new_with_range">
+    <callback name="GtkTreeSelectionFunc">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="min">
-          <type name="double" c:type="gdouble"/>
-        </parameter>
-        <parameter name="max">
-          <type name="double" c:type="gdouble"/>
+        <parameter name="selection">
+          <type name="TreeSelection" c:type="GtkTreeSelection*"/>
         </parameter>
-        <parameter name="step">
-          <type name="double" c:type="gdouble"/>
+        <parameter name="model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-      </parameters>
-    </function>
-    <class name="VSeparator"
-           c:type="GtkVSeparator"
-           parent="Separator"
-           glib:type-name="GtkVSeparator"
-           glib:get-type="gtk_vseparator_get_type">
-    </class>
-    <function name="vseparator_new" c:identifier="gtk_vseparator_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <record name="GtkIMContextInfo" c:type="GtkIMContextInfo">
-      <field name="context_id">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="context_name">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="domain">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="domain_dirname">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="default_locales">
-        <type name="string" c:type="gchar*"/>
-      </field>
-    </record>
-    <function name="im_module_list" c:identifier="_gtk_im_module_list">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="contexts">
-          <type name="GtkIMContextInfo" c:type="GtkIMContextInfo***"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
-        <parameter name="n_contexts">
-          <type name="GLib.guint" c:type="guint*"/>
+        <parameter name="path_currently_selected">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="im_module_create" c:identifier="_gtk_im_module_create">
-      <return-value>
-        <type name="IMContext" c:type="GtkIMContext*"/>
-      </return-value>
-      <parameters>
-        <parameter name="context_id">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="im_module_get_default_context_id"
-              c:identifier="_gtk_im_module_get_default_context_id">
+    </callback>
+    <callback name="GtkTreeSelectionForeachFunc">
       <return-value>
-        <type name="string" c:type="gchar*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="client_window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        <parameter name="model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="fnmatch" c:identifier="_gtk_fnmatch">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="pattern">
-          <type name="string" c:type="char*"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
-        <parameter name="string">
-          <type name="string" c:type="char*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
-        <parameter name="no_leading_period">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <record name="GtkTextLine" c:type="GtkTextLine"/>
-    <record name="GtkTextLineData" c:type="GtkTextLineData"/>
-    <record name="GtkTextLineDisplay" c:type="GtkTextLineDisplay">
-      <field name="layout">
-        <type name="Pango.Layout" c:type="PangoLayout*"/>
-      </field>
-      <field name="cursors">
-        <type name="GLib.GSList" c:type="GSList*"/>
-      </field>
-      <field name="shaped_objects">
-        <type name="GLib.GSList" c:type="GSList*"/>
-      </field>
-      <field name="direction">
-        <type name="TextDirection" c:type="GtkTextDirection"/>
-      </field>
-      <field name="width">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="total_width">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="height">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="x_offset">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="left_margin">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="right_margin">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="top_margin">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="bottom_margin">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="insert_index">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="size_only">
-        <type name="boolean" c:type="gboolean"/>
-      </field>
-      <field name="line">
-        <type name="GtkTextLine" c:type="GtkTextLine*"/>
-      </field>
-      <field name="pg_bg_color">
-        <type name="GdkColor" c:type="GdkColor*"/>
-      </field>
-      <field name="block_cursor">
-        <type name="GdkRectangle" c:type="GdkRectangle"/>
-      </field>
-      <field name="cursors_invalid">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="has_block_cursor">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="cursor_at_line_end">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GtkTextCursorDisplay" c:type="GtkTextCursorDisplay">
-      <field name="x">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="y">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="height">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="is_strong">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="is_weak">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GtkTextAttrAppearance" c:type="GtkTextAttrAppearance">
-      <field name="attr">
-        <type name="Pango.PangoAttribute" c:type="PangoAttribute"/>
-      </field>
-      <field name="appearance">
-        <type name="GtkTextAppearance" c:type="GtkTextAppearance"/>
-      </field>
-    </record>
-    <class name="TextLayout"
-           c:type="GtkTextLayout"
+    </callback>
+    <class name="TreeSelection"
+           c:type="GtkTreeSelection"
            parent="GObject.Object"
-           glib:type-name="GtkTextLayout"
-           glib:get-type="gtk_text_layout_get_type">
-      <constructor name="new" c:identifier="gtk_text_layout_new">
+           glib:type-name="GtkTreeSelection"
+           glib:get-type="gtk_tree_selection_get_type">
+      <method name="set_mode" c:identifier="gtk_tree_selection_set_mode">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="SelectionMode" c:type="GtkSelectionMode"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_mode" c:identifier="gtk_tree_selection_get_mode">
+        <return-value>
+          <type name="SelectionMode" c:type="GtkSelectionMode"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_select_function"
+              c:identifier="gtk_tree_selection_set_select_function">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="GtkTreeSelectionFunc" c:type="GtkTreeSelectionFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_user_data"
+              c:identifier="gtk_tree_selection_get_user_data">
+        <return-value>
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_tree_view"
+              c:identifier="gtk_tree_selection_get_tree_view">
+        <return-value>
+          <type name="TreeView" c:type="GtkTreeView*"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_selected"
+              c:identifier="gtk_tree_selection_get_selected">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="model">
+            <type name="TreeModel" c:type="GtkTreeModel**"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_selected_rows"
+              c:identifier="gtk_tree_selection_get_selected_rows">
         <return-value>
-          <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
-      </constructor>
-      <method name="set_buffer" c:identifier="gtk_text_layout_set_buffer">
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="model">
+            <type name="TreeModel" c:type="GtkTreeModel**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="count_selected_rows"
+              c:identifier="gtk_tree_selection_count_selected_rows">
+        <return-value>
+          <type name="int32" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="selected_foreach"
+              c:identifier="gtk_tree_selection_selected_foreach">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
-          <parameter name="buffer" allow-none="1">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="func">
+            <type name="GtkTreeSelectionForeachFunc"
+                  c:type="GtkTreeSelectionForeachFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_buffer" c:identifier="gtk_text_layout_get_buffer">
+      <method name="select_path" c:identifier="gtk_tree_selection_select_path">
         <return-value>
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_default_style"
-              c:identifier="gtk_text_layout_set_default_style">
+      <method name="unselect_path"
+              c:identifier="gtk_tree_selection_unselect_path">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
-          <parameter name="values">
-            <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_contexts" c:identifier="gtk_text_layout_set_contexts">
+      <method name="select_iter" c:identifier="gtk_tree_selection_select_iter">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-          <parameter name="ltr_context">
-            <type name="Pango.Context" c:type="PangoContext*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
-          <parameter name="rtl_context">
-            <type name="Pango.Context" c:type="PangoContext*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_cursor_direction"
-              c:identifier="gtk_text_layout_set_cursor_direction">
+      <method name="unselect_iter"
+              c:identifier="gtk_tree_selection_unselect_iter">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
-          <parameter name="direction">
-            <type name="TextDirection" c:type="GtkTextDirection"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_overwrite_mode"
-              c:identifier="gtk_text_layout_set_overwrite_mode">
+      <method name="path_is_selected"
+              c:identifier="gtk_tree_selection_path_is_selected">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
-          <parameter name="overwrite">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_keyboard_direction"
-              c:identifier="gtk_text_layout_set_keyboard_direction">
+      <method name="iter_is_selected"
+              c:identifier="gtk_tree_selection_iter_is_selected">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
-          <parameter name="keyboard_dir">
-            <type name="TextDirection" c:type="GtkTextDirection"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="default_style_changed"
-              c:identifier="gtk_text_layout_default_style_changed">
+      <method name="select_all" c:identifier="gtk_tree_selection_select_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_screen_width"
-              c:identifier="gtk_text_layout_set_screen_width">
+      <method name="unselect_all"
+              c:identifier="gtk_tree_selection_unselect_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="int32" c:type="gint"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_preedit_string"
-              c:identifier="gtk_text_layout_set_preedit_string">
+      <method name="select_range"
+              c:identifier="gtk_tree_selection_select_range">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-          <parameter name="preedit_string">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
-          <parameter name="preedit_attrs">
-            <type name="PangoAttrList" c:type="PangoAttrList*"/>
+          <parameter name="start_path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
-          <parameter name="cursor_pos">
-            <type name="int32" c:type="gint"/>
+          <parameter name="end_path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_cursor_visible"
-              c:identifier="gtk_text_layout_set_cursor_visible">
+      <method name="unselect_range"
+              c:identifier="gtk_tree_selection_unselect_range">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
-          <parameter name="cursor_visible">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="start_path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="end_path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_cursor_visible"
-              c:identifier="gtk_text_layout_get_cursor_visible">
+      <callback name="changed">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_size" c:identifier="gtk_text_layout_get_size">
+      </callback>
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+      </callback>
+      <glib:signal name="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <class name="TreeStore"
+           c:type="GtkTreeStore"
+           parent="GObject.Object"
+           glib:type-name="GtkTreeStore"
+           glib:get-type="gtk_tree_store_get_type">
+      <constructor name="new" c:identifier="gtk_tree_store_new">
+        <return-value>
+          <type name="TreeStore" c:type="GtkTreeStore*"/>
+        </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="n_columns">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="width">
-            <type name="GLib.gint" c:type="gint*"/>
+        </parameters>
+      </constructor>
+      <constructor name="newv" c:identifier="gtk_tree_store_newv">
+        <return-value>
+          <type name="TreeStore" c:type="GtkTreeStore*"/>
+        </return-value>
+        <parameters>
+          <parameter name="n_columns">
+            <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="height">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="types">
+            <type name="GObject.GType" c:type="GType*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_lines" c:identifier="gtk_text_layout_get_lines">
+      </constructor>
+      <method name="set_column_types"
+              c:identifier="gtk_tree_store_set_column_types">
         <return-value>
-          <type name="GLib.GSList" c:type="GSList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="top_y">
+          <parameter name="n_columns">
             <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="bottom_y">
+          <parameter name="types">
+            <type name="GObject.GType" c:type="GType*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_value" c:identifier="gtk_tree_store_set_value">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="column">
             <type name="int32" c:type="gint"/>
           </parameter>
-          <parameter name="first_line_y">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="value">
+            <type name="GObject.GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="wrap_loop_start"
-              c:identifier="gtk_text_layout_wrap_loop_start">
+      <method name="set" c:identifier="gtk_tree_store_set">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="wrap_loop_end"
-              c:identifier="gtk_text_layout_wrap_loop_end">
+      <method name="set_valuesv" c:identifier="gtk_tree_store_set_valuesv">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="columns">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="values">
+            <type name="GObject.GValue" c:type="GValue*"/>
+          </parameter>
+          <parameter name="n_values">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_line_display"
-              c:identifier="gtk_text_layout_get_line_display">
+      <method name="remove" c:identifier="gtk_tree_store_remove">
         <return-value>
-          <type name="GtkTextLineDisplay" c:type="GtkTextLineDisplay*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-          <parameter name="line">
-            <type name="GtkTextLine" c:type="GtkTextLine*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="size_only">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="free_line_display"
-              c:identifier="gtk_text_layout_free_line_display">
+      <method name="insert" c:identifier="gtk_tree_store_insert">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="display">
-            <type name="GtkTextLineDisplay" c:type="GtkTextLineDisplay*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="parent">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_line_at_y"
-              c:identifier="gtk_text_layout_get_line_at_y">
+      <method name="insert_before" c:identifier="gtk_tree_store_insert_before">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="target_iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="parent">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="line_top">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="sibling">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_iter_at_pixel"
-              c:identifier="gtk_text_layout_get_iter_at_pixel">
+      <method name="insert_after" c:identifier="gtk_tree_store_insert_after">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
           <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
+          <parameter name="parent">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="sibling">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_iter_at_position"
-              c:identifier="gtk_text_layout_get_iter_at_position">
+      <method name="insert_with_values"
+              c:identifier="gtk_tree_store_insert_with_values">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
           <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="trailing">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
+          <parameter name="parent">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="y">
+          <parameter name="position">
             <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="invalidate" c:identifier="gtk_text_layout_invalidate">
+      <method name="insert_with_valuesv"
+              c:identifier="gtk_tree_store_insert_with_valuesv">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="parent">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int32" c:type="gint"/>
+          </parameter>
+          <parameter name="columns">
+            <type name="GLib.gint" c:type="gint*"/>
+          </parameter>
+          <parameter name="values">
+            <type name="GObject.GValue" c:type="GValue*"/>
+          </parameter>
+          <parameter name="n_values">
+            <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="invalidate_cursors"
-              c:identifier="gtk_text_layout_invalidate_cursors">
+      <method name="prepend" c:identifier="gtk_tree_store_prepend">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="parent">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="free_line_data"
-              c:identifier="gtk_text_layout_free_line_data">
+      <method name="append" c:identifier="gtk_tree_store_append">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="line">
-            <type name="GtkTextLine" c:type="GtkTextLine*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="line_data">
-            <type name="GtkTextLineData" c:type="GtkTextLineData*"/>
+          <parameter name="parent">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="is_valid" c:identifier="gtk_text_layout_is_valid">
+      <method name="is_ancestor" c:identifier="gtk_tree_store_is_ancestor">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="descendant">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="validate_yrange"
-              c:identifier="gtk_text_layout_validate_yrange">
+      <method name="iter_depth" c:identifier="gtk_tree_store_iter_depth">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int32" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-          <parameter name="anchor_line">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="y0_">
-            <type name="int32" c:type="gint"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="y1_">
-            <type name="int32" c:type="gint"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="validate" c:identifier="gtk_text_layout_validate">
+      <method name="clear" c:identifier="gtk_tree_store_clear">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-          <parameter name="max_pixels">
-            <type name="int32" c:type="gint"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="wrap" c:identifier="gtk_text_layout_wrap">
+      <method name="iter_is_valid" c:identifier="gtk_tree_store_iter_is_valid">
         <return-value>
-          <type name="GtkTextLineData" c:type="GtkTextLineData*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-          <parameter name="line">
-            <type name="GtkTextLine" c:type="GtkTextLine*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="line_data">
-            <type name="GtkTextLineData" c:type="GtkTextLineData*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="changed" c:identifier="gtk_text_layout_changed">
+      <method name="reorder" c:identifier="gtk_tree_store_reorder">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="old_height">
-            <type name="int32" c:type="gint"/>
+          <parameter name="parent">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="new_height">
-            <type name="int32" c:type="gint"/>
+          <parameter name="new_order">
+            <type name="GLib.gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="cursors_changed"
-              c:identifier="gtk_text_layout_cursors_changed">
+      <method name="swap" c:identifier="gtk_tree_store_swap">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
-          <parameter name="old_height">
-            <type name="int32" c:type="gint"/>
+          <parameter name="a">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="new_height">
-            <type name="int32" c:type="gint"/>
+          <parameter name="b">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_iter_location"
-              c:identifier="gtk_text_layout_get_iter_location">
+      <method name="move_before" c:identifier="gtk_tree_store_move_before">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
           <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="rect">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="position" allow-none="1">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_line_yrange"
-              c:identifier="gtk_text_layout_get_line_yrange">
+      <method name="move_after" c:identifier="gtk_tree_store_move_after">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="tree_store">
+            <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
           <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="height">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="position" allow-none="1">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_cursor_locations"
-              c:identifier="gtk_text_layout_get_cursor_locations">
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <record name="GtkUIManagerPrivate" c:type="GtkUIManagerPrivate"/>
+    <class name="UIManager"
+           c:type="GtkUIManager"
+           parent="GObject.Object"
+           glib:type-name="GtkUIManager"
+           glib:get-type="gtk_ui_manager_get_type">
+      <constructor name="new" c:identifier="gtk_ui_manager_new">
+        <return-value>
+          <type name="UIManager" c:type="GtkUIManager*"/>
+        </return-value>
+      </constructor>
+      <method name="set_add_tearoffs"
+              c:identifier="gtk_ui_manager_set_add_tearoffs">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="strong_pos">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="weak_pos">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="add_tearoffs">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="clamp_iter_to_vrange"
-              c:identifier="gtk_text_layout_clamp_iter_to_vrange">
+      <method name="get_add_tearoffs"
+              c:identifier="gtk_ui_manager_get_add_tearoffs">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+        </parameters>
+      </method>
+      <method name="insert_action_group"
+              c:identifier="gtk_ui_manager_insert_action_group">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="top">
-            <type name="int32" c:type="gint"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
-          <parameter name="bottom">
+          <parameter name="pos">
             <type name="int32" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_iter_to_line_end"
-              c:identifier="gtk_text_layout_move_iter_to_line_end">
+      <method name="remove_action_group"
+              c:identifier="gtk_ui_manager_remove_action_group">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="direction">
-            <type name="int32" c:type="gint"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_iter_to_previous_line"
-              c:identifier="gtk_text_layout_move_iter_to_previous_line">
+      <method name="get_action_groups"
+              c:identifier="gtk_ui_manager_get_action_groups">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="GLib.GList" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_iter_to_next_line"
-              c:identifier="gtk_text_layout_move_iter_to_next_line">
+      <method name="get_accel_group"
+              c:identifier="gtk_ui_manager_get_accel_group">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_iter_to_x"
-              c:identifier="gtk_text_layout_move_iter_to_x">
+      <method name="get_widget" c:identifier="gtk_ui_manager_get_widget">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_iter_visually"
-              c:identifier="gtk_text_layout_move_iter_visually">
+      <method name="get_toplevels" c:identifier="gtk_ui_manager_get_toplevels">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="GLib.GSList" c:type="GSList*"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
+          <parameter name="types">
+            <type name="UIManagerItemType" c:type="GtkUIManagerItemType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="iter_starts_line"
-              c:identifier="gtk_text_layout_iter_starts_line">
+      <method name="get_action" c:identifier="gtk_ui_manager_get_action">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Action" c:type="GtkAction*"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_iter_at_line"
-              c:identifier="gtk_text_layout_get_iter_at_line">
+      <method name="add_ui_from_string"
+              c:identifier="gtk_ui_manager_add_ui_from_string">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="buffer">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="line">
-            <type name="GtkTextLine" c:type="GtkTextLine*"/>
+          <parameter name="length">
+            <type name="ssize" c:type="gssize"/>
           </parameter>
-          <parameter name="byte_offset">
-            <type name="int32" c:type="gint"/>
+          <parameter name="error">
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="spew" c:identifier="gtk_text_layout_spew">
+      <method name="add_ui_from_file"
+              c:identifier="gtk_ui_manager_add_ui_from_file">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="uint32" c:type="guint"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+          <parameter name="filename">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="draw" c:identifier="gtk_text_layout_draw">
+      <method name="add_ui" c:identifier="gtk_ui_manager_add_ui">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="drawable">
-            <type name="Gdk.Drawable" c:type="GdkDrawable*"/>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="cursor_gc">
-            <type name="Gdk.GC" c:type="GdkGC*"/>
+          <parameter name="merge_id">
+            <type name="uint32" c:type="guint"/>
           </parameter>
-          <parameter name="x_offset">
-            <type name="int32" c:type="gint"/>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="y_offset">
-            <type name="int32" c:type="gint"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
+          <parameter name="action" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="type">
+            <type name="UIManagerItemType" c:type="GtkUIManagerItemType"/>
           </parameter>
-          <parameter name="width">
-            <type name="int32" c:type="gint"/>
+          <parameter name="top">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="height">
-            <type name="int32" c:type="gint"/>
+        </parameters>
+      </method>
+      <method name="remove_ui" c:identifier="gtk_ui_manager_remove_ui">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="widgets">
-            <type name="GLib.GList" c:type="GList**"/>
+          <parameter name="merge_id">
+            <type name="uint32" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <callback name="invalidated">
+      <method name="get_ui" c:identifier="gtk_ui_manager_get_ui">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="changed">
+      </method>
+      <method name="ensure_update" c:identifier="gtk_ui_manager_ensure_update">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
+        </parameters>
+      </method>
+      <method name="new_merge_id" c:identifier="gtk_ui_manager_new_merge_id">
+        <return-value>
+          <type name="uint32" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="self">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="old_height">
-            <type name="int32" c:type="gint"/>
+        </parameters>
+      </method>
+      <property name="add-tearoffs">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="ui">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <callback name="add_widget">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="merge">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="new_height">
-            <type name="int32" c:type="gint"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="wrap">
+      <callback name="actions_changed">
         <return-value>
-          <type name="GtkTextLineData" c:type="GtkTextLineData*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-          <parameter name="line">
-            <type name="GtkTextLine" c:type="GtkTextLine*"/>
-          </parameter>
-          <parameter name="line_data">
-            <type name="GtkTextLineData" c:type="GtkTextLineData*"/>
+          <parameter name="merge">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_log_attrs">
+      <callback name="connect_proxy">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-          <parameter name="line">
-            <type name="GtkTextLine" c:type="GtkTextLine*"/>
+          <parameter name="merge">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="attrs">
-            <type name="Pango.PangoLogAttr" c:type="PangoLogAttr**"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
-          <parameter name="n_attrs">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="proxy">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="invalidate">
+      <callback name="disconnect_proxy">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="merge">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="proxy">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="free_line_data">
+      <callback name="pre_activate">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-          <parameter name="line">
-            <type name="GtkTextLine" c:type="GtkTextLine*"/>
+          <parameter name="merge">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="line_data">
-            <type name="GtkTextLineData" c:type="GtkTextLineData*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="allocate_child">
+      <callback name="post_activate">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <parameter name="merge">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
+        </parameters>
+      </callback>
+      <callback name="get_widget">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="manager">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="invalidate_cursors">
+      <callback name="get_action">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Action" c:type="GtkAction*"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="TextLayout" c:type="GtkTextLayout*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="manager">
+            <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
@@ -66262,94 +63498,274 @@
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <glib:signal name="connect-proxy">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <glib:signal name="changed">
+        <parameters>
+          <parameter name="object">
+            <type name="Action" c:type="GtkAction"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="Widget" c:type="GtkWidget"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="disconnect-proxy">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="int32" c:type="gint"/>
+            <type name="Action" c:type="GtkAction"/>
           </parameter>
           <parameter name="p0">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="int32" c:type="gint"/>
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="invalidated">
+      <glib:signal name="pre-activate">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Action" c:type="GtkAction"/>
+          </parameter>
+        </parameters>
       </glib:signal>
-      <glib:signal name="allocate-child">
+      <glib:signal name="post-activate">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GtkObject" c:type="GtkObject"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="int32" c:type="gint"/>
+            <type name="Action" c:type="GtkAction"/>
           </parameter>
-          <parameter name="p1">
-            <type name="int32" c:type="gint"/>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="add-widget">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
       </glib:signal>
+      <glib:signal name="actions-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <class name="VButtonBox"
+           c:type="GtkVButtonBox"
+           parent="ButtonBox"
+           glib:type-name="GtkVButtonBox"
+           glib:get-type="gtk_vbutton_box_get_type">
     </class>
-    <function name="text_layout_get_line_xrange"
-              c:identifier="_gtk_text_layout_get_line_xrange">
+    <function name="vbutton_box_new" c:identifier="gtk_vbutton_box_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="vbutton_box_get_spacing_default"
+              c:identifier="gtk_vbutton_box_get_spacing_default">
+      <return-value>
+        <type name="int32" c:type="gint"/>
+      </return-value>
+    </function>
+    <function name="vbutton_box_set_spacing_default"
+              c:identifier="gtk_vbutton_box_set_spacing_default">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="spacing">
+          <type name="int32" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="vbutton_box_get_layout_default"
+              c:identifier="gtk_vbutton_box_get_layout_default">
+      <return-value>
+        <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
+      </return-value>
+    </function>
+    <function name="vbutton_box_set_layout_default"
+              c:identifier="gtk_vbutton_box_set_layout_default">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="layout">
-          <type name="TextLayout" c:type="GtkTextLayout*"/>
+          <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TextIter" c:type="GtkTextIter*"/>
+      </parameters>
+    </function>
+    <class name="VolumeButton"
+           c:type="GtkVolumeButton"
+           parent="ScaleButton"
+           glib:type-name="GtkVolumeButton"
+           glib:get-type="gtk_volume_button_get_type">
+      <callback name="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="volume_button_new" c:identifier="gtk_volume_button_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="VPaned"
+           c:type="GtkVPaned"
+           parent="Paned"
+           glib:type-name="GtkVPaned"
+           glib:get-type="gtk_vpaned_get_type">
+    </class>
+    <function name="vpaned_new" c:identifier="gtk_vpaned_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="VRuler"
+           c:type="GtkVRuler"
+           parent="Ruler"
+           glib:type-name="GtkVRuler"
+           glib:get-type="gtk_vruler_get_type">
+    </class>
+    <function name="vruler_new" c:identifier="gtk_vruler_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="VScale"
+           c:type="GtkVScale"
+           parent="Scale"
+           glib:type-name="GtkVScale"
+           glib:get-type="gtk_vscale_get_type">
+    </class>
+    <function name="vscale_new" c:identifier="gtk_vscale_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="adjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </parameter>
-        <parameter name="x">
-          <type name="GLib.gint" c:type="gint*"/>
+      </parameters>
+    </function>
+    <function name="vscale_new_with_range"
+              c:identifier="gtk_vscale_new_with_range">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="min">
+          <type name="double" c:type="gdouble"/>
         </parameter>
-        <parameter name="width">
-          <type name="GLib.gint" c:type="gint*"/>
+        <parameter name="max">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+        <parameter name="step">
+          <type name="double" c:type="gdouble"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="VSeparator"
+           c:type="GtkVSeparator"
+           parent="Separator"
+           glib:type-name="GtkVSeparator"
+           glib:get-type="gtk_vseparator_get_type">
+    </class>
+    <function name="vseparator_new" c:identifier="gtk_vseparator_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <record name="GtkIMContextInfo" c:type="GtkIMContextInfo">
+      <field name="context_id">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="context_name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="domain">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="domain_dirname">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="default_locales">
+        <type name="string" c:type="gchar*"/>
+      </field>
+    </record>
+    <function name="im_module_list" c:identifier="_gtk_im_module_list">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="contexts">
+          <type name="GtkIMContextInfo" c:type="GtkIMContextInfo***"/>
+        </parameter>
+        <parameter name="n_contexts">
+          <type name="GLib.guint" c:type="guint*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_layout_get_block_cursor"
-              c:identifier="_gtk_text_layout_get_block_cursor">
+    <function name="im_module_create" c:identifier="_gtk_im_module_create">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="IMContext" c:type="GtkIMContext*"/>
       </return-value>
       <parameters>
-        <parameter name="layout">
-          <type name="TextLayout" c:type="GtkTextLayout*"/>
+        <parameter name="context_id">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="pos">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
+      </parameters>
+    </function>
+    <function name="im_module_get_default_context_id"
+              c:identifier="_gtk_im_module_get_default_context_id">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="client_window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_anchored_child_set_layout"
-              c:identifier="gtk_text_anchored_child_set_layout">
+    <function name="fnmatch" c:identifier="_gtk_fnmatch">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="child">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="pattern">
+          <type name="string" c:type="char*"/>
         </parameter>
-        <parameter name="layout">
-          <type name="TextLayout" c:type="GtkTextLayout*"/>
+        <parameter name="string">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="no_leading_period">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>



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