gir-repository r34 - in trunk: . gir



Author: johan
Date: Tue Aug 19 21:36:46 2008
New Revision: 34
URL: http://svn.gnome.org/viewvc/gir-repository?rev=34&view=rev

Log:
2008-08-19  Johan Dahlin  <johan gnome org>

    * configure.ac:
    * gir/Makefile.am:
    Add proper gir dependencies.
    Add a compiler rule and check for the g-ir-compiler
    variable in the pc file
    * gir/atk.gir:
    * gir/gdk-pixbuf-2.0.gir:
    * gir/gdk-x11-2.0.gir:
    * gir/gtk-x11-2.0.gir:
    * gir/pango.gir:
    * gir/pangocairo.gir:
    * gir/pangoft2.gir:
    * gir/pangox.gir:
    * gir/pangoxft.gir:
    Regenerate



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/gir/Makefile.am
   trunk/gir/atk.gir
   trunk/gir/gdk-pixbuf-2.0.gir
   trunk/gir/gdk-x11-2.0.gir
   trunk/gir/gtk-x11-2.0.gir
   trunk/gir/pango.gir
   trunk/gir/pangocairo.gir
   trunk/gir/pangoft2.gir
   trunk/gir/pangox.gir
   trunk/gir/pangoxft.gir

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Aug 19 21:36:46 2008
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.59)
 AC_INIT(gir-repository, 0.1.0, http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=introspection)
-AM_INIT_AUTOMAKE([1.7])
+AM_INIT_AUTOMAKE([-Wno-portability])
 AM_MAINTAINER_MODE
 AC_CONFIG_HEADER([config.h])
 
@@ -12,6 +12,9 @@
 G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
 AC_SUBST(G_IR_SCANNER)
 
+G_IR_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+AC_SUBST(G_IR_COMPILER)
+
 GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
 AC_SUBST(GIRDIR)
 

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Tue Aug 19 21:36:46 2008
@@ -19,13 +19,13 @@
 BUILT_GIRSOURCES += pango.gir
 
 PANGOFT2_LIBDIR=`pkg-config --variable=libdir pangoft2`
-pangoft2.gir: pango.gir
+pangoft2.gir: fontconfig.gir freetype2.gir pango.gir
 	$(G_IR_SCANNER) -v --namespace PangoFT2 \
             --include=$(GIRDIR)/glib-2.0.gir \
             --include=$(GIRDIR)/gobject-2.0.gir \
+            --include=$(srcdir)/fontconfig.gir \
             --include=$(srcdir)/freetype2.gir \
             --include=$(srcdir)/pango.gir \
-            --include=$(srcdir)/fontconfig.gir \
             --library=$(PANGOFT2_LIBDIR)/libpangoft2-1.0.so.0 \
             --output $@ \
             --pkg gobject-2.0 \
@@ -37,7 +37,7 @@
 BUILT_GIRSOURCES += pangoft2.gir
 
 PANGOCAIRO_LIBDIR=`pkg-config --variable=libdir pangocairo`
-pangocairo.gir: cairo.gir
+pangocairo.gir: cairo.gir pango.gir
 	$(G_IR_SCANNER) -v --namespace PangoCairo \
             --include=$(GIRDIR)/glib-2.0.gir \
             --include=$(GIRDIR)/gobject-2.0.gir \
@@ -53,7 +53,7 @@
 BUILT_GIRSOURCES += pangocairo.gir
 
 PANGOXFT_LIBDIR=`pkg-config --variable=libdir pangoxft`
-pangoxft.gir: pango.gir
+pangoxft.gir: fontconfig.gir xft.gir xlib.gir pango.gir pangoft2.gir
 	$(G_IR_SCANNER) -v --namespace PangoXft \
             --include=$(GIRDIR)/glib-2.0.gir \
             --include=$(GIRDIR)/gobject-2.0.gir \
@@ -73,7 +73,7 @@
 BUILT_GIRSOURCES += pangoxft.gir
 
 PANGOX_LIBDIR=`pkg-config --variable=libdir pangox`
-pangox.gir: pango.gir
+pangox.gir: xlib.gir pango.gir
 	$(G_IR_SCANNER) -v --namespace PangoX \
             --include=$(GIRDIR)/glib-2.0.gir \
             --include=$(GIRDIR)/gobject-2.0.gir \
@@ -115,7 +115,7 @@
              --pkg gobject-2.0 \
              -I$(GDKPIXBUF_INCLUDEDIR) \
              $(GDKPIXBUF_INCLUDEDIR)/gdk-pixbuf/*.h
-	sed 's/class name="GdkPixbuf"/class name="Pixbuf"/' -i $@
+	sed 's/name="GdkPixbuf"/name="Pixbuf"/' -i $@
 BUILT_GIRSOURCES += gdk-pixbuf-2.0.gir
 
 # TODO:
@@ -135,13 +135,12 @@
 
 GDK_INCLUDEDIR=`pkg-config --variable=includedir gdk-2.0`/gtk-2.0
 GDK_LIBDIR=`pkg-config --variable=libdir gdk-2.0`
-gdk-x11-2.0.gir:
+gdk-x11-2.0.gir: cairo.gir pango.gir xlib.gir gdk-pixbuf-2.0.gir
 	$(G_IR_SCANNER) -v --namespace Gdk \
              --include=$(GIRDIR)/glib-2.0.gir \
              --include=$(GIRDIR)/gobject-2.0.gir \
              --include=$(srcdir)/cairo.gir \
              --include=$(srcdir)/pango.gir \
-             --include=$(srcdir)/atk.gir \
              --include=$(srcdir)/xlib.gir \
              --include=$(srcdir)/gdk-pixbuf-2.0.gir \
 	     --library=$(GDK_LIBDIR)/libgdk-x11-2.0.so.0 \
@@ -159,7 +158,7 @@
 # gtk
 GTK_INCLUDEDIR=`pkg-config --variable=includedir gtk+-2.0`/gtk-2.0
 GTK_LIBDIR=`pkg-config --variable=libdir gtk+-2.0`
-gtk-x11-2.0.gir:
+gtk-x11-2.0.gir: cairo.gir pango.gir atk.gir xlib.gir gdk-pixbuf-2.0.gir gdk-x11-2.0.gir
 	$(G_IR_SCANNER) -v --namespace Gtk \
              --include=$(GIRDIR)/glib-2.0.gir \
              --include=$(GIRDIR)/gobject-2.0.gir \
@@ -190,4 +189,7 @@
 clean-gir:
 	@rm -fr $(BUILT_GIRSOURCES)
 
+%.typelib: %.gir
+	$(G_IR_COMPILER) $< --raw -o $@
+
 regenerate: clean-gir $(BUILT_GIRSOURCES)

Modified: trunk/gir/atk.gir
==============================================================================
--- trunk/gir/atk.gir	(original)
+++ trunk/gir/atk.gir	Tue Aug 19 21:36:46 2008
@@ -3,8 +3,8 @@
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
   <namespace name="Atk">
-    <alias name="AtkState" target="guint64"/>
-    <alias name="AtkAttributeSet" target="GSList"/>
+    <alias name="State" target="uint64" c:type="AtkState"/>
+    <alias name="AttributeSet" target="GSList" c:type="AtkAttributeSet"/>
     <enumeration name="StateType"
                  c:type="AtkStateType"
                  glib:type-name="AtkStateType"
@@ -684,7 +684,7 @@
               c:identifier="ATK_LAYER_WINDOW"
               glib:nick="window"/>
     </enumeration>
-    <record name="AtkAttribute" c:type="AtkAttribute">
+    <record name="Attribute" c:type="AtkAttribute">
       <field name="name">
         <type name="string" c:type="gchar*"/>
       </field>
@@ -692,31 +692,12 @@
         <type name="string" c:type="gchar*"/>
       </field>
     </record>
-    <record name="AtkImplementor" c:type="AtkImplementor"/>
-    <record name="AtkPropertyValues" c:type="_AtkPropertyValues"/>
-    <callback name="AtkFunction">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="AtkPropertyChangeHandler">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter>
-          <type name="Object" c:type="AtkObject*"/>
-        </parameter>
-        <parameter>
-          <type name="AtkPropertyValues" c:type="AtkPropertyValues*"/>
-        </parameter>
-      </parameters>
-    </callback>
+    <record name="Implementor" c:type="AtkImplementor"/>
+    <interface name="ImplementorIface"
+               c:type="AtkImplementorIface"
+               glib:type-name="AtkImplementorIface"
+               glib:get-type="atk_implementor_get_type">
+    </interface>
     <class name="Object"
            c:type="AtkObject"
            parent="GObject.Object"
@@ -742,7 +723,7 @@
             <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="i">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </constructor>
@@ -783,7 +764,7 @@
       <method name="get_n_accessible_children"
               c:identifier="atk_object_get_n_accessible_children">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
@@ -824,7 +805,7 @@
       </method>
       <method name="get_mdi_zorder" c:identifier="atk_object_get_mdi_zorder">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
@@ -834,7 +815,7 @@
       </method>
       <method name="get_attributes" c:identifier="atk_object_get_attributes">
         <return-value>
-          <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
+          <type name="AttributeSet" c:type="AtkAttributeSet*"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
@@ -855,7 +836,7 @@
       <method name="get_index_in_parent"
               c:identifier="atk_object_get_index_in_parent">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
@@ -918,14 +899,14 @@
       <method name="connect_property_change_handler"
               c:identifier="atk_object_connect_property_change_handler">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
             <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="handler">
-            <type name="AtkPropertyChangeHandler"
+            <type name="PropertyChangeHandler"
                   c:type="AtkPropertyChangeHandler*"/>
           </parameter>
         </parameters>
@@ -940,7 +921,7 @@
             <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="handler_id">
-            <type name="uint32" c:type="guint"/>
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -954,7 +935,7 @@
             <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="state">
-            <type name="AtkState" c:type="AtkState"/>
+            <type name="State" c:type="AtkState"/>
           </parameter>
           <parameter name="value">
             <type name="boolean" c:type="gboolean"/>
@@ -1021,13 +1002,13 @@
         <type name="double" c:type="gdouble"/>
       </property>
       <property name="accessible-role">
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </property>
       <property name="accessible-component-layer">
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </property>
       <property name="accessible-component-mdi-zorder">
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </property>
       <property name="accessible-table-caption">
         <type name="string" c:type="gchararray"/>
@@ -1051,9 +1032,9 @@
         <type name="Object" c:type="AtkObject"/>
       </property>
       <property name="accessible-hypertext-nlinks">
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </property>
-      <callback name="get_name">
+      <callback name="get_name" c:type="get_name">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -1063,7 +1044,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_description">
+      <callback name="get_description" c:type="get_description">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -1073,7 +1054,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_parent">
+      <callback name="get_parent" c:type="get_parent">
         <return-value>
           <type name="Object" c:type="AtkObject*"/>
         </return-value>
@@ -1083,9 +1064,9 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_n_children">
+      <callback name="get_n_children" c:type="get_n_children">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
@@ -1093,7 +1074,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="ref_child">
+      <callback name="ref_child" c:type="ref_child">
         <return-value>
           <type name="Object" c:type="AtkObject*"/>
         </return-value>
@@ -1102,13 +1083,13 @@
             <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="i">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_index_in_parent">
+      <callback name="get_index_in_parent" c:type="get_index_in_parent">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
@@ -1116,7 +1097,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="ref_relation_set">
+      <callback name="ref_relation_set" c:type="ref_relation_set">
         <return-value>
           <type name="RelationSet" c:type="AtkRelationSet*"/>
         </return-value>
@@ -1126,7 +1107,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_role">
+      <callback name="get_role" c:type="get_role">
         <return-value>
           <type name="Role" c:type="AtkRole"/>
         </return-value>
@@ -1136,7 +1117,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_layer">
+      <callback name="get_layer" c:type="get_layer">
         <return-value>
           <type name="Layer" c:type="AtkLayer"/>
         </return-value>
@@ -1146,9 +1127,9 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_mdi_zorder">
+      <callback name="get_mdi_zorder" c:type="get_mdi_zorder">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
@@ -1156,7 +1137,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="ref_state_set">
+      <callback name="ref_state_set" c:type="ref_state_set">
         <return-value>
           <type name="StateSet" c:type="AtkStateSet*"/>
         </return-value>
@@ -1166,7 +1147,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_name">
+      <callback name="set_name" c:type="set_name">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -1179,7 +1160,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_description">
+      <callback name="set_description" c:type="set_description">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -1192,7 +1173,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_parent">
+      <callback name="set_parent" c:type="set_parent">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -1205,7 +1186,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_role">
+      <callback name="set_role" c:type="set_role">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -1218,21 +1199,23 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="connect_property_change_handler">
+      <callback name="connect_property_change_handler"
+                c:type="connect_property_change_handler">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
             <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="handler">
-            <type name="AtkPropertyChangeHandler"
+            <type name="PropertyChangeHandler"
                   c:type="AtkPropertyChangeHandler*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="remove_property_change_handler">
+      <callback name="remove_property_change_handler"
+                c:type="remove_property_change_handler">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -1241,11 +1224,11 @@
             <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="handler_id">
-            <type name="uint32" c:type="guint"/>
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="initialize">
+      <callback name="initialize" c:type="initialize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -1258,7 +1241,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="children_changed">
+      <callback name="children_changed" c:type="children_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -1267,14 +1250,14 @@
             <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="change_index">
-            <type name="uint32" c:type="guint"/>
+            <type name="uint" c:type="guint"/>
           </parameter>
           <parameter name="changed_child">
             <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="focus_event">
+      <callback name="focus_event" c:type="focus_event">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -1287,7 +1270,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="property_change">
+      <callback name="property_change" c:type="property_change">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -1296,11 +1279,11 @@
             <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="values">
-            <type name="AtkPropertyValues" c:type="AtkPropertyValues*"/>
+            <type name="PropertyValues" c:type="AtkPropertyValues*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="state_change">
+      <callback name="state_change" c:type="state_change">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -1316,7 +1299,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="visible_data_changed">
+      <callback name="visible_data_changed" c:type="visible_data_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -1326,7 +1309,8 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="active_descendant_changed">
+      <callback name="active_descendant_changed"
+                c:type="active_descendant_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -1335,13 +1319,13 @@
             <type name="Object" c:type="AtkObject*"/>
           </parameter>
           <parameter name="child">
-            <type name="gpointer" c:type="gpointer*"/>
+            <type name="any" c:type="gpointer*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_attributes">
+      <callback name="get_attributes" c:type="get_attributes">
         <return-value>
-          <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
+          <type name="AttributeSet" c:type="AtkAttributeSet*"/>
         </return-value>
         <parameters>
           <parameter name="accessible">
@@ -1350,10 +1334,10 @@
         </parameters>
       </callback>
       <field name="pad1">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <field name="pad2">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <glib:signal name="children-changed">
         <return-value>
@@ -1361,7 +1345,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="uint32" c:type="guint"/>
+            <type name="uint" c:type="guint"/>
           </parameter>
           <parameter name="p0">
             <type name="any" c:type="gpointer"/>
@@ -1417,11 +1401,257 @@
         </parameters>
       </glib:signal>
     </class>
-    <interface name="ImplementorIface"
-               c:type="AtkImplementorIface"
-               glib:type-name="AtkImplementorIface"
-               glib:get-type="atk_implementor_get_type">
-    </interface>
+    <class name="RelationSet"
+           c:type="AtkRelationSet"
+           parent="GObject.Object"
+           glib:type-name="AtkRelationSet"
+           glib:get-type="atk_relation_set_get_type">
+      <constructor name="new" c:identifier="atk_relation_set_new">
+        <return-value>
+          <type name="RelationSet" c:type="AtkRelationSet*"/>
+        </return-value>
+      </constructor>
+      <method name="contains" c:identifier="atk_relation_set_contains">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="set">
+            <type name="RelationSet" c:type="AtkRelationSet*"/>
+          </parameter>
+          <parameter name="relationship">
+            <type name="RelationType" c:type="AtkRelationType"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove" c:identifier="atk_relation_set_remove">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="set">
+            <type name="RelationSet" c:type="AtkRelationSet*"/>
+          </parameter>
+          <parameter name="relation">
+            <type name="Relation" c:type="AtkRelation*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add" c:identifier="atk_relation_set_add">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="set">
+            <type name="RelationSet" c:type="AtkRelationSet*"/>
+          </parameter>
+          <parameter name="relation">
+            <type name="Relation" c:type="AtkRelation*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_n_relations"
+              c:identifier="atk_relation_set_get_n_relations">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="set">
+            <type name="RelationSet" c:type="AtkRelationSet*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_relation_by_type"
+              c:identifier="atk_relation_set_add_relation_by_type">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="set">
+            <type name="RelationSet" c:type="AtkRelationSet*"/>
+          </parameter>
+          <parameter name="relationship">
+            <type name="RelationType" c:type="AtkRelationType"/>
+          </parameter>
+          <parameter name="target">
+            <type name="Object" c:type="AtkObject*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad2">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+    </class>
+    <class name="StateSet"
+           c:type="AtkStateSet"
+           parent="GObject.Object"
+           glib:type-name="AtkStateSet"
+           glib:get-type="atk_state_set_get_type">
+      <constructor name="new" c:identifier="atk_state_set_new">
+        <return-value>
+          <type name="StateSet" c:type="AtkStateSet*"/>
+        </return-value>
+      </constructor>
+      <constructor name="and_sets" c:identifier="atk_state_set_and_sets">
+        <return-value>
+          <type name="StateSet" c:type="AtkStateSet*"/>
+        </return-value>
+        <parameters>
+          <parameter name="set">
+            <type name="StateSet" c:type="AtkStateSet*"/>
+          </parameter>
+          <parameter name="compare_set">
+            <type name="StateSet" c:type="AtkStateSet*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="or_sets" c:identifier="atk_state_set_or_sets">
+        <return-value>
+          <type name="StateSet" c:type="AtkStateSet*"/>
+        </return-value>
+        <parameters>
+          <parameter name="set">
+            <type name="StateSet" c:type="AtkStateSet*"/>
+          </parameter>
+          <parameter name="compare_set">
+            <type name="StateSet" c:type="AtkStateSet*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="xor_sets" c:identifier="atk_state_set_xor_sets">
+        <return-value>
+          <type name="StateSet" c:type="AtkStateSet*"/>
+        </return-value>
+        <parameters>
+          <parameter name="set">
+            <type name="StateSet" c:type="AtkStateSet*"/>
+          </parameter>
+          <parameter name="compare_set">
+            <type name="StateSet" c:type="AtkStateSet*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="is_empty" c:identifier="atk_state_set_is_empty">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="set">
+            <type name="StateSet" c:type="AtkStateSet*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_state" c:identifier="atk_state_set_add_state">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="set">
+            <type name="StateSet" c:type="AtkStateSet*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="StateType" c:type="AtkStateType"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_states" c:identifier="atk_state_set_add_states">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="set">
+            <type name="StateSet" c:type="AtkStateSet*"/>
+          </parameter>
+          <parameter name="types">
+            <type name="StateType" c:type="AtkStateType*"/>
+          </parameter>
+          <parameter name="n_types">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="clear_states" c:identifier="atk_state_set_clear_states">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="set">
+            <type name="StateSet" c:type="AtkStateSet*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="contains_state"
+              c:identifier="atk_state_set_contains_state">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="set">
+            <type name="StateSet" c:type="AtkStateSet*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="StateType" c:type="AtkStateType"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="contains_states"
+              c:identifier="atk_state_set_contains_states">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="set">
+            <type name="StateSet" c:type="AtkStateSet*"/>
+          </parameter>
+          <parameter name="types">
+            <type name="StateType" c:type="AtkStateType*"/>
+          </parameter>
+          <parameter name="n_types">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_state" c:identifier="atk_state_set_remove_state">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="set">
+            <type name="StateSet" c:type="AtkStateSet*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="StateType" c:type="AtkStateType"/>
+          </parameter>
+        </parameters>
+      </method>
+    </class>
+    <record name="PropertyValues" c:type="_AtkPropertyValues"/>
+    <callback name="Function" c:type="AtkFunction">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="PropertyChangeHandler" c:type="AtkPropertyChangeHandler">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter>
+          <type name="Object" c:type="AtkObject*"/>
+        </parameter>
+        <parameter>
+          <type name="PropertyValues" c:type="AtkPropertyValues*"/>
+        </parameter>
+      </parameters>
+    </callback>
     <function name="implementor_ref_accessible"
               c:identifier="atk_implementor_ref_accessible">
       <return-value>
@@ -1429,7 +1659,7 @@
       </return-value>
       <parameters>
         <parameter name="implementor">
-          <type name="AtkImplementor" c:type="AtkImplementor*"/>
+          <type name="Implementor" c:type="AtkImplementor*"/>
         </parameter>
       </parameters>
     </function>
@@ -1464,12 +1694,11 @@
         </parameter>
       </parameters>
     </function>
-    <record name="AtkAction" c:type="AtkAction"/>
     <interface name="Action"
                c:type="AtkAction"
                glib:type-name="AtkAction"
                glib:get-type="atk_action_get_type">
-      <callback name="do_action">
+      <callback name="do_action" c:type="do_action">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -1478,13 +1707,13 @@
             <type name="Action" c:type="AtkAction*"/>
           </parameter>
           <parameter name="i">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_n_actions">
+      <callback name="get_n_actions" c:type="get_n_actions">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="action">
@@ -1492,7 +1721,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_description">
+      <callback name="get_description" c:type="get_description">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -1501,11 +1730,11 @@
             <type name="Action" c:type="AtkAction*"/>
           </parameter>
           <parameter name="i">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_name">
+      <callback name="get_name" c:type="get_name">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -1514,11 +1743,11 @@
             <type name="Action" c:type="AtkAction*"/>
           </parameter>
           <parameter name="i">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_keybinding">
+      <callback name="get_keybinding" c:type="get_keybinding">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -1527,11 +1756,11 @@
             <type name="Action" c:type="AtkAction*"/>
           </parameter>
           <parameter name="i">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_description">
+      <callback name="set_description" c:type="set_description">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -1540,14 +1769,14 @@
             <type name="Action" c:type="AtkAction*"/>
           </parameter>
           <parameter name="i">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="desc">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_localized_name">
+      <callback name="get_localized_name" c:type="get_localized_name">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -1556,12 +1785,12 @@
             <type name="Action" c:type="AtkAction*"/>
           </parameter>
           <parameter name="i">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <field name="pad2">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
     </interface>
     <function name="action_do_action" c:identifier="atk_action_do_action">
@@ -1573,14 +1802,14 @@
           <type name="Action" c:type="AtkAction*"/>
         </parameter>
         <parameter name="i">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="action_get_n_actions"
               c:identifier="atk_action_get_n_actions">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="action">
@@ -1598,7 +1827,7 @@
           <type name="Action" c:type="AtkAction*"/>
         </parameter>
         <parameter name="i">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -1611,7 +1840,7 @@
           <type name="Action" c:type="AtkAction*"/>
         </parameter>
         <parameter name="i">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -1625,7 +1854,7 @@
           <type name="Action" c:type="AtkAction*"/>
         </parameter>
         <parameter name="i">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -1639,7 +1868,7 @@
           <type name="Action" c:type="AtkAction*"/>
         </parameter>
         <parameter name="i">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="desc">
           <type name="string" c:type="gchar*"/>
@@ -1656,22 +1885,93 @@
           <type name="Action" c:type="AtkAction*"/>
         </parameter>
         <parameter name="i">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <record name="AtkKeyEventStruct" c:type="AtkKeyEventStruct">
+    <class name="Util"
+           c:type="AtkUtil"
+           parent="GObject.Object"
+           glib:type-name="AtkUtil"
+           glib:get-type="atk_util_get_type">
+      <callback name="add_global_event_listener"
+                c:type="add_global_event_listener">
+        <return-value>
+          <type name="uint" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="listener">
+            <type name="GObject.SignalEmissionHook"
+                  c:type="GSignalEmissionHook"/>
+          </parameter>
+          <parameter name="event_type">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="remove_global_event_listener"
+                c:type="remove_global_event_listener">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="listener_id">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="add_key_event_listener" c:type="add_key_event_listener">
+        <return-value>
+          <type name="uint" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="listener">
+            <type name="KeySnoopFunc" c:type="AtkKeySnoopFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="remove_key_event_listener"
+                c:type="remove_key_event_listener">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="listener_id">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_root" c:type="get_root">
+        <return-value>
+          <type name="Object" c:type="AtkObject*"/>
+        </return-value>
+      </callback>
+      <callback name="get_toolkit_name" c:type="get_toolkit_name">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+      </callback>
+      <callback name="get_toolkit_version" c:type="get_toolkit_version">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+      </callback>
+    </class>
+    <record name="KeyEventStruct" c:type="AtkKeyEventStruct">
       <field name="type">
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </field>
       <field name="state">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="keyval">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="length">
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </field>
       <field name="string">
         <type name="string" c:type="gchar*"/>
@@ -1683,7 +1983,7 @@
         <type name="uint32" c:type="guint32"/>
       </field>
     </record>
-    <callback name="AtkEventListener">
+    <callback name="EventListener" c:type="AtkEventListener">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -1693,18 +1993,18 @@
         </parameter>
       </parameters>
     </callback>
-    <callback name="AtkEventListenerInit">
+    <callback name="EventListenerInit" c:type="AtkEventListenerInit">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
     </callback>
-    <callback name="AtkKeySnoopFunc">
+    <callback name="KeySnoopFunc" c:type="AtkKeySnoopFunc">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="event">
-          <type name="AtkKeyEventStruct" c:type="AtkKeyEventStruct*"/>
+          <type name="KeyEventStruct" c:type="AtkKeyEventStruct*"/>
         </parameter>
         <parameter name="func_data">
           <type name="any" c:type="gpointer"/>
@@ -1728,74 +2028,6 @@
               c:identifier="ATK_KEY_EVENT_LAST_DEFINED"
               glib:nick="last-defined"/>
     </enumeration>
-    <class name="Util"
-           c:type="AtkUtil"
-           parent="GObject.Object"
-           glib:type-name="AtkUtil"
-           glib:get-type="atk_util_get_type">
-      <callback name="add_global_event_listener">
-        <return-value>
-          <type name="uint32" c:type="guint"/>
-        </return-value>
-        <parameters>
-          <parameter name="listener">
-            <type name="GObject.GSignalEmissionHook"
-                  c:type="GSignalEmissionHook"/>
-          </parameter>
-          <parameter name="event_type">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="remove_global_event_listener">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="listener_id">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="add_key_event_listener">
-        <return-value>
-          <type name="uint32" c:type="guint"/>
-        </return-value>
-        <parameters>
-          <parameter name="listener">
-            <type name="AtkKeySnoopFunc" c:type="AtkKeySnoopFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="remove_key_event_listener">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="listener_id">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_root">
-        <return-value>
-          <type name="Object" c:type="AtkObject*"/>
-        </return-value>
-      </callback>
-      <callback name="get_toolkit_name">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-      </callback>
-      <callback name="get_toolkit_version">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-      </callback>
-    </class>
     <enumeration name="CoordType"
                  c:type="AtkCoordType"
                  glib:type-name="AtkCoordType"
@@ -1811,11 +2043,11 @@
     </enumeration>
     <function name="add_focus_tracker" c:identifier="atk_add_focus_tracker">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="focus_tracker">
-          <type name="AtkEventListener" c:type="AtkEventListener"/>
+          <type name="EventListener" c:type="AtkEventListener"/>
         </parameter>
       </parameters>
     </function>
@@ -1826,7 +2058,7 @@
       </return-value>
       <parameters>
         <parameter name="tracker_id">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -1836,7 +2068,7 @@
       </return-value>
       <parameters>
         <parameter name="init">
-          <type name="AtkEventListenerInit" c:type="AtkEventListenerInit"/>
+          <type name="EventListenerInit" c:type="AtkEventListenerInit"/>
         </parameter>
       </parameters>
     </function>
@@ -1854,11 +2086,11 @@
     <function name="add_global_event_listener"
               c:identifier="atk_add_global_event_listener">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="listener">
-          <type name="GObject.GSignalEmissionHook"
+          <type name="GObject.SignalEmissionHook"
                 c:type="GSignalEmissionHook"/>
         </parameter>
         <parameter name="event_type">
@@ -1873,18 +2105,18 @@
       </return-value>
       <parameters>
         <parameter name="listener_id">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
     <function name="add_key_event_listener"
               c:identifier="atk_add_key_event_listener">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="listener">
-          <type name="AtkKeySnoopFunc" c:type="AtkKeySnoopFunc"/>
+          <type name="KeySnoopFunc" c:type="AtkKeySnoopFunc"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -1898,7 +2130,7 @@
       </return-value>
       <parameters>
         <parameter name="listener_id">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -1928,43 +2160,24 @@
         <type name="string" c:type="gchar*"/>
       </return-value>
     </function>
-    <record name="AtkComponent" c:type="AtkComponent"/>
-    <callback name="AtkFocusHandler">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter>
-          <type name="Object" c:type="AtkObject*"/>
-        </parameter>
-        <parameter>
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <glib:boxed c:type="Rectangle"
-                glib:name="Rectangle"
-                glib:type-name="AtkRectangle"
-                glib:get-type="atk_rectangle_get_type">
-    </glib:boxed>
     <interface name="Component"
                c:type="AtkComponent"
                glib:type-name="AtkComponent"
                glib:get-type="atk_component_get_type">
-      <callback name="add_focus_handler">
+      <callback name="add_focus_handler" c:type="add_focus_handler">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="component">
             <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="handler">
-            <type name="AtkFocusHandler" c:type="AtkFocusHandler"/>
+            <type name="FocusHandler" c:type="AtkFocusHandler"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="contains">
+      <callback name="contains" c:type="contains">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -1973,17 +2186,18 @@
             <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="coord_type">
             <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="ref_accessible_at_point">
+      <callback name="ref_accessible_at_point"
+                c:type="ref_accessible_at_point">
         <return-value>
           <type name="Object" c:type="AtkObject*"/>
         </return-value>
@@ -1992,17 +2206,17 @@
             <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="coord_type">
             <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_extents">
+      <callback name="get_extents" c:type="get_extents">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -2011,23 +2225,23 @@
             <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="x">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="width">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="height">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="coord_type">
             <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_position">
+      <callback name="get_position" c:type="get_position">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -2036,17 +2250,17 @@
             <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="x">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="coord_type">
             <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_size">
+      <callback name="get_size" c:type="get_size">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -2055,14 +2269,14 @@
             <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="width">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="height">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="grab_focus">
+      <callback name="grab_focus" c:type="grab_focus">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -2072,7 +2286,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="remove_focus_handler">
+      <callback name="remove_focus_handler" c:type="remove_focus_handler">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -2081,11 +2295,11 @@
             <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="handler_id">
-            <type name="uint32" c:type="guint"/>
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_extents">
+      <callback name="set_extents" c:type="set_extents">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -2094,23 +2308,23 @@
             <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="coord_type">
             <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_position">
+      <callback name="set_position" c:type="set_position">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -2119,17 +2333,17 @@
             <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="coord_type">
             <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_size">
+      <callback name="set_size" c:type="set_size">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -2138,14 +2352,14 @@
             <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_layer">
+      <callback name="get_layer" c:type="get_layer">
         <return-value>
           <type name="Layer" c:type="AtkLayer"/>
         </return-value>
@@ -2155,9 +2369,9 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_mdi_zorder">
+      <callback name="get_mdi_zorder" c:type="get_mdi_zorder">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="component">
@@ -2165,7 +2379,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="bounds_changed">
+      <callback name="bounds_changed" c:type="bounds_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -2178,7 +2392,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_alpha">
+      <callback name="get_alpha" c:type="get_alpha">
         <return-value>
           <type name="double" c:type="gdouble"/>
         </return-value>
@@ -2199,17 +2413,35 @@
         </parameters>
       </glib:signal>
     </interface>
+    <callback name="FocusHandler" c:type="AtkFocusHandler">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter>
+          <type name="Object" c:type="AtkObject*"/>
+        </parameter>
+        <parameter>
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <glib:boxed c:type="AtkRectangle"
+                glib:name="Rectangle"
+                glib:type-name="AtkRectangle"
+                glib:get-type="atk_rectangle_get_type">
+    </glib:boxed>
     <function name="component_add_focus_handler"
               c:identifier="atk_component_add_focus_handler">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
         <parameter name="component">
           <type name="Component" c:type="AtkComponent*"/>
         </parameter>
         <parameter name="handler">
-          <type name="AtkFocusHandler" c:type="AtkFocusHandler"/>
+          <type name="FocusHandler" c:type="AtkFocusHandler"/>
         </parameter>
       </parameters>
     </function>
@@ -2222,10 +2454,10 @@
           <type name="Component" c:type="AtkComponent*"/>
         </parameter>
         <parameter name="x">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="coord_type">
           <type name="CoordType" c:type="AtkCoordType"/>
@@ -2242,10 +2474,10 @@
           <type name="Component" c:type="AtkComponent*"/>
         </parameter>
         <parameter name="x">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="coord_type">
           <type name="CoordType" c:type="AtkCoordType"/>
@@ -2262,16 +2494,16 @@
           <type name="Component" c:type="AtkComponent*"/>
         </parameter>
         <parameter name="x">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="y">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="width">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="height">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="coord_type">
           <type name="CoordType" c:type="AtkCoordType"/>
@@ -2288,10 +2520,10 @@
           <type name="Component" c:type="AtkComponent*"/>
         </parameter>
         <parameter name="x">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="y">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="coord_type">
           <type name="CoordType" c:type="AtkCoordType"/>
@@ -2307,10 +2539,10 @@
           <type name="Component" c:type="AtkComponent*"/>
         </parameter>
         <parameter name="width">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="height">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -2328,7 +2560,7 @@
     <function name="component_get_mdi_zorder"
               c:identifier="atk_component_get_mdi_zorder">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="component">
@@ -2357,7 +2589,7 @@
           <type name="Component" c:type="AtkComponent*"/>
         </parameter>
         <parameter name="handler_id">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
@@ -2371,16 +2603,16 @@
           <type name="Component" c:type="AtkComponent*"/>
         </parameter>
         <parameter name="x">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="coord_type">
           <type name="CoordType" c:type="AtkCoordType"/>
@@ -2397,10 +2629,10 @@
           <type name="Component" c:type="AtkComponent*"/>
         </parameter>
         <parameter name="x">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="coord_type">
           <type name="CoordType" c:type="AtkCoordType"/>
@@ -2416,10 +2648,10 @@
           <type name="Component" c:type="AtkComponent*"/>
         </parameter>
         <parameter name="width">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -2434,12 +2666,11 @@
         </parameter>
       </parameters>
     </function>
-    <record name="AtkDocument" c:type="AtkDocument"/>
     <interface name="Document"
                c:type="AtkDocument"
                glib:type-name="AtkDocument"
                glib:get-type="atk_document_get_type">
-      <callback name="get_document_type">
+      <callback name="get_document_type" c:type="get_document_type">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -2449,7 +2680,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_document">
+      <callback name="get_document" c:type="get_document">
         <return-value>
           <type name="any" c:type="gpointer"/>
         </return-value>
@@ -2459,7 +2690,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_document_locale">
+      <callback name="get_document_locale" c:type="get_document_locale">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -2469,9 +2700,10 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_document_attributes">
+      <callback name="get_document_attributes"
+                c:type="get_document_attributes">
         <return-value>
-          <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
+          <type name="AttributeSet" c:type="AtkAttributeSet*"/>
         </return-value>
         <parameters>
           <parameter name="document">
@@ -2479,7 +2711,8 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_document_attribute_value">
+      <callback name="get_document_attribute_value"
+                c:type="get_document_attribute_value">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -2492,7 +2725,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_document_attribute">
+      <callback name="set_document_attribute" c:type="set_document_attribute">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -2509,16 +2742,16 @@
         </parameters>
       </callback>
       <field name="pad1">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <field name="pad2">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <field name="pad3">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <field name="pad4">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <glib:signal name="load-complete">
         <return-value>
@@ -2572,7 +2805,7 @@
     <function name="document_get_attributes"
               c:identifier="atk_document_get_attributes">
       <return-value>
-        <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
+        <type name="AttributeSet" c:type="AtkAttributeSet*"/>
       </return-value>
       <parameters>
         <parameter name="document">
@@ -2743,94 +2976,11 @@
         </parameter>
       </parameters>
     </function>
-    <record name="AtkText" c:type="AtkText"/>
-    <enumeration name="TextBoundary"
-                 c:type="AtkTextBoundary"
-                 glib:type-name="AtkTextBoundary"
-                 glib:get-type="atk_text_boundary_get_type">
-      <member name="char"
-              value="0"
-              c:identifier="ATK_TEXT_BOUNDARY_CHAR"
-              glib:nick="char"/>
-      <member name="word-start"
-              value="1"
-              c:identifier="ATK_TEXT_BOUNDARY_WORD_START"
-              glib:nick="word-start"/>
-      <member name="word-end"
-              value="2"
-              c:identifier="ATK_TEXT_BOUNDARY_WORD_END"
-              glib:nick="word-end"/>
-      <member name="sentence-start"
-              value="3"
-              c:identifier="ATK_TEXT_BOUNDARY_SENTENCE_START"
-              glib:nick="sentence-start"/>
-      <member name="sentence-end"
-              value="4"
-              c:identifier="ATK_TEXT_BOUNDARY_SENTENCE_END"
-              glib:nick="sentence-end"/>
-      <member name="line-start"
-              value="5"
-              c:identifier="ATK_TEXT_BOUNDARY_LINE_START"
-              glib:nick="line-start"/>
-      <member name="line-end"
-              value="6"
-              c:identifier="ATK_TEXT_BOUNDARY_LINE_END"
-              glib:nick="line-end"/>
-    </enumeration>
-    <record name="AtkTextRectangle" c:type="AtkTextRectangle">
-      <field name="x">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="y">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="width">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="height">
-        <type name="int32" c:type="gint"/>
-      </field>
-    </record>
-    <record name="AtkTextRange" c:type="AtkTextRange">
-      <field name="bounds">
-        <type name="AtkTextRectangle" c:type="AtkTextRectangle"/>
-      </field>
-      <field name="start_offset">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="end_offset">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="content">
-        <type name="string" c:type="gchar*"/>
-      </field>
-    </record>
-    <enumeration name="TextClipType"
-                 c:type="AtkTextClipType"
-                 glib:type-name="AtkTextClipType"
-                 glib:get-type="atk_text_clip_type_get_type">
-      <member name="none"
-              value="0"
-              c:identifier="ATK_TEXT_CLIP_NONE"
-              glib:nick="none"/>
-      <member name="min"
-              value="1"
-              c:identifier="ATK_TEXT_CLIP_MIN"
-              glib:nick="min"/>
-      <member name="max"
-              value="2"
-              c:identifier="ATK_TEXT_CLIP_MAX"
-              glib:nick="max"/>
-      <member name="both"
-              value="3"
-              c:identifier="ATK_TEXT_CLIP_BOTH"
-              glib:nick="both"/>
-    </enumeration>
     <interface name="Text"
                c:type="AtkText"
                glib:type-name="AtkText"
                glib:get-type="atk_text_get_type">
-      <callback name="get_text">
+      <callback name="get_text" c:type="get_text">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -2839,14 +2989,14 @@
             <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="start_offset">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="end_offset">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_text_after_offset">
+      <callback name="get_text_after_offset" c:type="get_text_after_offset">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -2855,20 +3005,20 @@
             <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="offset">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="boundary_type">
             <type name="TextBoundary" c:type="AtkTextBoundary"/>
           </parameter>
           <parameter name="start_offset">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="end_offset">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_text_at_offset">
+      <callback name="get_text_at_offset" c:type="get_text_at_offset">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -2877,33 +3027,34 @@
             <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="offset">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="boundary_type">
             <type name="TextBoundary" c:type="AtkTextBoundary"/>
           </parameter>
           <parameter name="start_offset">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="end_offset">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_character_at_offset">
+      <callback name="get_character_at_offset"
+                c:type="get_character_at_offset">
         <return-value>
-          <type name="GLib.gunichar" c:type="gunichar"/>
+          <type name="GLib.unichar" c:type="gunichar"/>
         </return-value>
         <parameters>
           <parameter name="text">
             <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="offset">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_text_before_offset">
+      <callback name="get_text_before_offset" c:type="get_text_before_offset">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -2912,22 +3063,22 @@
             <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="offset">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="boundary_type">
             <type name="TextBoundary" c:type="AtkTextBoundary"/>
           </parameter>
           <parameter name="start_offset">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="end_offset">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_caret_offset">
+      <callback name="get_caret_offset" c:type="get_caret_offset">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="text">
@@ -2935,28 +3086,28 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_run_attributes">
+      <callback name="get_run_attributes" c:type="get_run_attributes">
         <return-value>
-          <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
+          <type name="AttributeSet" c:type="AtkAttributeSet*"/>
         </return-value>
         <parameters>
           <parameter name="text">
             <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="offset">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="start_offset">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="end_offset">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_default_attributes">
+      <callback name="get_default_attributes" c:type="get_default_attributes">
         <return-value>
-          <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
+          <type name="AttributeSet" c:type="AtkAttributeSet*"/>
         </return-value>
         <parameters>
           <parameter name="text">
@@ -2964,7 +3115,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_character_extents">
+      <callback name="get_character_extents" c:type="get_character_extents">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -2973,28 +3124,28 @@
             <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="offset">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="x">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="width">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="height">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="coords">
             <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_character_count">
+      <callback name="get_character_count" c:type="get_character_count">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="text">
@@ -3002,28 +3153,28 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_offset_at_point">
+      <callback name="get_offset_at_point" c:type="get_offset_at_point">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="text">
             <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="coords">
             <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_n_selections">
+      <callback name="get_n_selections" c:type="get_n_selections">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="text">
@@ -3031,7 +3182,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_selection">
+      <callback name="get_selection" c:type="get_selection">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -3040,17 +3191,17 @@
             <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="selection_num">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="start_offset">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="end_offset">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="add_selection">
+      <callback name="add_selection" c:type="add_selection">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -3059,14 +3210,14 @@
             <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="start_offset">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="end_offset">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="remove_selection">
+      <callback name="remove_selection" c:type="remove_selection">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -3075,11 +3226,11 @@
             <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="selection_num">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_selection">
+      <callback name="set_selection" c:type="set_selection">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -3088,17 +3239,17 @@
             <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="selection_num">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="start_offset">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="end_offset">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_caret_offset">
+      <callback name="set_caret_offset" c:type="set_caret_offset">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -3107,11 +3258,11 @@
             <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="offset">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="text_changed">
+      <callback name="text_changed" c:type="text_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -3120,14 +3271,14 @@
             <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="position">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="length">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="text_caret_moved">
+      <callback name="text_caret_moved" c:type="text_caret_moved">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -3136,11 +3287,11 @@
             <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="location">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="text_selection_changed">
+      <callback name="text_selection_changed" c:type="text_selection_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -3150,7 +3301,8 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="text_attributes_changed">
+      <callback name="text_attributes_changed"
+                c:type="text_attributes_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -3160,7 +3312,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_range_extents">
+      <callback name="get_range_extents" c:type="get_range_extents">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -3169,29 +3321,29 @@
             <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="start_offset">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="end_offset">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="coord_type">
             <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
           <parameter name="rect">
-            <type name="AtkTextRectangle" c:type="AtkTextRectangle*"/>
+            <type name="TextRectangle" c:type="AtkTextRectangle*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_bounded_ranges">
+      <callback name="get_bounded_ranges" c:type="get_bounded_ranges">
         <return-value>
-          <type name="AtkTextRange" c:type="AtkTextRange**"/>
+          <type name="TextRange" c:type="AtkTextRange**"/>
         </return-value>
         <parameters>
           <parameter name="text">
             <type name="Text" c:type="AtkText*"/>
           </parameter>
           <parameter name="rect">
-            <type name="AtkTextRectangle" c:type="AtkTextRectangle*"/>
+            <type name="TextRectangle" c:type="AtkTextRectangle*"/>
           </parameter>
           <parameter name="coord_type">
             <type name="CoordType" c:type="AtkCoordType"/>
@@ -3205,7 +3357,7 @@
         </parameters>
       </callback>
       <field name="pad4">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <glib:signal name="text-changed">
         <return-value>
@@ -3213,10 +3365,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="p0">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -3226,7 +3378,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -3241,6 +3393,88 @@
         </return-value>
       </glib:signal>
     </interface>
+    <enumeration name="TextBoundary"
+                 c:type="AtkTextBoundary"
+                 glib:type-name="AtkTextBoundary"
+                 glib:get-type="atk_text_boundary_get_type">
+      <member name="char"
+              value="0"
+              c:identifier="ATK_TEXT_BOUNDARY_CHAR"
+              glib:nick="char"/>
+      <member name="word-start"
+              value="1"
+              c:identifier="ATK_TEXT_BOUNDARY_WORD_START"
+              glib:nick="word-start"/>
+      <member name="word-end"
+              value="2"
+              c:identifier="ATK_TEXT_BOUNDARY_WORD_END"
+              glib:nick="word-end"/>
+      <member name="sentence-start"
+              value="3"
+              c:identifier="ATK_TEXT_BOUNDARY_SENTENCE_START"
+              glib:nick="sentence-start"/>
+      <member name="sentence-end"
+              value="4"
+              c:identifier="ATK_TEXT_BOUNDARY_SENTENCE_END"
+              glib:nick="sentence-end"/>
+      <member name="line-start"
+              value="5"
+              c:identifier="ATK_TEXT_BOUNDARY_LINE_START"
+              glib:nick="line-start"/>
+      <member name="line-end"
+              value="6"
+              c:identifier="ATK_TEXT_BOUNDARY_LINE_END"
+              glib:nick="line-end"/>
+    </enumeration>
+    <record name="TextRectangle" c:type="AtkTextRectangle">
+      <field name="x">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="y">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="width">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="height">
+        <type name="int" c:type="gint"/>
+      </field>
+    </record>
+    <record name="TextRange" c:type="AtkTextRange">
+      <field name="bounds">
+        <type name="TextRectangle" c:type="AtkTextRectangle"/>
+      </field>
+      <field name="start_offset">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="end_offset">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="content">
+        <type name="string" c:type="gchar*"/>
+      </field>
+    </record>
+    <enumeration name="TextClipType"
+                 c:type="AtkTextClipType"
+                 glib:type-name="AtkTextClipType"
+                 glib:get-type="atk_text_clip_type_get_type">
+      <member name="none"
+              value="0"
+              c:identifier="ATK_TEXT_CLIP_NONE"
+              glib:nick="none"/>
+      <member name="min"
+              value="1"
+              c:identifier="ATK_TEXT_CLIP_MIN"
+              glib:nick="min"/>
+      <member name="max"
+              value="2"
+              c:identifier="ATK_TEXT_CLIP_MAX"
+              glib:nick="max"/>
+      <member name="both"
+              value="3"
+              c:identifier="ATK_TEXT_CLIP_BOTH"
+              glib:nick="both"/>
+    </enumeration>
     <function name="text_get_text" c:identifier="atk_text_get_text">
       <return-value>
         <type name="string" c:type="gchar*"/>
@@ -3250,24 +3484,24 @@
           <type name="Text" c:type="AtkText*"/>
         </parameter>
         <parameter name="start_offset">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="end_offset">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="text_get_character_at_offset"
               c:identifier="atk_text_get_character_at_offset">
       <return-value>
-        <type name="GLib.gunichar" c:type="gunichar"/>
+        <type name="GLib.unichar" c:type="gunichar"/>
       </return-value>
       <parameters>
         <parameter name="text">
           <type name="Text" c:type="AtkText*"/>
         </parameter>
         <parameter name="offset">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -3281,16 +3515,16 @@
           <type name="Text" c:type="AtkText*"/>
         </parameter>
         <parameter name="offset">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="boundary_type">
           <type name="TextBoundary" c:type="AtkTextBoundary"/>
         </parameter>
         <parameter name="start_offset">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="end_offset">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -3304,16 +3538,16 @@
           <type name="Text" c:type="AtkText*"/>
         </parameter>
         <parameter name="offset">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="boundary_type">
           <type name="TextBoundary" c:type="AtkTextBoundary"/>
         </parameter>
         <parameter name="start_offset">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="end_offset">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -3327,23 +3561,23 @@
           <type name="Text" c:type="AtkText*"/>
         </parameter>
         <parameter name="offset">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="boundary_type">
           <type name="TextBoundary" c:type="AtkTextBoundary"/>
         </parameter>
         <parameter name="start_offset">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="end_offset">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
     <function name="text_get_caret_offset"
               c:identifier="atk_text_get_caret_offset">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="text">
@@ -3361,19 +3595,19 @@
           <type name="Text" c:type="AtkText*"/>
         </parameter>
         <parameter name="offset">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="x">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="y">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="width">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="height">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="coords">
           <type name="CoordType" c:type="AtkCoordType"/>
@@ -3383,27 +3617,27 @@
     <function name="text_get_run_attributes"
               c:identifier="atk_text_get_run_attributes">
       <return-value>
-        <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
+        <type name="AttributeSet" c:type="AtkAttributeSet*"/>
       </return-value>
       <parameters>
         <parameter name="text">
           <type name="Text" c:type="AtkText*"/>
         </parameter>
         <parameter name="offset">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="start_offset">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="end_offset">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
     <function name="text_get_default_attributes"
               c:identifier="atk_text_get_default_attributes">
       <return-value>
-        <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
+        <type name="AttributeSet" c:type="AtkAttributeSet*"/>
       </return-value>
       <parameters>
         <parameter name="text">
@@ -3414,7 +3648,7 @@
     <function name="text_get_character_count"
               c:identifier="atk_text_get_character_count">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="text">
@@ -3425,17 +3659,17 @@
     <function name="text_get_offset_at_point"
               c:identifier="atk_text_get_offset_at_point">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="text">
           <type name="Text" c:type="AtkText*"/>
         </parameter>
         <parameter name="x">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="coords">
           <type name="CoordType" c:type="AtkCoordType"/>
@@ -3445,7 +3679,7 @@
     <function name="text_get_n_selections"
               c:identifier="atk_text_get_n_selections">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="text">
@@ -3462,13 +3696,13 @@
           <type name="Text" c:type="AtkText*"/>
         </parameter>
         <parameter name="selection_num">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="start_offset">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="end_offset">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -3481,10 +3715,10 @@
           <type name="Text" c:type="AtkText*"/>
         </parameter>
         <parameter name="start_offset">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="end_offset">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -3498,7 +3732,7 @@
           <type name="Text" c:type="AtkText*"/>
         </parameter>
         <parameter name="selection_num">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -3511,13 +3745,13 @@
           <type name="Text" c:type="AtkText*"/>
         </parameter>
         <parameter name="selection_num">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="start_offset">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="end_offset">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -3531,7 +3765,7 @@
           <type name="Text" c:type="AtkText*"/>
         </parameter>
         <parameter name="offset">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -3545,30 +3779,30 @@
           <type name="Text" c:type="AtkText*"/>
         </parameter>
         <parameter name="start_offset">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="end_offset">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="coord_type">
           <type name="CoordType" c:type="AtkCoordType"/>
         </parameter>
         <parameter name="rect">
-          <type name="AtkTextRectangle" c:type="AtkTextRectangle*"/>
+          <type name="TextRectangle" c:type="AtkTextRectangle*"/>
         </parameter>
       </parameters>
     </function>
     <function name="text_get_bounded_ranges"
               c:identifier="atk_text_get_bounded_ranges">
       <return-value>
-        <type name="AtkTextRange" c:type="AtkTextRange**"/>
+        <type name="TextRange" c:type="AtkTextRange**"/>
       </return-value>
       <parameters>
         <parameter name="text">
           <type name="Text" c:type="AtkText*"/>
         </parameter>
         <parameter name="rect">
-          <type name="AtkTextRectangle" c:type="AtkTextRectangle*"/>
+          <type name="TextRectangle" c:type="AtkTextRectangle*"/>
         </parameter>
         <parameter name="coord_type">
           <type name="CoordType" c:type="AtkCoordType"/>
@@ -3587,7 +3821,7 @@
       </return-value>
       <parameters>
         <parameter name="ranges">
-          <type name="AtkTextRange" c:type="AtkTextRange**"/>
+          <type name="TextRange" c:type="AtkTextRange**"/>
         </parameter>
       </parameters>
     </function>
@@ -3597,7 +3831,7 @@
       </return-value>
       <parameters>
         <parameter name="attrib_set">
-          <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
+          <type name="AttributeSet" c:type="AtkAttributeSet*"/>
         </parameter>
       </parameters>
     </function>
@@ -3633,16 +3867,15 @@
           <type name="TextAttribute" c:type="AtkTextAttribute"/>
         </parameter>
         <parameter name="index_">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <record name="AtkEditableText" c:type="AtkEditableText"/>
     <interface name="EditableText"
                c:type="AtkEditableText"
                glib:type-name="AtkEditableText"
                glib:get-type="atk_editable_text_get_type">
-      <callback name="set_run_attributes">
+      <callback name="set_run_attributes" c:type="set_run_attributes">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -3651,17 +3884,17 @@
             <type name="EditableText" c:type="AtkEditableText*"/>
           </parameter>
           <parameter name="attrib_set">
-            <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
+            <type name="AttributeSet" c:type="AtkAttributeSet*"/>
           </parameter>
           <parameter name="start_offset">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="end_offset">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_text_contents">
+      <callback name="set_text_contents" c:type="set_text_contents">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -3674,7 +3907,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="insert_text">
+      <callback name="insert_text" c:type="insert_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -3686,14 +3919,14 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="length">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="position">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="copy_text">
+      <callback name="copy_text" c:type="copy_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -3702,14 +3935,14 @@
             <type name="EditableText" c:type="AtkEditableText*"/>
           </parameter>
           <parameter name="start_pos">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="end_pos">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="cut_text">
+      <callback name="cut_text" c:type="cut_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -3718,14 +3951,14 @@
             <type name="EditableText" c:type="AtkEditableText*"/>
           </parameter>
           <parameter name="start_pos">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="end_pos">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="delete_text">
+      <callback name="delete_text" c:type="delete_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -3734,14 +3967,14 @@
             <type name="EditableText" c:type="AtkEditableText*"/>
           </parameter>
           <parameter name="start_pos">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="end_pos">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="paste_text">
+      <callback name="paste_text" c:type="paste_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -3750,15 +3983,15 @@
             <type name="EditableText" c:type="AtkEditableText*"/>
           </parameter>
           <parameter name="position">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <field name="pad1">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <field name="pad2">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
     </interface>
     <function name="editable_text_set_run_attributes"
@@ -3771,13 +4004,13 @@
           <type name="EditableText" c:type="AtkEditableText*"/>
         </parameter>
         <parameter name="attrib_set">
-          <type name="AtkAttributeSet" c:type="AtkAttributeSet*"/>
+          <type name="AttributeSet" c:type="AtkAttributeSet*"/>
         </parameter>
         <parameter name="start_offset">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="end_offset">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -3808,10 +4041,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="position">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -3825,10 +4058,10 @@
           <type name="EditableText" c:type="AtkEditableText*"/>
         </parameter>
         <parameter name="start_pos">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="end_pos">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -3842,10 +4075,10 @@
           <type name="EditableText" c:type="AtkEditableText*"/>
         </parameter>
         <parameter name="start_pos">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="end_pos">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -3859,10 +4092,10 @@
           <type name="EditableText" c:type="AtkEditableText*"/>
         </parameter>
         <parameter name="start_pos">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="end_pos">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -3876,7 +4109,7 @@
           <type name="EditableText" c:type="AtkEditableText*"/>
         </parameter>
         <parameter name="position">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -3914,7 +4147,7 @@
             <type name="Hyperlink" c:type="AtkHyperlink*"/>
           </parameter>
           <parameter name="i">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -3927,13 +4160,13 @@
             <type name="Hyperlink" c:type="AtkHyperlink*"/>
           </parameter>
           <parameter name="i">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_end_index" c:identifier="atk_hyperlink_get_end_index">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="link_">
@@ -3944,7 +4177,7 @@
       <method name="get_start_index"
               c:identifier="atk_hyperlink_get_start_index">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="link_">
@@ -3974,7 +4207,7 @@
       </method>
       <method name="get_n_anchors" c:identifier="atk_hyperlink_get_n_anchors">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="link_">
@@ -3997,15 +4230,15 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="number-of-anchors">
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </property>
       <property name="end-index">
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </property>
       <property name="start-index">
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </property>
-      <callback name="get_uri">
+      <callback name="get_uri" c:type="get_uri">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -4014,11 +4247,11 @@
             <type name="Hyperlink" c:type="AtkHyperlink*"/>
           </parameter>
           <parameter name="i">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_object">
+      <callback name="get_object" c:type="get_object">
         <return-value>
           <type name="Object" c:type="AtkObject*"/>
         </return-value>
@@ -4027,13 +4260,13 @@
             <type name="Hyperlink" c:type="AtkHyperlink*"/>
           </parameter>
           <parameter name="i">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_end_index">
+      <callback name="get_end_index" c:type="get_end_index">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="link_">
@@ -4041,9 +4274,9 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_start_index">
+      <callback name="get_start_index" c:type="get_start_index">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="link_">
@@ -4051,7 +4284,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="is_valid">
+      <callback name="is_valid" c:type="is_valid">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -4061,9 +4294,9 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_n_anchors">
+      <callback name="get_n_anchors" c:type="get_n_anchors">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="link_">
@@ -4071,9 +4304,9 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="link_state">
+      <callback name="link_state" c:type="link_state">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="link_">
@@ -4081,7 +4314,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="is_selected_link">
+      <callback name="is_selected_link" c:type="is_selected_link">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -4091,7 +4324,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="link_activated">
+      <callback name="link_activated" c:type="link_activated">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4102,7 +4335,7 @@
         </parameters>
       </callback>
       <field name="pad1">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <glib:signal name="link-activated">
         <return-value>
@@ -4110,12 +4343,11 @@
         </return-value>
       </glib:signal>
     </class>
-    <record name="AtkHyperlinkImpl" c:type="AtkHyperlinkImpl"/>
     <interface name="HyperlinkImpl"
                c:type="AtkHyperlinkImpl"
                glib:type-name="AtkHyperlinkImpl"
                glib:get-type="atk_hyperlink_impl_get_type">
-      <callback name="get_hyperlink">
+      <callback name="get_hyperlink" c:type="get_hyperlink">
         <return-value>
           <type name="Hyperlink" c:type="AtkHyperlink*"/>
         </return-value>
@@ -4126,15 +4358,14 @@
         </parameters>
       </callback>
       <field name="pad1">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
     </interface>
-    <record name="AtkHypertext" c:type="AtkHypertext"/>
     <interface name="Hypertext"
                c:type="AtkHypertext"
                glib:type-name="AtkHypertext"
                glib:get-type="atk_hypertext_get_type">
-      <callback name="get_link">
+      <callback name="get_link" c:type="get_link">
         <return-value>
           <type name="Hyperlink" c:type="AtkHyperlink*"/>
         </return-value>
@@ -4143,13 +4374,13 @@
             <type name="Hypertext" c:type="AtkHypertext*"/>
           </parameter>
           <parameter name="link_index">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_n_links">
+      <callback name="get_n_links" c:type="get_n_links">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="hypertext">
@@ -4157,20 +4388,20 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_link_index">
+      <callback name="get_link_index" c:type="get_link_index">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="hypertext">
             <type name="Hypertext" c:type="AtkHypertext*"/>
           </parameter>
           <parameter name="char_index">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="link_selected">
+      <callback name="link_selected" c:type="link_selected">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4179,18 +4410,18 @@
             <type name="Hypertext" c:type="AtkHypertext*"/>
           </parameter>
           <parameter name="link_index">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
       <field name="pad1">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <field name="pad2">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <field name="pad3">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <glib:signal name="link-selected">
         <return-value>
@@ -4198,7 +4429,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -4212,14 +4443,14 @@
           <type name="Hypertext" c:type="AtkHypertext*"/>
         </parameter>
         <parameter name="link_index">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="hypertext_get_n_links"
               c:identifier="atk_hypertext_get_n_links">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="hypertext">
@@ -4230,23 +4461,22 @@
     <function name="hypertext_get_link_index"
               c:identifier="atk_hypertext_get_link_index">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="hypertext">
           <type name="Hypertext" c:type="AtkHypertext*"/>
         </parameter>
         <parameter name="char_index">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <record name="AtkImage" c:type="AtkImage"/>
     <interface name="Image"
                c:type="AtkImage"
                glib:type-name="AtkImage"
                glib:get-type="atk_image_get_type">
-      <callback name="get_image_position">
+      <callback name="get_image_position" c:type="get_image_position">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4255,17 +4485,17 @@
             <type name="Image" c:type="AtkImage*"/>
           </parameter>
           <parameter name="x">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="coord_type">
             <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_image_description">
+      <callback name="get_image_description" c:type="get_image_description">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -4275,7 +4505,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_image_size">
+      <callback name="get_image_size" c:type="get_image_size">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4284,14 +4514,14 @@
             <type name="Image" c:type="AtkImage*"/>
           </parameter>
           <parameter name="width">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="height">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_image_description">
+      <callback name="set_image_description" c:type="set_image_description">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -4304,7 +4534,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_image_locale">
+      <callback name="get_image_locale" c:type="get_image_locale">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -4315,7 +4545,7 @@
         </parameters>
       </callback>
       <field name="pad1">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
     </interface>
     <function name="image_get_image_description"
@@ -4339,10 +4569,10 @@
           <type name="Image" c:type="AtkImage*"/>
         </parameter>
         <parameter name="width">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="height">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -4370,10 +4600,10 @@
           <type name="Image" c:type="AtkImage*"/>
         </parameter>
         <parameter name="x">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="y">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="coord_type">
           <type name="CoordType" c:type="AtkCoordType"/>
@@ -4425,7 +4655,7 @@
       <method name="get_accessible_type"
               c:identifier="atk_object_factory_get_accessible_type">
         <return-value>
-          <type name="GObject.GType" c:type="GType"/>
+          <type name="GObject.Type" c:type="GType"/>
         </return-value>
         <parameters>
           <parameter name="factory">
@@ -4433,7 +4663,7 @@
           </parameter>
         </parameters>
       </method>
-      <callback name="create_accessible">
+      <callback name="create_accessible" c:type="create_accessible">
         <return-value>
           <type name="Object" c:type="AtkObject*"/>
         </return-value>
@@ -4443,7 +4673,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="invalidate">
+      <callback name="invalidate" c:type="invalidate">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4453,16 +4683,16 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_accessible_type">
+      <callback name="get_accessible_type" c:type="get_accessible_type">
         <return-value>
-          <type name="GObject.GType" c:type="GType"/>
+          <type name="GObject.Type" c:type="GType"/>
         </return-value>
       </callback>
       <field name="pad1">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <field name="pad2">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
     </class>
     <class name="NoOpObjectFactory"
@@ -4492,24 +4722,24 @@
             <type name="Registry" c:type="AtkRegistry*"/>
           </parameter>
           <parameter name="type">
-            <type name="GObject.GType" c:type="GType"/>
+            <type name="GObject.Type" c:type="GType"/>
           </parameter>
           <parameter name="factory_type">
-            <type name="GObject.GType" c:type="GType"/>
+            <type name="GObject.Type" c:type="GType"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_factory_type"
               c:identifier="atk_registry_get_factory_type">
         <return-value>
-          <type name="GObject.GType" c:type="GType"/>
+          <type name="GObject.Type" c:type="GType"/>
         </return-value>
         <parameters>
           <parameter name="registry">
             <type name="Registry" c:type="AtkRegistry*"/>
           </parameter>
           <parameter name="type">
-            <type name="GObject.GType" c:type="GType"/>
+            <type name="GObject.Type" c:type="GType"/>
           </parameter>
         </parameters>
       </method>
@@ -4522,7 +4752,7 @@
             <type name="Registry" c:type="AtkRegistry*"/>
           </parameter>
           <parameter name="type">
-            <type name="GObject.GType" c:type="GType"/>
+            <type name="GObject.Type" c:type="GType"/>
           </parameter>
         </parameters>
       </method>
@@ -4547,7 +4777,7 @@
             <type name="Object" c:type="AtkObject**"/>
           </parameter>
           <parameter name="n_targets">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="relationship">
             <type name="RelationType" c:type="AtkRelationType"/>
@@ -4564,7 +4794,7 @@
             <type name="RelationSet" c:type="AtkRelationSet*"/>
           </parameter>
           <parameter name="i">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </constructor>
@@ -4595,7 +4825,7 @@
       </method>
       <method name="get_target" c:identifier="atk_relation_get_target">
         <return-value>
-          <type name="GLib.GPtrArray" c:type="GPtrArray*"/>
+          <type name="GLib.PtrArray" c:type="GPtrArray*"/>
         </return-value>
         <parameters>
           <parameter name="relation">
@@ -4620,7 +4850,7 @@
         <type name="RelationType" c:type="AtkRelationType"/>
       </property>
       <property name="target">
-        <type name="GObject.GValueArray" c:type="GValueArray"/>
+        <type name="GObject.ValueArray" c:type="GValueArray"/>
       </property>
     </class>
     <function name="relation_type_register"
@@ -4656,96 +4886,11 @@
         </parameter>
       </parameters>
     </function>
-    <class name="RelationSet"
-           c:type="AtkRelationSet"
-           parent="GObject.Object"
-           glib:type-name="AtkRelationSet"
-           glib:get-type="atk_relation_set_get_type">
-      <constructor name="new" c:identifier="atk_relation_set_new">
-        <return-value>
-          <type name="RelationSet" c:type="AtkRelationSet*"/>
-        </return-value>
-      </constructor>
-      <method name="contains" c:identifier="atk_relation_set_contains">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="RelationSet" c:type="AtkRelationSet*"/>
-          </parameter>
-          <parameter name="relationship">
-            <type name="RelationType" c:type="AtkRelationType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="remove" c:identifier="atk_relation_set_remove">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="RelationSet" c:type="AtkRelationSet*"/>
-          </parameter>
-          <parameter name="relation">
-            <type name="Relation" c:type="AtkRelation*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add" c:identifier="atk_relation_set_add">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="RelationSet" c:type="AtkRelationSet*"/>
-          </parameter>
-          <parameter name="relation">
-            <type name="Relation" c:type="AtkRelation*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_n_relations"
-              c:identifier="atk_relation_set_get_n_relations">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="RelationSet" c:type="AtkRelationSet*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_relation_by_type"
-              c:identifier="atk_relation_set_add_relation_by_type">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="RelationSet" c:type="AtkRelationSet*"/>
-          </parameter>
-          <parameter name="relationship">
-            <type name="RelationType" c:type="AtkRelationType"/>
-          </parameter>
-          <parameter name="target">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <field name="pad1">
-        <type name="AtkFunction" c:type="AtkFunction"/>
-      </field>
-      <field name="pad2">
-        <type name="AtkFunction" c:type="AtkFunction"/>
-      </field>
-    </class>
-    <record name="AtkSelection" c:type="AtkSelection"/>
     <interface name="Selection"
                c:type="AtkSelection"
                glib:type-name="AtkSelection"
                glib:get-type="atk_selection_get_type">
-      <callback name="add_selection">
+      <callback name="add_selection" c:type="add_selection">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -4754,11 +4899,11 @@
             <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
           <parameter name="i">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="clear_selection">
+      <callback name="clear_selection" c:type="clear_selection">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -4768,7 +4913,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="ref_selection">
+      <callback name="ref_selection" c:type="ref_selection">
         <return-value>
           <type name="Object" c:type="AtkObject*"/>
         </return-value>
@@ -4777,13 +4922,13 @@
             <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
           <parameter name="i">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_selection_count">
+      <callback name="get_selection_count" c:type="get_selection_count">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="selection">
@@ -4791,7 +4936,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="is_child_selected">
+      <callback name="is_child_selected" c:type="is_child_selected">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -4800,11 +4945,11 @@
             <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
           <parameter name="i">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="remove_selection">
+      <callback name="remove_selection" c:type="remove_selection">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -4813,11 +4958,11 @@
             <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
           <parameter name="i">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="select_all_selection">
+      <callback name="select_all_selection" c:type="select_all_selection">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -4827,7 +4972,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="selection_changed">
+      <callback name="selection_changed" c:type="selection_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4838,10 +4983,10 @@
         </parameters>
       </callback>
       <field name="pad1">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <field name="pad2">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <glib:signal name="selection-changed">
         <return-value>
@@ -4859,7 +5004,7 @@
           <type name="Selection" c:type="AtkSelection*"/>
         </parameter>
         <parameter name="i">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -4884,14 +5029,14 @@
           <type name="Selection" c:type="AtkSelection*"/>
         </parameter>
         <parameter name="i">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="selection_get_selection_count"
               c:identifier="atk_selection_get_selection_count">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="selection">
@@ -4909,7 +5054,7 @@
           <type name="Selection" c:type="AtkSelection*"/>
         </parameter>
         <parameter name="i">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -4923,7 +5068,7 @@
           <type name="Selection" c:type="AtkSelection*"/>
         </parameter>
         <parameter name="i">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -4938,157 +5083,13 @@
         </parameter>
       </parameters>
     </function>
-    <class name="StateSet"
-           c:type="AtkStateSet"
-           parent="GObject.Object"
-           glib:type-name="AtkStateSet"
-           glib:get-type="atk_state_set_get_type">
-      <constructor name="new" c:identifier="atk_state_set_new">
-        <return-value>
-          <type name="StateSet" c:type="AtkStateSet*"/>
-        </return-value>
-      </constructor>
-      <constructor name="and_sets" c:identifier="atk_state_set_and_sets">
-        <return-value>
-          <type name="StateSet" c:type="AtkStateSet*"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-          <parameter name="compare_set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="or_sets" c:identifier="atk_state_set_or_sets">
-        <return-value>
-          <type name="StateSet" c:type="AtkStateSet*"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-          <parameter name="compare_set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="xor_sets" c:identifier="atk_state_set_xor_sets">
-        <return-value>
-          <type name="StateSet" c:type="AtkStateSet*"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-          <parameter name="compare_set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="is_empty" c:identifier="atk_state_set_is_empty">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_state" c:identifier="atk_state_set_add_state">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="StateType" c:type="AtkStateType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_states" c:identifier="atk_state_set_add_states">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-          <parameter name="types">
-            <type name="StateType" c:type="AtkStateType*"/>
-          </parameter>
-          <parameter name="n_types">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="clear_states" c:identifier="atk_state_set_clear_states">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="contains_state"
-              c:identifier="atk_state_set_contains_state">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="StateType" c:type="AtkStateType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="contains_states"
-              c:identifier="atk_state_set_contains_states">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-          <parameter name="types">
-            <type name="StateType" c:type="AtkStateType*"/>
-          </parameter>
-          <parameter name="n_types">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="remove_state" c:identifier="atk_state_set_remove_state">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="StateType" c:type="AtkStateType"/>
-          </parameter>
-        </parameters>
-      </method>
-    </class>
-    <record name="AtkStreamableContent" c:type="AtkStreamableContent"/>
     <interface name="StreamableContent"
                c:type="AtkStreamableContent"
                glib:type-name="AtkStreamableContent"
                glib:get-type="atk_streamable_content_get_type">
-      <callback name="get_n_mime_types">
+      <callback name="get_n_mime_types" c:type="get_n_mime_types">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="streamable">
@@ -5096,7 +5097,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_mime_type">
+      <callback name="get_mime_type" c:type="get_mime_type">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -5105,13 +5106,13 @@
             <type name="StreamableContent" c:type="AtkStreamableContent*"/>
           </parameter>
           <parameter name="i">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_stream">
+      <callback name="get_stream" c:type="get_stream">
         <return-value>
-          <type name="GLib.GIOChannel" c:type="GIOChannel*"/>
+          <type name="GObject.IOChannel" c:type="GIOChannel*"/>
         </return-value>
         <parameters>
           <parameter name="streamable">
@@ -5122,7 +5123,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_uri">
+      <callback name="get_uri" c:type="get_uri">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -5136,19 +5137,19 @@
         </parameters>
       </callback>
       <field name="pad1">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <field name="pad2">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <field name="pad3">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
     </interface>
     <function name="streamable_content_get_n_mime_types"
               c:identifier="atk_streamable_content_get_n_mime_types">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="streamable">
@@ -5166,14 +5167,14 @@
           <type name="StreamableContent" c:type="AtkStreamableContent*"/>
         </parameter>
         <parameter name="i">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="streamable_content_get_stream"
               c:identifier="atk_streamable_content_get_stream">
       <return-value>
-        <type name="GLib.GIOChannel" c:type="GIOChannel*"/>
+        <type name="GObject.IOChannel" c:type="GIOChannel*"/>
       </return-value>
       <parameters>
         <parameter name="streamable">
@@ -5198,12 +5199,11 @@
         </parameter>
       </parameters>
     </function>
-    <record name="AtkTable" c:type="AtkTable"/>
     <interface name="Table"
                c:type="AtkTable"
                glib:type-name="AtkTable"
                glib:get-type="atk_table_get_type">
-      <callback name="ref_at">
+      <callback name="ref_at" c:type="ref_at">
         <return-value>
           <type name="Object" c:type="AtkObject*"/>
         </return-value>
@@ -5212,58 +5212,58 @@
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="column">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_index_at">
+      <callback name="get_index_at" c:type="get_index_at">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="table">
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="column">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_column_at_index">
+      <callback name="get_column_at_index" c:type="get_column_at_index">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="table">
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="index_">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_row_at_index">
+      <callback name="get_row_at_index" c:type="get_row_at_index">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="table">
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="index_">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_n_columns">
+      <callback name="get_n_columns" c:type="get_n_columns">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="table">
@@ -5271,9 +5271,9 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_n_rows">
+      <callback name="get_n_rows" c:type="get_n_rows">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="table">
@@ -5281,39 +5281,39 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_column_extent_at">
+      <callback name="get_column_extent_at" c:type="get_column_extent_at">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="table">
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="column">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_row_extent_at">
+      <callback name="get_row_extent_at" c:type="get_row_extent_at">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="table">
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="column">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_caption">
+      <callback name="get_caption" c:type="get_caption">
         <return-value>
           <type name="Object" c:type="AtkObject*"/>
         </return-value>
@@ -5323,7 +5323,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_column_description">
+      <callback name="get_column_description" c:type="get_column_description">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -5332,11 +5332,11 @@
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="column">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_column_header">
+      <callback name="get_column_header" c:type="get_column_header">
         <return-value>
           <type name="Object" c:type="AtkObject*"/>
         </return-value>
@@ -5345,11 +5345,11 @@
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="column">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_row_description">
+      <callback name="get_row_description" c:type="get_row_description">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -5358,11 +5358,11 @@
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_row_header">
+      <callback name="get_row_header" c:type="get_row_header">
         <return-value>
           <type name="Object" c:type="AtkObject*"/>
         </return-value>
@@ -5371,11 +5371,11 @@
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_summary">
+      <callback name="get_summary" c:type="get_summary">
         <return-value>
           <type name="Object" c:type="AtkObject*"/>
         </return-value>
@@ -5385,7 +5385,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_caption">
+      <callback name="set_caption" c:type="set_caption">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -5398,7 +5398,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_column_description">
+      <callback name="set_column_description" c:type="set_column_description">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -5407,14 +5407,14 @@
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="column">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="description">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_column_header">
+      <callback name="set_column_header" c:type="set_column_header">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -5423,14 +5423,14 @@
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="column">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="header">
             <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_row_description">
+      <callback name="set_row_description" c:type="set_row_description">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -5439,14 +5439,14 @@
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="description">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_row_header">
+      <callback name="set_row_header" c:type="set_row_header">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -5455,14 +5455,14 @@
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="header">
             <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_summary">
+      <callback name="set_summary" c:type="set_summary">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -5475,33 +5475,33 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_selected_columns">
+      <callback name="get_selected_columns" c:type="get_selected_columns">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="table">
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="selected">
-            <type name="GLib.gint" c:type="gint**"/>
+            <type name="int" c:type="gint**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_selected_rows">
+      <callback name="get_selected_rows" c:type="get_selected_rows">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="table">
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="selected">
-            <type name="GLib.gint" c:type="gint**"/>
+            <type name="int" c:type="gint**"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="is_column_selected">
+      <callback name="is_column_selected" c:type="is_column_selected">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -5510,11 +5510,11 @@
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="column">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="is_row_selected">
+      <callback name="is_row_selected" c:type="is_row_selected">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -5523,11 +5523,11 @@
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="is_selected">
+      <callback name="is_selected" c:type="is_selected">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -5536,14 +5536,14 @@
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="column">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="add_row_selection">
+      <callback name="add_row_selection" c:type="add_row_selection">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -5552,11 +5552,11 @@
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="remove_row_selection">
+      <callback name="remove_row_selection" c:type="remove_row_selection">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -5565,11 +5565,11 @@
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="add_column_selection">
+      <callback name="add_column_selection" c:type="add_column_selection">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -5578,11 +5578,12 @@
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="column">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="remove_column_selection">
+      <callback name="remove_column_selection"
+                c:type="remove_column_selection">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -5591,11 +5592,11 @@
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="column">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="row_inserted">
+      <callback name="row_inserted" c:type="row_inserted">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -5604,14 +5605,14 @@
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="num_inserted">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="column_inserted">
+      <callback name="column_inserted" c:type="column_inserted">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -5620,14 +5621,14 @@
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="column">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="num_inserted">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="row_deleted">
+      <callback name="row_deleted" c:type="row_deleted">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -5636,14 +5637,14 @@
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="row">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="num_deleted">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="column_deleted">
+      <callback name="column_deleted" c:type="column_deleted">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -5652,14 +5653,14 @@
             <type name="Table" c:type="AtkTable*"/>
           </parameter>
           <parameter name="column">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="num_deleted">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="row_reordered">
+      <callback name="row_reordered" c:type="row_reordered">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -5669,7 +5670,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="column_reordered">
+      <callback name="column_reordered" c:type="column_reordered">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -5679,7 +5680,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="model_changed">
+      <callback name="model_changed" c:type="model_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -5690,16 +5691,16 @@
         </parameters>
       </callback>
       <field name="pad1">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <field name="pad2">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <field name="pad3">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <field name="pad4">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <glib:signal name="row-inserted">
         <return-value>
@@ -5707,10 +5708,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="p0">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -5720,10 +5721,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="p0">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -5733,10 +5734,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="p0">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -5746,10 +5747,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="p0">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -5778,61 +5779,61 @@
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="row">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="column">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="table_get_index_at" c:identifier="atk_table_get_index_at">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="table">
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="row">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="column">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="table_get_column_at_index"
               c:identifier="atk_table_get_column_at_index">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="table">
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="index_">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="table_get_row_at_index"
               c:identifier="atk_table_get_row_at_index">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="table">
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="index_">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="table_get_n_columns"
               c:identifier="atk_table_get_n_columns">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="table">
@@ -5842,7 +5843,7 @@
     </function>
     <function name="table_get_n_rows" c:identifier="atk_table_get_n_rows">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="table">
@@ -5853,34 +5854,34 @@
     <function name="table_get_column_extent_at"
               c:identifier="atk_table_get_column_extent_at">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="table">
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="row">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="column">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
     <function name="table_get_row_extent_at"
               c:identifier="atk_table_get_row_extent_at">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="table">
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="row">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="column">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -5904,7 +5905,7 @@
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="column">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -5918,7 +5919,7 @@
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="column">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -5932,7 +5933,7 @@
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="row">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -5946,7 +5947,7 @@
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="row">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -5983,7 +5984,7 @@
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="column">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="description">
           <type name="string" c:type="gchar*"/>
@@ -6000,7 +6001,7 @@
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="column">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="header">
           <type name="Object" c:type="AtkObject*"/>
@@ -6017,7 +6018,7 @@
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="row">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="description">
           <type name="string" c:type="gchar*"/>
@@ -6034,7 +6035,7 @@
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="row">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="header">
           <type name="Object" c:type="AtkObject*"/>
@@ -6057,28 +6058,28 @@
     <function name="table_get_selected_columns"
               c:identifier="atk_table_get_selected_columns">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="table">
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="selected">
-          <type name="GLib.gint" c:type="gint**"/>
+          <type name="int" c:type="gint**"/>
         </parameter>
       </parameters>
     </function>
     <function name="table_get_selected_rows"
               c:identifier="atk_table_get_selected_rows">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
         <parameter name="table">
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="selected">
-          <type name="GLib.gint" c:type="gint**"/>
+          <type name="int" c:type="gint**"/>
         </parameter>
       </parameters>
     </function>
@@ -6092,7 +6093,7 @@
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="column">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -6106,7 +6107,7 @@
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="row">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -6119,10 +6120,10 @@
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="row">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="column">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -6136,7 +6137,7 @@
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="row">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -6150,7 +6151,7 @@
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="row">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -6164,7 +6165,7 @@
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="column">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -6178,7 +6179,7 @@
           <type name="Table" c:type="AtkTable*"/>
         </parameter>
         <parameter name="column">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -6212,7 +6213,7 @@
           </parameter>
         </parameters>
       </method>
-      <callback name="threads_enter">
+      <callback name="threads_enter" c:type="threads_enter">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -6222,7 +6223,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="threads_leave">
+      <callback name="threads_leave" c:type="threads_leave">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -6236,12 +6237,11 @@
         <type name="any" c:type="gpointer"/>
       </field>
     </class>
-    <record name="AtkValue" c:type="AtkValue"/>
     <interface name="Value"
                c:type="AtkValue"
                glib:type-name="AtkValue"
                glib:get-type="atk_value_get_type">
-      <callback name="get_current_value">
+      <callback name="get_current_value" c:type="get_current_value">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -6250,11 +6250,11 @@
             <type name="Value" c:type="AtkValue*"/>
           </parameter>
           <parameter name="value">
-            <type name="GObject.GValue" c:type="GValue*"/>
+            <type name="GObject.Value" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_maximum_value">
+      <callback name="get_maximum_value" c:type="get_maximum_value">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -6263,11 +6263,11 @@
             <type name="Value" c:type="AtkValue*"/>
           </parameter>
           <parameter name="value">
-            <type name="GObject.GValue" c:type="GValue*"/>
+            <type name="GObject.Value" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_minimum_value">
+      <callback name="get_minimum_value" c:type="get_minimum_value">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -6276,11 +6276,11 @@
             <type name="Value" c:type="AtkValue*"/>
           </parameter>
           <parameter name="value">
-            <type name="GObject.GValue" c:type="GValue*"/>
+            <type name="GObject.Value" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_current_value">
+      <callback name="set_current_value" c:type="set_current_value">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -6289,11 +6289,11 @@
             <type name="Value" c:type="AtkValue*"/>
           </parameter>
           <parameter name="value">
-            <type name="GObject.GValue" c:type="GValue*"/>
+            <type name="GObject.Value" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_minimum_increment">
+      <callback name="get_minimum_increment" c:type="get_minimum_increment">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -6302,12 +6302,12 @@
             <type name="Value" c:type="AtkValue*"/>
           </parameter>
           <parameter name="value">
-            <type name="GObject.GValue" c:type="GValue*"/>
+            <type name="GObject.Value" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
       <field name="pad1">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
     </interface>
     <function name="value_get_current_value"
@@ -6320,7 +6320,7 @@
           <type name="Value" c:type="AtkValue*"/>
         </parameter>
         <parameter name="value">
-          <type name="GObject.GValue" c:type="GValue*"/>
+          <type name="GObject.Value" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
@@ -6334,7 +6334,7 @@
           <type name="Value" c:type="AtkValue*"/>
         </parameter>
         <parameter name="value">
-          <type name="GObject.GValue" c:type="GValue*"/>
+          <type name="GObject.Value" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
@@ -6348,7 +6348,7 @@
           <type name="Value" c:type="AtkValue*"/>
         </parameter>
         <parameter name="value">
-          <type name="GObject.GValue" c:type="GValue*"/>
+          <type name="GObject.Value" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
@@ -6362,7 +6362,7 @@
           <type name="Value" c:type="AtkValue*"/>
         </parameter>
         <parameter name="value">
-          <type name="GObject.GValue" c:type="GValue*"/>
+          <type name="GObject.Value" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
@@ -6376,7 +6376,7 @@
           <type name="Value" c:type="AtkValue*"/>
         </parameter>
         <parameter name="value">
-          <type name="GObject.GValue" c:type="GValue*"/>
+          <type name="GObject.Value" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
@@ -6397,10 +6397,10 @@
         </parameters>
       </method>
       <field name="pad1">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
       <field name="pad2">
-        <type name="AtkFunction" c:type="AtkFunction"/>
+        <type name="Function" c:type="AtkFunction"/>
       </field>
     </class>
     <function name="gobject_accessible_for_object"

Modified: trunk/gir/gdk-pixbuf-2.0.gir
==============================================================================
--- trunk/gir/gdk-pixbuf-2.0.gir	(original)
+++ trunk/gir/gdk-pixbuf-2.0.gir	Tue Aug 19 21:36:46 2008
@@ -2,7 +2,7 @@
             xmlns="http://www.gtk.org/introspection/core/1.0";
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
-  <namespace name="GdkPixbuf">
+  <namespace name="Pixbuf">
     <enumeration name="AlphaMode"
                  c:type="GdkPixbufAlphaMode"
                  glib:type-name="GdkPixbufAlphaMode"
@@ -28,21 +28,21 @@
     <class name="Pixbuf"
            c:type="GdkPixbuf"
            parent="GObject.Object"
-           glib:type-name="GdkPixbuf"
+           glib:type-name="Pixbuf"
            glib:get-type="gdk_pixbuf_get_type">
       <constructor name="ref" c:identifier="gdk_pixbuf_ref">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </constructor>
       <constructor name="new" c:identifier="gdk_pixbuf_new">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="colorspace">
@@ -52,53 +52,53 @@
             <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="bits_per_sample">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </constructor>
       <constructor name="copy" c:identifier="gdk_pixbuf_copy">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </constructor>
       <constructor name="new_subpixbuf"
                    c:identifier="gdk_pixbuf_new_subpixbuf">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="src_pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="src_x">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="src_y">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </constructor>
       <constructor name="new_from_file"
                    c:identifier="gdk_pixbuf_new_from_file">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="filename">
@@ -112,17 +112,17 @@
       <constructor name="new_from_file_at_size"
                    c:identifier="gdk_pixbuf_new_from_file_at_size">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="filename">
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="error">
             <type name="GLib.Error" c:type="GError**"/>
@@ -132,17 +132,17 @@
       <constructor name="new_from_file_at_scale"
                    c:identifier="gdk_pixbuf_new_from_file_at_scale">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="filename">
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="preserve_aspect_ratio">
             <type name="boolean" c:type="gboolean"/>
@@ -155,7 +155,7 @@
       <constructor name="new_from_data"
                    c:identifier="gdk_pixbuf_new_from_data">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="data">
@@ -168,16 +168,16 @@
             <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="bits_per_sample">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="rowstride">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="destroy_fn">
             <type name="DestroyNotify" c:type="GdkPixbufDestroyNotify"/>
@@ -190,25 +190,25 @@
       <constructor name="new_from_xpm_data"
                    c:identifier="gdk_pixbuf_new_from_xpm_data">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="data">
-            <type name="char" c:type="char**"/>
+            <type name="int8" c:type="char**"/>
           </parameter>
         </parameters>
       </constructor>
       <constructor name="new_from_inline"
                    c:identifier="gdk_pixbuf_new_from_inline">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="data_length">
             <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="data">
-            <type name="guint8" c:type="guint8*"/>
+            <type name="uint8" c:type="guint8*"/>
           </parameter>
           <parameter name="copy_pixels">
             <type name="boolean" c:type="gboolean"/>
@@ -220,11 +220,11 @@
       </constructor>
       <constructor name="add_alpha" c:identifier="gdk_pixbuf_add_alpha">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="substitute_color">
             <type name="boolean" c:type="gboolean"/>
@@ -243,18 +243,18 @@
       <constructor name="apply_embedded_orientation"
                    c:identifier="gdk_pixbuf_apply_embedded_orientation">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="src">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </constructor>
       <constructor name="animation_get_static_image"
                    c:identifier="gdk_pixbuf_animation_get_static_image">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="animation">
@@ -265,7 +265,7 @@
       <constructor name="animation_iter_get_pixbuf"
                    c:identifier="gdk_pixbuf_animation_iter_get_pixbuf">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -275,17 +275,17 @@
       </constructor>
       <constructor name="scale_simple" c:identifier="gdk_pixbuf_scale_simple">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="src">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="dest_width">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="dest_height">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="interp_type">
             <type name="GdkInterpType" c:type="GdkInterpType"/>
@@ -295,26 +295,26 @@
       <constructor name="composite_color_simple"
                    c:identifier="gdk_pixbuf_composite_color_simple">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="src">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="dest_width">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="dest_height">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="interp_type">
             <type name="GdkInterpType" c:type="GdkInterpType"/>
           </parameter>
           <parameter name="overall_alpha">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="check_size">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="color1">
             <type name="uint32" c:type="guint32"/>
@@ -327,11 +327,11 @@
       <constructor name="rotate_simple"
                    c:identifier="gdk_pixbuf_rotate_simple">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="src">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="angle">
             <type name="Rotation" c:type="GdkPixbufRotation"/>
@@ -340,11 +340,11 @@
       </constructor>
       <constructor name="flip" c:identifier="gdk_pixbuf_flip">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="src">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="horizontal">
             <type name="boolean" c:type="gboolean"/>
@@ -354,7 +354,7 @@
       <constructor name="loader_get_pixbuf"
                    c:identifier="gdk_pixbuf_loader_get_pixbuf">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="loader">
@@ -364,7 +364,7 @@
       </constructor>
       <constructor name="from_pixdata" c:identifier="gdk_pixbuf_from_pixdata">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="pixdata">
@@ -384,7 +384,7 @@
         </return-value>
         <parameters>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
@@ -394,17 +394,17 @@
         </return-value>
         <parameters>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_n_channels" c:identifier="gdk_pixbuf_get_n_channels">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
@@ -414,18 +414,18 @@
         </return-value>
         <parameters>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_bits_per_sample"
               c:identifier="gdk_pixbuf_get_bits_per_sample">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
@@ -435,37 +435,37 @@
         </return-value>
         <parameters>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_width" c:identifier="gdk_pixbuf_get_width">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_height" c:identifier="gdk_pixbuf_get_height">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_rowstride" c:identifier="gdk_pixbuf_get_rowstride">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
@@ -475,7 +475,7 @@
         </return-value>
         <parameters>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="pixel">
             <type name="uint32" c:type="guint32"/>
@@ -488,7 +488,7 @@
         </return-value>
         <parameters>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="filename">
             <type name="string" c:type="char*"/>
@@ -507,7 +507,7 @@
         </return-value>
         <parameters>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="filename">
             <type name="string" c:type="char*"/>
@@ -516,10 +516,10 @@
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="option_keys">
-            <type name="char" c:type="char**"/>
+            <type name="int8" c:type="char**"/>
           </parameter>
           <parameter name="option_values">
-            <type name="char" c:type="char**"/>
+            <type name="int8" c:type="char**"/>
           </parameter>
           <parameter name="error">
             <type name="GLib.Error" c:type="GError**"/>
@@ -533,7 +533,7 @@
         </return-value>
         <parameters>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="save_func">
             <type name="SaveFunc" c:type="GdkPixbufSaveFunc"/>
@@ -556,7 +556,7 @@
         </return-value>
         <parameters>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="save_func">
             <type name="SaveFunc" c:type="GdkPixbufSaveFunc"/>
@@ -568,10 +568,10 @@
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="option_keys">
-            <type name="char" c:type="char**"/>
+            <type name="int8" c:type="char**"/>
           </parameter>
           <parameter name="option_values">
-            <type name="char" c:type="char**"/>
+            <type name="int8" c:type="char**"/>
           </parameter>
           <parameter name="error">
             <type name="GLib.Error" c:type="GError**"/>
@@ -584,13 +584,13 @@
         </return-value>
         <parameters>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="buffer">
             <type name="GLib.char" c:type="gchar**"/>
           </parameter>
           <parameter name="buffer_size">
-            <type name="gsize" c:type="gsize*"/>
+            <type name="size_t" c:type="gsize*"/>
           </parameter>
           <parameter name="type">
             <type name="string" c:type="char*"/>
@@ -606,22 +606,22 @@
         </return-value>
         <parameters>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="buffer">
             <type name="GLib.char" c:type="gchar**"/>
           </parameter>
           <parameter name="buffer_size">
-            <type name="gsize" c:type="gsize*"/>
+            <type name="size_t" c:type="gsize*"/>
           </parameter>
           <parameter name="type">
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="option_keys">
-            <type name="char" c:type="char**"/>
+            <type name="int8" c:type="char**"/>
           </parameter>
           <parameter name="option_values">
-            <type name="char" c:type="char**"/>
+            <type name="int8" c:type="char**"/>
           </parameter>
           <parameter name="error">
             <type name="GLib.Error" c:type="GError**"/>
@@ -634,28 +634,28 @@
         </return-value>
         <parameters>
           <parameter name="src_pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="src_x">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="src_y">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="dest_pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="dest_x">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="dest_y">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </method>
@@ -666,10 +666,10 @@
         </return-value>
         <parameters>
           <parameter name="src">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="dest">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="saturation">
             <type name="float" c:type="gfloat"/>
@@ -685,7 +685,7 @@
         </return-value>
         <parameters>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="key">
             <type name="string" c:type="gchar*"/>
@@ -698,22 +698,22 @@
         </return-value>
         <parameters>
           <parameter name="src">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="dest">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="dest_x">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="dest_y">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="dest_width">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="dest_height">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="offset_x">
             <type name="double" c:type="double"/>
@@ -738,22 +738,22 @@
         </return-value>
         <parameters>
           <parameter name="src">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="dest">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="dest_x">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="dest_y">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="dest_width">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="dest_height">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="offset_x">
             <type name="double" c:type="double"/>
@@ -771,7 +771,7 @@
             <type name="GdkInterpType" c:type="GdkInterpType"/>
           </parameter>
           <parameter name="overall_alpha">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </method>
@@ -781,22 +781,22 @@
         </return-value>
         <parameters>
           <parameter name="src">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="dest">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="dest_x">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="dest_y">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="dest_width">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="dest_height">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="offset_x">
             <type name="double" c:type="double"/>
@@ -814,16 +814,16 @@
             <type name="GdkInterpType" c:type="GdkInterpType"/>
           </parameter>
           <parameter name="overall_alpha">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="check_x">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="check_y">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="check_size">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="color1">
             <type name="uint32" c:type="guint32"/>
@@ -915,7 +915,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="count">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="error">
           <type name="GLib.Error" c:type="GError**"/>
@@ -966,7 +966,7 @@
       </method>
       <method name="get_width" c:identifier="gdk_pixbuf_animation_get_width">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="animation">
@@ -976,7 +976,7 @@
       </method>
       <method name="get_height" c:identifier="gdk_pixbuf_animation_get_height">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="animation">
@@ -1017,7 +1017,7 @@
       <method name="get_delay_time"
               c:identifier="gdk_pixbuf_animation_iter_get_delay_time">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -1122,7 +1122,7 @@
             <type name="SimpleAnim" c:type="GdkPixbufSimpleAnim*"/>
           </parameter>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
@@ -1252,10 +1252,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="width">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="height">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -1306,10 +1306,10 @@
             <type name="Loader" c:type="GdkPixbufLoader*"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </method>
@@ -1325,7 +1325,7 @@
             <type name="GLib.uchar" c:type="guchar*"/>
           </parameter>
           <parameter name="count">
-            <type name="size" c:type="gsize"/>
+            <type name="size_t" c:type="gsize"/>
           </parameter>
           <parameter name="error">
             <type name="GLib.Error" c:type="GError**"/>
@@ -1375,10 +1375,10 @@
             <type name="Loader" c:type="GdkPixbufLoader*"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </callback>
@@ -1401,16 +1401,16 @@
             <type name="Loader" c:type="GdkPixbufLoader*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </callback>
@@ -1565,20 +1565,20 @@
         <type name="uint32" c:type="guint32"/>
       </field>
       <field name="pixel_data">
-        <type name="guint8" c:type="guint8*"/>
+        <type name="uint8" c:type="guint8*"/>
       </field>
     </record>
     <function name="gdk_pixdata_serialize"
               c:identifier="gdk_pixdata_serialize">
       <return-value>
-        <type name="guint8" c:type="guint8*"/>
+        <type name="uint8" c:type="guint8*"/>
       </return-value>
       <parameters>
         <parameter name="pixdata">
           <type name="GdkPixdata" c:type="GdkPixdata*"/>
         </parameter>
         <parameter name="stream_length_p">
-          <type name="GLib.uint" c:type="guint*"/>
+          <type name="uint" c:type="guint*"/>
         </parameter>
       </parameters>
     </function>
@@ -1595,7 +1595,7 @@
           <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="stream">
-          <type name="guint8" c:type="guint8*"/>
+          <type name="uint8" c:type="guint8*"/>
         </parameter>
         <parameter name="error">
           <type name="GLib.Error" c:type="GError**"/>
@@ -1612,7 +1612,7 @@
           <type name="GdkPixdata" c:type="GdkPixdata*"/>
         </parameter>
         <parameter name="pixbuf">
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="use_rle">
           <type name="boolean" c:type="gboolean"/>
@@ -1642,7 +1642,7 @@
     <function name="gdk_pixdata_to_csource"
               c:identifier="gdk_pixdata_to_csource">
       <return-value>
-        <type name="GLib.String" c:type="GString*"/>
+        <type name="GObject.String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="pixdata">

Modified: trunk/gir/gdk-x11-2.0.gir
==============================================================================
--- trunk/gir/gdk-x11-2.0.gir	(original)
+++ trunk/gir/gdk-x11-2.0.gir	Tue Aug 19 21:36:46 2008
@@ -3,14 +3,12 @@
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
   <namespace name="Gdk">
-    <alias name="WChar" target="guint32" c:type="GdkWChar"/>
-    <alias name="NativeWindow" target="guint32" c:type="GdkNativeWindow"/>
-    <alias name="Event" target="void*" c:type="GdkEvent"/>
-    <alias name="XEvent" target="void*" c:type="GdkXEvent"/>
-    <alias name="Atom" target="void*" c:type="GdkAtom"/>
-    <alias name="Selection" target="Atom" c:type="GdkSelection"/>
-    <alias name="Target" target="Atom" c:type="GdkTarget"/>
-    <alias name="SelectionType" target="Atom" c:type="GdkSelectionType"/>
+    <alias name="Selection" target="xlib.Atom" c:type="GdkSelection"/>
+    <alias name="Target" target="xlib.Atom" c:type="GdkTarget"/>
+    <alias name="SelectionType" target="xlib.Atom" c:type="GdkSelectionType"/>
+    <alias name="Event" target="Event" c:type="GdkEvent"/>
+    <alias name="WChar" target="uint32" c:type="GdkWChar"/>
+    <alias name="NativeWindow" target="uint32" c:type="GdkNativeWindow"/>
     <record name="Point" c:type="GdkPoint">
       <field name="x">
         <type name="int" c:type="gint"/>
@@ -19,7 +17,7 @@
         <type name="int" c:type="gint"/>
       </field>
     </record>
-    <glib:boxed c:type="Rectangle"
+    <glib:boxed c:type="GdkRectangle"
                 glib:name="Rectangle"
                 glib:type-name="GdkRectangle"
                 glib:get-type="gdk_rectangle_get_type">
@@ -49,7 +47,7 @@
         <type name="int" c:type="gint"/>
       </field>
     </record>
-    <glib:boxed c:type="Color"
+    <glib:boxed c:type="GdkColor"
                 glib:name="Color"
                 glib:type-name="GdkColor"
                 glib:get-type="gdk_color_get_type">
@@ -141,7 +139,7 @@
             <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="success">
-            <type name="GLib.boolean" c:type="gboolean*"/>
+            <type name="boolean" c:type="gboolean*"/>
           </parameter>
         </parameters>
       </method>
@@ -207,7 +205,7 @@
         </parameters>
       </method>
     </class>
-    <glib:boxed c:type="Cursor"
+    <glib:boxed c:type="GdkCursor"
                 glib:name="Cursor"
                 glib:type-name="GdkCursor"
                 glib:get-type="gdk_cursor_get_type">
@@ -271,7 +269,7 @@
             <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="x">
             <type name="int" c:type="gint"/>
@@ -327,7 +325,7 @@
       </method>
       <method name="get_image" c:identifier="gdk_cursor_get_image">
         <return-value>
-          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="cursor">
@@ -336,7 +334,7 @@
         </parameters>
       </method>
     </glib:boxed>
-    <glib:boxed c:type="Font"
+    <glib:boxed c:type="GdkFont"
                 glib:name="Font"
                 glib:type-name="GdkFont"
                 glib:get-type="gdk_font_get_type">
@@ -1156,10 +1154,10 @@
             <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="width" direction="out">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="height" direction="out">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -1636,10 +1634,10 @@
             <type name="Drawable" c:type="GdkDrawable*"/>
           </parameter>
           <parameter name="width">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="height">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -1749,10 +1747,10 @@
             <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="composite_x_offset">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="composite_y_offset">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -1768,7 +1766,7 @@
             <type name="GC" c:type="GdkGC*"/>
           </parameter>
           <parameter name="pixbuf">
-            <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="src_x">
             <type name="int" c:type="gint"/>
@@ -2188,10 +2186,10 @@
         </return-value>
         <parameters>
           <parameter name="win_x" direction="out">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="win_y" direction="out">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </constructor>
@@ -2252,10 +2250,10 @@
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="mask">
             <type name="ModifierType" c:type="GdkModifierType*"/>
@@ -3083,7 +3081,7 @@
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="data">
-            <type name="gpointer" c:type="gpointer*"/>
+            <type name="any" c:type="gpointer*"/>
           </parameter>
         </parameters>
       </method>
@@ -3096,19 +3094,19 @@
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="width">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="height">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="depth">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -3121,10 +3119,10 @@
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -3137,10 +3135,10 @@
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -3154,10 +3152,10 @@
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -3170,10 +3168,10 @@
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -3649,10 +3647,10 @@
             <type name="Drawable" c:type="GdkDrawable**"/>
           </parameter>
           <parameter name="x_offset">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="y_offset">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -3901,7 +3899,7 @@
             <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
           <parameter name="message_type">
-            <type name="Atom" c:type="GdkAtom"/>
+            <type name="xlib.Atom" c:type="GdkAtom"/>
           </parameter>
           <parameter name="func">
             <type name="FilterFunc" c:type="GdkFilterFunc"/>
@@ -3962,10 +3960,10 @@
             <type name="Screen" c:type="GdkScreen**"/>
           </parameter>
           <parameter name="x" direction="out">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="y" direction="out">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="mask" direction="out">
             <type name="ModifierType" c:type="GdkModifierType*"/>
@@ -3982,10 +3980,10 @@
             <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
           <parameter name="win_x" direction="out">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="win_y" direction="out">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -4065,10 +4063,10 @@
             <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
           <parameter name="width" direction="out">
-            <type name="GLib.uint" c:type="guint*"/>
+            <type name="uint" c:type="guint*"/>
           </parameter>
           <parameter name="height" direction="out">
-            <type name="GLib.uint" c:type="guint*"/>
+            <type name="uint" c:type="guint*"/>
           </parameter>
         </parameters>
       </method>
@@ -4104,7 +4102,7 @@
             <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
           <parameter name="selection">
-            <type name="Atom" c:type="GdkAtom"/>
+            <type name="xlib.Atom" c:type="GdkAtom"/>
           </parameter>
         </parameters>
       </method>
@@ -4135,7 +4133,7 @@
             <type name="uint32" c:type="guint32"/>
           </parameter>
           <parameter name="targets">
-            <type name="Atom" c:type="GdkAtom*"/>
+            <type name="xlib.Atom" c:type="GdkAtom*"/>
           </parameter>
           <parameter name="n_targets">
             <type name="int" c:type="gint"/>
@@ -4982,13 +4980,13 @@
           <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="planes">
-          <type name="GLib.ulong" c:type="gulong*"/>
+          <type name="ulong" c:type="gulong*"/>
         </parameter>
         <parameter name="nplanes">
           <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="pixels">
-          <type name="GLib.ulong" c:type="gulong*"/>
+          <type name="ulong" c:type="gulong*"/>
         </parameter>
         <parameter name="npixels">
           <type name="int" c:type="gint"/>
@@ -5004,7 +5002,7 @@
           <type name="Colormap" c:type="GdkColormap*"/>
         </parameter>
         <parameter name="pixels">
-          <type name="GLib.ulong" c:type="gulong*"/>
+          <type name="ulong" c:type="gulong*"/>
         </parameter>
         <parameter name="npixels">
           <type name="int" c:type="gint"/>
@@ -5326,7 +5324,7 @@
       </return-value>
       <parameters>
         <parameter name="colors">
-          <type name="guint32" c:type="guint32*"/>
+          <type name="uint32" c:type="guint32*"/>
         </parameter>
         <parameter name="n_colors">
           <type name="int" c:type="gint"/>
@@ -5406,31 +5404,31 @@
       </return-value>
       <parameters>
         <parameter name="pixbuf">
-          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="bitmap">
           <type name="Bitmap" c:type="GdkBitmap*"/>
         </parameter>
         <parameter name="src_x">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="src_y">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="dest_x">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="dest_y">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="width">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="height">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="alpha_threshold">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -5441,7 +5439,7 @@
       </return-value>
       <parameters>
         <parameter name="pixbuf">
-          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="drawable">
           <type name="Drawable" c:type="GdkDrawable*"/>
@@ -5450,31 +5448,31 @@
           <type name="GC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="src_x">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="src_y">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="dest_x">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="dest_y">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="width">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="height">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="dither">
           <type name="RgbDither" c:type="GdkRgbDither"/>
         </parameter>
         <parameter name="x_dither">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="y_dither">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -5485,43 +5483,43 @@
       </return-value>
       <parameters>
         <parameter name="pixbuf">
-          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="drawable">
           <type name="Drawable" c:type="GdkDrawable*"/>
         </parameter>
         <parameter name="src_x">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="src_y">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="dest_x">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="dest_y">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="width">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="height">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="alpha_mode">
-          <type name="GdkPixbuf.AlphaMode" c:type="GdkPixbufAlphaMode"/>
+          <type name="Pixbuf.AlphaMode" c:type="GdkPixbufAlphaMode"/>
         </parameter>
         <parameter name="alpha_threshold">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="dither">
           <type name="RgbDither" c:type="GdkRgbDither"/>
         </parameter>
         <parameter name="x_dither">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="y_dither">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -5532,7 +5530,7 @@
       </return-value>
       <parameters>
         <parameter name="pixbuf">
-          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="colormap">
           <type name="Colormap" c:type="GdkColormap*"/>
@@ -5544,7 +5542,7 @@
           <type name="Bitmap" c:type="GdkBitmap**"/>
         </parameter>
         <parameter name="alpha_threshold">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -5555,7 +5553,7 @@
       </return-value>
       <parameters>
         <parameter name="pixbuf">
-          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="pixmap_return">
           <type name="Pixmap" c:type="GdkPixmap**"/>
@@ -5564,18 +5562,18 @@
           <type name="Bitmap" c:type="GdkBitmap**"/>
         </parameter>
         <parameter name="alpha_threshold">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="pixbuf_get_from_drawable"
               c:identifier="gdk_pixbuf_get_from_drawable">
       <return-value>
-        <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+        <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
       </return-value>
       <parameters>
         <parameter name="dest">
-          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="src">
           <type name="Drawable" c:type="GdkDrawable*"/>
@@ -5584,33 +5582,33 @@
           <type name="Colormap" c:type="GdkColormap*"/>
         </parameter>
         <parameter name="src_x">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="src_y">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="dest_x">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="dest_y">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="width">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="height">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="pixbuf_get_from_image"
               c:identifier="gdk_pixbuf_get_from_image">
       <return-value>
-        <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+        <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
       </return-value>
       <parameters>
         <parameter name="dest">
-          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="src">
           <type name="Image" c:type="GdkImage*"/>
@@ -5619,22 +5617,22 @@
           <type name="Colormap" c:type="GdkColormap*"/>
         </parameter>
         <parameter name="src_x">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="src_y">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="dest_x">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="dest_y">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="width">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="height">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -5672,7 +5670,7 @@
           <type name="cairo.cairo_t" c:type="cairo_t*"/>
         </parameter>
         <parameter name="pixbuf">
-          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="pixbuf_x">
           <type name="double" c:type="double"/>
@@ -6177,7 +6175,7 @@
     </function>
     <function name="drag_get_selection" c:identifier="gdk_drag_get_selection">
       <return-value>
-        <type name="Atom" c:type="GdkAtom"/>
+        <type name="xlib.Atom" c:type="GdkAtom"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -6453,7 +6451,7 @@
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="axes">
-            <type name="GLib.double" c:type="gdouble*"/>
+            <type name="double" c:type="gdouble*"/>
           </parameter>
           <parameter name="mask" direction="out">
             <type name="ModifierType" c:type="GdkModifierType*"/>
@@ -6481,7 +6479,7 @@
             <type name="TimeCoord" c:type="GdkTimeCoord***"/>
           </parameter>
           <parameter name="n_events" direction="out">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -6494,13 +6492,13 @@
             <type name="Device" c:type="GdkDevice*"/>
           </parameter>
           <parameter name="axes">
-            <type name="GLib.double" c:type="gdouble*"/>
+            <type name="double" c:type="gdouble*"/>
           </parameter>
           <parameter name="use">
             <type name="AxisUse" c:type="GdkAxisUse"/>
           </parameter>
           <parameter name="value">
-            <type name="GLib.double" c:type="gdouble*"/>
+            <type name="double" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </method>
@@ -6711,7 +6709,7 @@
         <type name="double" c:type="gdouble"/>
       </field>
       <field name="axes">
-        <type name="GLib.double" c:type="gdouble*"/>
+        <type name="double" c:type="gdouble*"/>
       </field>
       <field name="state">
         <type name="uint" c:type="guint"/>
@@ -6749,7 +6747,7 @@
         <type name="double" c:type="gdouble"/>
       </field>
       <field name="axes">
-        <type name="GLib.double" c:type="gdouble*"/>
+        <type name="double" c:type="gdouble*"/>
       </field>
       <field name="state">
         <type name="uint" c:type="guint"/>
@@ -6926,7 +6924,7 @@
         <type name="int8" c:type="gint8"/>
       </field>
       <field name="atom">
-        <type name="Atom" c:type="GdkAtom"/>
+        <type name="xlib.Atom" c:type="GdkAtom"/>
       </field>
       <field name="time">
         <type name="uint32" c:type="guint32"/>
@@ -6946,13 +6944,13 @@
         <type name="int8" c:type="gint8"/>
       </field>
       <field name="selection">
-        <type name="Atom" c:type="GdkAtom"/>
+        <type name="xlib.Atom" c:type="GdkAtom"/>
       </field>
       <field name="target">
-        <type name="Atom" c:type="GdkAtom"/>
+        <type name="xlib.Atom" c:type="GdkAtom"/>
       </field>
       <field name="property">
-        <type name="Atom" c:type="GdkAtom"/>
+        <type name="xlib.Atom" c:type="GdkAtom"/>
       </field>
       <field name="time">
         <type name="uint32" c:type="guint32"/>
@@ -6978,7 +6976,7 @@
         <type name="OwnerChange" c:type="GdkOwnerChange"/>
       </field>
       <field name="selection">
-        <type name="Atom" c:type="GdkAtom"/>
+        <type name="xlib.Atom" c:type="GdkAtom"/>
       </field>
       <field name="time">
         <type name="uint32" c:type="guint32"/>
@@ -7015,7 +7013,7 @@
         <type name="int8" c:type="gint8"/>
       </field>
       <field name="message_type">
-        <type name="Atom" c:type="GdkAtom"/>
+        <type name="xlib.Atom" c:type="GdkAtom"/>
       </field>
       <field name="data_format">
         <type name="GLib.ushort" c:type="gushort"/>
@@ -7137,7 +7135,7 @@
       </return-value>
       <parameters>
         <parameter name="xevent">
-          <type name="XEvent" c:type="GdkXEvent*"/>
+          <type name="GdkXEvent" c:type="GdkXEvent*"/>
         </parameter>
         <parameter name="event">
           <type name="Event" c:type="GdkEvent*"/>
@@ -7551,7 +7549,7 @@
               c:identifier="GDK_OWNER_CHANGE_CLOSE"
               glib:nick="close"/>
     </enumeration>
-    <glib:boxed c:type="Event"
+    <glib:boxed c:type="GdkEvent"
                 glib:name="Event"
                 glib:type-name="GdkEvent"
                 glib:get-type="gdk_event_get_type">
@@ -7648,10 +7646,10 @@
             <type name="Event" c:type="GdkEvent*"/>
           </parameter>
           <parameter name="x_win">
-            <type name="GLib.double" c:type="gdouble*"/>
+            <type name="double" c:type="gdouble*"/>
           </parameter>
           <parameter name="y_win">
-            <type name="GLib.double" c:type="gdouble*"/>
+            <type name="double" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </method>
@@ -7664,10 +7662,10 @@
             <type name="Event" c:type="GdkEvent*"/>
           </parameter>
           <parameter name="x_root">
-            <type name="GLib.double" c:type="gdouble*"/>
+            <type name="double" c:type="gdouble*"/>
           </parameter>
           <parameter name="y_root">
-            <type name="GLib.double" c:type="gdouble*"/>
+            <type name="double" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </method>
@@ -7683,7 +7681,7 @@
             <type name="AxisUse" c:type="GdkAxisUse"/>
           </parameter>
           <parameter name="value">
-            <type name="GLib.double" c:type="gdouble*"/>
+            <type name="double" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </method>
@@ -7790,7 +7788,7 @@
       </return-value>
       <parameters>
         <parameter name="message_type">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="func">
           <type name="FilterFunc" c:type="GdkFilterFunc"/>
@@ -7826,10 +7824,10 @@
             <type name="Screen" c:type="GdkScreen**"/>
           </parameter>
           <parameter name="x">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="mask">
             <type name="ModifierType" c:type="GdkModifierType*"/>
@@ -7848,10 +7846,10 @@
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="mask">
             <type name="ModifierType" c:type="GdkModifierType*"/>
@@ -7867,10 +7865,10 @@
             <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
           <parameter name="win_x">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="win_y">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -8570,7 +8568,7 @@
           <type name="GC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="pixbuf">
-          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="src_x">
           <type name="int" c:type="gint"/>
@@ -9399,19 +9397,19 @@
           <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="lbearing">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="rbearing">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="width">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="ascent">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="descent">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -9430,19 +9428,19 @@
           <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="lbearing">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="rbearing">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="width">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="ascent">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="descent">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -9458,19 +9456,19 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="lbearing">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="rbearing">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="width">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="ascent">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="descent">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -9538,13 +9536,13 @@
             <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="keyval" direction="out">
-            <type name="GLib.uint" c:type="guint*"/>
+            <type name="uint" c:type="guint*"/>
           </parameter>
           <parameter name="effective_group" direction="out">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="level" direction="out">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="consumed_modifiers">
             <type name="ModifierType" c:type="GdkModifierType*"/>
@@ -9567,7 +9565,7 @@
             <type name="KeymapKey" c:type="GdkKeymapKey**"/>
           </parameter>
           <parameter name="n_keys" direction="out">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -9587,10 +9585,10 @@
             <type name="KeymapKey" c:type="GdkKeymapKey**"/>
           </parameter>
           <parameter name="keyvals">
-            <type name="GLib.uint" c:type="guint**"/>
+            <type name="uint" c:type="guint**"/>
           </parameter>
           <parameter name="n_entries">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -9676,10 +9674,10 @@
           <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="lower" direction="out">
-          <type name="GLib.uint" c:type="guint*"/>
+          <type name="uint" c:type="guint*"/>
         </parameter>
         <parameter name="upper" direction="out">
-          <type name="GLib.uint" c:type="guint*"/>
+          <type name="uint" c:type="guint*"/>
         </parameter>
       </parameters>
     </function>
@@ -9748,24 +9746,71 @@
            parent="Pango.Renderer"
            glib:type-name="GdkPangoRenderer"
            glib:get-type="gdk_pango_renderer_get_type">
+      <method name="set_drawable"
+              c:identifier="gdk_pango_renderer_set_drawable">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="gdk_renderer">
+            <type name="PangoRenderer" c:type="GdkPangoRenderer*"/>
+          </parameter>
+          <parameter name="drawable">
+            <type name="Drawable" c:type="GdkDrawable*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_gc" c:identifier="gdk_pango_renderer_set_gc">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="gdk_renderer">
+            <type name="PangoRenderer" c:type="GdkPangoRenderer*"/>
+          </parameter>
+          <parameter name="gc">
+            <type name="GC" c:type="GdkGC*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_stipple" c:identifier="gdk_pango_renderer_set_stipple">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="gdk_renderer">
+            <type name="PangoRenderer" c:type="GdkPangoRenderer*"/>
+          </parameter>
+          <parameter name="part">
+            <type name="Pango.RenderPart" c:type="PangoRenderPart"/>
+          </parameter>
+          <parameter name="stipple">
+            <type name="Bitmap" c:type="GdkBitmap*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_override_color"
+              c:identifier="gdk_pango_renderer_set_override_color">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="gdk_renderer">
+            <type name="PangoRenderer" c:type="GdkPangoRenderer*"/>
+          </parameter>
+          <parameter name="part">
+            <type name="Pango.RenderPart" c:type="PangoRenderPart"/>
+          </parameter>
+          <parameter name="color">
+            <type name="Color" c:type="GdkColor*"/>
+          </parameter>
+        </parameters>
+      </method>
       <property name="screen">
         <type name="Screen" c:type="GdkScreen"/>
       </property>
     </class>
-    <record name="PangoRendererClass" c:type="GdkPangoRendererClass">
-      <field name="parent_class">
-        <type name="PangoRendererClass" c:type="PangoRendererClass"/>
-      </field>
-    </record>
     <record name="PangoRendererPrivate" c:type="GdkPangoRendererPrivate"/>
-    <record name="PangoRenderer" c:type="_GdkPangoRenderer">
-      <field name="parent_instance">
-        <type name="PangoRenderer" c:type="PangoRenderer"/>
-      </field>
-      <field name="priv">
-        <type name="PangoRendererPrivate" c:type="GdkPangoRendererPrivate*"/>
-      </field>
-    </record>
     <function name="pango_renderer_new" c:identifier="gdk_pango_renderer_new">
       <return-value>
         <type name="PangoRenderer" c:type="PangoRenderer*"/>
@@ -9787,68 +9832,6 @@
         </parameter>
       </parameters>
     </function>
-    <function name="pango_renderer_set_drawable"
-              c:identifier="gdk_pango_renderer_set_drawable">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="gdk_renderer">
-          <type name="PangoRenderer" c:type="GdkPangoRenderer*"/>
-        </parameter>
-        <parameter name="drawable">
-          <type name="Drawable" c:type="GdkDrawable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="pango_renderer_set_gc"
-              c:identifier="gdk_pango_renderer_set_gc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="gdk_renderer">
-          <type name="PangoRenderer" c:type="GdkPangoRenderer*"/>
-        </parameter>
-        <parameter name="gc">
-          <type name="GC" c:type="GdkGC*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="pango_renderer_set_stipple"
-              c:identifier="gdk_pango_renderer_set_stipple">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="gdk_renderer">
-          <type name="PangoRenderer" c:type="GdkPangoRenderer*"/>
-        </parameter>
-        <parameter name="part">
-          <type name="Pango.RenderPart" c:type="PangoRenderPart"/>
-        </parameter>
-        <parameter name="stipple">
-          <type name="Bitmap" c:type="GdkBitmap*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="pango_renderer_set_override_color"
-              c:identifier="gdk_pango_renderer_set_override_color">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="gdk_renderer">
-          <type name="PangoRenderer" c:type="GdkPangoRenderer*"/>
-        </parameter>
-        <parameter name="part">
-          <type name="Pango.RenderPart" c:type="PangoRenderPart"/>
-        </parameter>
-        <parameter name="color">
-          <type name="Color" c:type="GdkColor*"/>
-        </parameter>
-      </parameters>
-    </function>
     <function name="pango_context_get_for_screen"
               c:identifier="gdk_pango_context_get_for_screen">
       <return-value>
@@ -9895,7 +9878,7 @@
           <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="index_ranges">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="n_ranges">
           <type name="int" c:type="gint"/>
@@ -9918,7 +9901,7 @@
           <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="index_ranges">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="n_ranges">
           <type name="int" c:type="gint"/>
@@ -9993,11 +9976,6 @@
         <type name="int" c:type="gint"/>
       </field>
     </record>
-    <record name="DrawableClass" c:type="DrawableClass">
-      <field name="parent_class">
-        <type name="GObject.Class" c:type="GObjectClass"/>
-      </field>
-    </record>
     <record name="PixmapObjectClass" c:type="GdkPixmapObjectClass">
       <field name="parent_class">
         <type name="DrawableClass" c:type="GdkDrawableClass"/>
@@ -10025,7 +10003,7 @@
     </function>
     <function name="atom_intern" c:identifier="gdk_atom_intern">
       <return-value>
-        <type name="Atom" c:type="GdkAtom"/>
+        <type name="xlib.Atom" c:type="GdkAtom"/>
       </return-value>
       <parameters>
         <parameter name="atom_name">
@@ -10039,7 +10017,7 @@
     <function name="atom_intern_static_string"
               c:identifier="gdk_atom_intern_static_string">
       <return-value>
-        <type name="Atom" c:type="GdkAtom"/>
+        <type name="xlib.Atom" c:type="GdkAtom"/>
       </return-value>
       <parameters>
         <parameter name="atom_name">
@@ -10053,7 +10031,7 @@
       </return-value>
       <parameters>
         <parameter name="atom">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
       </parameters>
     </function>
@@ -10066,10 +10044,10 @@
           <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="property">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="type">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="offset">
           <type name="ulong" c:type="gulong"/>
@@ -10081,13 +10059,13 @@
           <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="actual_property_type">
-          <type name="Atom" c:type="GdkAtom*"/>
+          <type name="xlib.Atom" c:type="GdkAtom*"/>
         </parameter>
         <parameter name="actual_format">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="actual_length">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="data">
           <type name="GLib.uchar" c:type="guchar**"/>
@@ -10103,10 +10081,10 @@
           <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="property">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="type">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="format">
           <type name="int" c:type="gint"/>
@@ -10131,7 +10109,7 @@
           <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="property">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
       </parameters>
     </function>
@@ -10142,7 +10120,7 @@
       </return-value>
       <parameters>
         <parameter name="encoding">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="format">
           <type name="int" c:type="gint"/>
@@ -10165,7 +10143,7 @@
       </return-value>
       <parameters>
         <parameter name="encoding">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="format">
           <type name="int" c:type="gint"/>
@@ -10191,16 +10169,16 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="encoding">
-          <type name="Atom" c:type="GdkAtom*"/>
+          <type name="xlib.Atom" c:type="GdkAtom*"/>
         </parameter>
         <parameter name="format">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="ctext">
           <type name="GLib.uchar" c:type="guchar**"/>
         </parameter>
         <parameter name="length">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -10214,16 +10192,16 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="encoding">
-          <type name="Atom" c:type="GdkAtom*"/>
+          <type name="xlib.Atom" c:type="GdkAtom*"/>
         </parameter>
         <parameter name="format">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="ctext">
           <type name="GLib.uchar" c:type="guchar**"/>
         </parameter>
         <parameter name="length">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -10237,7 +10215,7 @@
           <type name="Display" c:type="GdkDisplay*"/>
         </parameter>
         <parameter name="encoding">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="format">
           <type name="int" c:type="gint"/>
@@ -10263,7 +10241,7 @@
           <type name="Display" c:type="GdkDisplay*"/>
         </parameter>
         <parameter name="encoding">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="format">
           <type name="int" c:type="gint"/>
@@ -10303,16 +10281,16 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="encoding">
-          <type name="Atom" c:type="GdkAtom*"/>
+          <type name="xlib.Atom" c:type="GdkAtom*"/>
         </parameter>
         <parameter name="format">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="ctext">
           <type name="GLib.uchar" c:type="guchar**"/>
         </parameter>
         <parameter name="length">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -10329,16 +10307,16 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="encoding">
-          <type name="Atom" c:type="GdkAtom*"/>
+          <type name="xlib.Atom" c:type="GdkAtom*"/>
         </parameter>
         <parameter name="format">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="ctext">
           <type name="GLib.uchar" c:type="guchar**"/>
         </parameter>
         <parameter name="length">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -10452,7 +10430,7 @@
           <type name="Rectangle" c:type="GdkRectangle**"/>
         </parameter>
         <parameter name="n_rectangles">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -10488,10 +10466,10 @@
           <type name="Region" c:type="GdkRegion*"/>
         </parameter>
         <parameter name="x">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -10619,7 +10597,7 @@
           <type name="Span" c:type="GdkSpan*"/>
         </parameter>
         <parameter name="n_spans">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="sorted">
           <type name="boolean" c:type="gboolean"/>
@@ -10642,7 +10620,7 @@
           <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="selection">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="time_">
           <type name="uint32" c:type="guint32"/>
@@ -10659,7 +10637,7 @@
       </return-value>
       <parameters>
         <parameter name="selection">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
       </parameters>
     </function>
@@ -10676,7 +10654,7 @@
           <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="selection">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="time_">
           <type name="uint32" c:type="guint32"/>
@@ -10696,7 +10674,7 @@
           <type name="Display" c:type="GdkDisplay*"/>
         </parameter>
         <parameter name="selection">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
       </parameters>
     </function>
@@ -10709,10 +10687,10 @@
           <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="selection">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="target">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="time_">
           <type name="uint32" c:type="guint32"/>
@@ -10732,10 +10710,10 @@
           <type name="GLib.uchar" c:type="guchar**"/>
         </parameter>
         <parameter name="prop_type">
-          <type name="Atom" c:type="GdkAtom*"/>
+          <type name="xlib.Atom" c:type="GdkAtom*"/>
         </parameter>
         <parameter name="prop_format">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -10749,13 +10727,13 @@
           <type name="uint32" c:type="guint32"/>
         </parameter>
         <parameter name="selection">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="target">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="property">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="time_">
           <type name="uint32" c:type="guint32"/>
@@ -10775,13 +10753,13 @@
           <type name="uint32" c:type="guint32"/>
         </parameter>
         <parameter name="selection">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="target">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="property">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="time_">
           <type name="uint32" c:type="guint32"/>
@@ -10815,7 +10793,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="child_pid">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="error">
           <type name="GLib.Error" c:type="GError**"/>
@@ -10850,16 +10828,16 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="child_pid">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="standard_input">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="standard_output">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="standard_error">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="error">
           <type name="GLib.Error" c:type="GError**"/>
@@ -10901,10 +10879,10 @@
       </return-value>
       <parameters>
         <parameter name="depths" direction="out">
-          <type name="GLib.int" c:type="gint**"/>
+          <type name="int" c:type="gint**"/>
         </parameter>
         <parameter name="count" direction="out">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -10917,7 +10895,7 @@
           <type name="VisualType" c:type="GdkVisualType**"/>
         </parameter>
         <parameter name="count">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -11018,10 +10996,10 @@
             <type name="Window" c:type="GdkWindow*"/>
           </parameter>
           <parameter name="x">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="y">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="mask">
             <type name="ModifierType" c:type="GdkModifierType*"/>
@@ -11037,10 +11015,10 @@
             <type name="Screen" c:type="GdkScreen*"/>
           </parameter>
           <parameter name="win_x">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="win_y">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -11188,10 +11166,10 @@
           <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="new_width">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="new_height">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -11217,7 +11195,7 @@
       </return-value>
       <parameters>
         <parameter name="argc">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="argv">
           <type name="GLib.char" c:type="gchar***"/>
@@ -11230,7 +11208,7 @@
       </return-value>
       <parameters>
         <parameter name="argc">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="argv">
           <type name="GLib.char" c:type="gchar***"/>
@@ -11243,7 +11221,7 @@
       </return-value>
       <parameters>
         <parameter name="argc">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="argv">
           <type name="GLib.char" c:type="gchar***"/>
@@ -11438,7 +11416,7 @@
           <type name="Window" c:type="GdkWindow**"/>
         </parameter>
         <parameter name="owner_events">
-          <type name="GLib.boolean" c:type="gboolean*"/>
+          <type name="boolean" c:type="gboolean*"/>
         </parameter>
       </parameters>
     </function>
@@ -11455,7 +11433,7 @@
           <type name="Window" c:type="GdkWindow**"/>
         </parameter>
         <parameter name="owner_events">
-          <type name="GLib.boolean" c:type="gboolean*"/>
+          <type name="boolean" c:type="gboolean*"/>
         </parameter>
       </parameters>
     </function>
@@ -11740,7 +11718,7 @@
     <function name="x11_drawable_get_xdisplay"
               c:identifier="gdk_x11_drawable_get_xdisplay">
       <return-value>
-        <type name="xlib.Display" c:type="Display*"/>
+        <type name="Display" c:type="Display*"/>
       </return-value>
       <parameters>
         <parameter name="drawable">
@@ -11762,7 +11740,7 @@
     <function name="x11_image_get_xdisplay"
               c:identifier="gdk_x11_image_get_xdisplay">
       <return-value>
-        <type name="xlib.Display" c:type="Display*"/>
+        <type name="Display" c:type="Display*"/>
       </return-value>
       <parameters>
         <parameter name="image">
@@ -11784,7 +11762,7 @@
     <function name="x11_colormap_get_xdisplay"
               c:identifier="gdk_x11_colormap_get_xdisplay">
       <return-value>
-        <type name="xlib.Display" c:type="Display*"/>
+        <type name="Display" c:type="Display*"/>
       </return-value>
       <parameters>
         <parameter name="colormap">
@@ -11806,7 +11784,7 @@
     <function name="x11_cursor_get_xdisplay"
               c:identifier="gdk_x11_cursor_get_xdisplay">
       <return-value>
-        <type name="xlib.Display" c:type="Display*"/>
+        <type name="Display" c:type="Display*"/>
       </return-value>
       <parameters>
         <parameter name="cursor">
@@ -11828,7 +11806,7 @@
     <function name="x11_display_get_xdisplay"
               c:identifier="gdk_x11_display_get_xdisplay">
       <return-value>
-        <type name="xlib.Display" c:type="Display*"/>
+        <type name="Display" c:type="Display*"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -11850,7 +11828,7 @@
     <function name="x11_gc_get_xdisplay"
               c:identifier="gdk_x11_gc_get_xdisplay">
       <return-value>
-        <type name="xlib.Display" c:type="Display*"/>
+        <type name="Display" c:type="Display*"/>
       </return-value>
       <parameters>
         <parameter name="gc">
@@ -11860,7 +11838,7 @@
     </function>
     <function name="x11_gc_get_xgc" c:identifier="gdk_x11_gc_get_xgc">
       <return-value>
-        <type name="xlib.GC" c:type="GC"/>
+        <type name="GC" c:type="GC"/>
       </return-value>
       <parameters>
         <parameter name="gc">
@@ -11882,7 +11860,7 @@
     <function name="x11_screen_get_screen_number"
               c:identifier="gdk_x11_screen_get_screen_number">
       <return-value>
-        <type name="int32" c:type="int"/>
+        <type name="int" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="screen">
@@ -11935,7 +11913,7 @@
     <function name="x11_get_default_xdisplay"
               c:identifier="gdk_x11_get_default_xdisplay">
       <return-value>
-        <type name="xlib.Display" c:type="Display*"/>
+        <type name="Display" c:type="Display*"/>
       </return-value>
     </function>
     <function name="x11_get_default_screen"
@@ -12070,7 +12048,7 @@
           <type name="Screen" c:type="GdkScreen*"/>
         </parameter>
         <parameter name="property">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
       </parameters>
     </function>
@@ -12090,7 +12068,7 @@
       </return-value>
       <parameters>
         <parameter name="property">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
       </parameters>
     </function>
@@ -12111,7 +12089,7 @@
       </return-value>
       <parameters>
         <parameter name="xdisplay">
-          <type name="xlib.Display" c:type="Display*"/>
+          <type name="Display" c:type="Display*"/>
         </parameter>
       </parameters>
     </function>
@@ -12125,14 +12103,14 @@
           <type name="Display" c:type="GdkDisplay*"/>
         </parameter>
         <parameter name="atom">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
       </parameters>
     </function>
     <function name="x11_xatom_to_atom_for_display"
               c:identifier="gdk_x11_xatom_to_atom_for_display">
       <return-value>
-        <type name="Atom" c:type="GdkAtom"/>
+        <type name="xlib.Atom" c:type="GdkAtom"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -12177,13 +12155,13 @@
       </return-value>
       <parameters>
         <parameter name="atom">
-          <type name="Atom" c:type="GdkAtom"/>
+          <type name="xlib.Atom" c:type="GdkAtom"/>
         </parameter>
       </parameters>
     </function>
     <function name="x11_xatom_to_atom" c:identifier="gdk_x11_xatom_to_atom">
       <return-value>
-        <type name="Atom" c:type="GdkAtom"/>
+        <type name="xlib.Atom" c:type="GdkAtom"/>
       </return-value>
       <parameters>
         <parameter name="xatom">
@@ -12262,7 +12240,7 @@
     <function name="x11_font_get_xdisplay"
               c:identifier="gdk_x11_font_get_xdisplay">
       <return-value>
-        <type name="xlib.Display" c:type="Display*"/>
+        <type name="Display" c:type="Display*"/>
       </return-value>
       <parameters>
         <parameter name="font">

Modified: trunk/gir/gtk-x11-2.0.gir
==============================================================================
--- trunk/gir/gtk-x11-2.0.gir	(original)
+++ trunk/gir/gtk-x11-2.0.gir	Tue Aug 19 21:36:46 2008
@@ -3,17 +3,23 @@
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
   <namespace name="Gtk">
-    <alias name="GtkFundamentalType" target="GType"/>
-    <alias name="GtkType" target="GType"/>
-    <alias name="GtkTypeObject" target="GTypeInstance"/>
-    <alias name="GtkTypeClass" target="GTypeClass"/>
-    <alias name="GtkClassInitFunc" target="GBaseInitFunc"/>
-    <alias name="GtkObjectInitFunc" target="GInstanceInitFunc"/>
-    <alias name="GtkSignalMarshaller" target="GSignalCMarshaller"/>
-    <alias name="GtkEnumValue" target="GEnumValue"/>
-    <alias name="GtkFlagValue" target="GFlagsValue"/>
-    <alias name="GtkAllocation" target="GdkRectangle"/>
-    <alias name="GtkDitherInfo" target="_GtkDitherInfo"/>
+    <alias name="FlagValue" target="GFlagsValue" c:type="GtkFlagValue"/>
+    <alias name="DitherInfo" target="DitherInfo" c:type="GtkDitherInfo"/>
+    <alias name="SignalMarshaller"
+           target="GSignalCMarshaller"
+           c:type="GtkSignalMarshaller"/>
+    <alias name="ClassInitFunc"
+           target="GBaseInitFunc"
+           c:type="GtkClassInitFunc"/>
+    <alias name="FundamentalType" target="GType" c:type="GtkFundamentalType"/>
+    <alias name="TypeObject" target="GTypeInstance" c:type="GtkTypeObject"/>
+    <alias name="Allocation" target="GdkRectangle" c:type="GtkAllocation"/>
+    <alias name="ObjectInitFunc"
+           target="GInstanceInitFunc"
+           c:type="GtkObjectInitFunc"/>
+    <alias name="TypeClass" target="GTypeClass" c:type="GtkTypeClass"/>
+    <alias name="EnumValue" target="GEnumValue" c:type="GtkEnumValue"/>
+    <alias name="Type" target="GType" c:type="GtkType"/>
     <enumeration name="AnchorType"
                  c:type="GtkAnchorType"
                  glib:type-name="GtkAnchorType"
@@ -1210,63 +1216,6 @@
               c:identifier="GTK_ACCEL_MASK"
               glib:nick="mask"/>
     </bitfield>
-    <record name="GtkAccelKey" c:type="GtkAccelKey">
-      <field name="accel_key">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="accel_mods">
-        <type name="GdkModifierType" c:type="GdkModifierType"/>
-      </field>
-      <field name="accel_flags">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GtkAccelGroupEntry" c:type="GtkAccelGroupEntry">
-      <field name="key">
-        <type name="GtkAccelKey" c:type="GtkAccelKey"/>
-      </field>
-      <field name="closure">
-        <type name="GObject.GClosure" c:type="GClosure*"/>
-      </field>
-      <field name="accel_path_quark">
-        <type name="GLib.GQuark" c:type="GQuark"/>
-      </field>
-    </record>
-    <callback name="GtkAccelGroupActivate">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="accel_group">
-          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
-        </parameter>
-        <parameter name="acceleratable">
-          <type name="GObject.Object" c:type="GObject*"/>
-        </parameter>
-        <parameter name="keyval">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="modifier">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkAccelGroupFindFunc">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="key">
-          <type name="GtkAccelKey" c:type="GtkAccelKey*"/>
-        </parameter>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
     <class name="AccelGroup"
            c:type="GtkAccelGroup"
            parent="GObject.Object"
@@ -1284,7 +1233,7 @@
         </return-value>
         <parameters>
           <parameter name="closure">
-            <type name="GObject.GClosure" c:type="GClosure*"/>
+            <type name="GObject.Closure" c:type="GClosure*"/>
           </parameter>
         </parameters>
       </constructor>
@@ -1317,16 +1266,16 @@
             <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
           <parameter name="accel_key">
-            <type name="uint32" c:type="guint"/>
+            <type name="uint" c:type="guint"/>
           </parameter>
           <parameter name="accel_mods">
-            <type name="GdkModifierType" c:type="GdkModifierType"/>
+            <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
           </parameter>
           <parameter name="accel_flags">
             <type name="AccelFlags" c:type="GtkAccelFlags"/>
           </parameter>
           <parameter name="closure">
-            <type name="GObject.GClosure" c:type="GClosure*"/>
+            <type name="GObject.Closure" c:type="GClosure*"/>
           </parameter>
         </parameters>
       </method>
@@ -1343,7 +1292,7 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="closure">
-            <type name="GObject.GClosure" c:type="GClosure*"/>
+            <type name="GObject.Closure" c:type="GClosure*"/>
           </parameter>
         </parameters>
       </method>
@@ -1356,7 +1305,7 @@
             <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
           <parameter name="closure">
-            <type name="GObject.GClosure" c:type="GClosure*"/>
+            <type name="GObject.Closure" c:type="GClosure*"/>
           </parameter>
         </parameters>
       </method>
@@ -1370,10 +1319,10 @@
             <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
           <parameter name="accel_key">
-            <type name="uint32" c:type="guint"/>
+            <type name="uint" c:type="guint"/>
           </parameter>
           <parameter name="accel_mods">
-            <type name="GdkModifierType" c:type="GdkModifierType"/>
+            <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
           </parameter>
         </parameters>
       </method>
@@ -1386,29 +1335,29 @@
             <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
           <parameter name="accel_quark">
-            <type name="GLib.GQuark" c:type="GQuark"/>
+            <type name="GLib.Quark" c:type="GQuark"/>
           </parameter>
           <parameter name="acceleratable">
             <type name="GObject.Object" c:type="GObject*"/>
           </parameter>
           <parameter name="accel_key">
-            <type name="uint32" c:type="guint"/>
+            <type name="uint" c:type="guint"/>
           </parameter>
           <parameter name="accel_mods">
-            <type name="GdkModifierType" c:type="GdkModifierType"/>
+            <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
           </parameter>
         </parameters>
       </method>
       <method name="find" c:identifier="gtk_accel_group_find">
         <return-value>
-          <type name="GtkAccelKey" c:type="GtkAccelKey*"/>
+          <type name="AccelKey" c:type="GtkAccelKey*"/>
         </return-value>
         <parameters>
           <parameter name="accel_group">
             <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
           <parameter name="find_func">
-            <type name="GtkAccelGroupFindFunc" c:type="GtkAccelGroupFindFunc"/>
+            <type name="AccelGroupFindFunc" c:type="GtkAccelGroupFindFunc"/>
           </parameter>
           <parameter name="data">
             <type name="any" c:type="gpointer"/>
@@ -1417,24 +1366,24 @@
       </method>
       <method name="query" c:identifier="gtk_accel_group_query">
         <return-value>
-          <type name="GtkAccelGroupEntry" c:type="GtkAccelGroupEntry*"/>
+          <type name="AccelGroupEntry" c:type="GtkAccelGroupEntry*"/>
         </return-value>
         <parameters>
           <parameter name="accel_group">
             <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
           <parameter name="accel_key">
-            <type name="uint32" c:type="guint"/>
+            <type name="uint" c:type="guint"/>
           </parameter>
           <parameter name="accel_mods">
-            <type name="GdkModifierType" c:type="GdkModifierType"/>
+            <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
           </parameter>
           <parameter name="n_entries">
-            <type name="GLib.guint" c:type="guint*"/>
+            <type name="uint" c:type="guint*"/>
           </parameter>
         </parameters>
       </method>
-      <callback name="accel_changed">
+      <callback name="accel_changed" c:type="accel_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -1443,32 +1392,32 @@
             <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
           <parameter name="keyval">
-            <type name="uint32" c:type="guint"/>
+            <type name="uint" c:type="guint"/>
           </parameter>
           <parameter name="modifier">
-            <type name="GdkModifierType" c:type="GdkModifierType"/>
+            <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
           </parameter>
           <parameter name="accel_closure">
-            <type name="GObject.GClosure" c:type="GClosure*"/>
+            <type name="GObject.Closure" c:type="GClosure*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -1482,10 +1431,10 @@
             <type name="GObject.Object" c:type="GObject"/>
           </parameter>
           <parameter name="p0">
-            <type name="uint32" c:type="guint"/>
+            <type name="uint" c:type="guint"/>
           </parameter>
           <parameter name="p1">
-            <type name="GdkModifierType" c:type="GdkModifierType"/>
+            <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -1495,17 +1444,74 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="uint32" c:type="guint"/>
+            <type name="uint" c:type="guint"/>
           </parameter>
           <parameter name="p0">
-            <type name="GdkModifierType" c:type="GdkModifierType"/>
+            <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
           </parameter>
           <parameter name="p1">
-            <type name="GObject.GClosure" c:type="GClosure"/>
+            <type name="GObject.Closure" c:type="GClosure"/>
           </parameter>
         </parameters>
       </glib:signal>
     </class>
+    <record name="AccelKey" c:type="GtkAccelKey">
+      <field name="accel_key">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="accel_mods">
+        <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+      </field>
+      <field name="accel_flags">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </record>
+    <record name="AccelGroupEntry" c:type="GtkAccelGroupEntry">
+      <field name="key">
+        <type name="AccelKey" c:type="GtkAccelKey"/>
+      </field>
+      <field name="closure">
+        <type name="GObject.Closure" c:type="GClosure*"/>
+      </field>
+      <field name="accel_path_quark">
+        <type name="GLib.Quark" c:type="GQuark"/>
+      </field>
+    </record>
+    <callback name="AccelGroupActivate" c:type="GtkAccelGroupActivate">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="accel_group">
+          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+        </parameter>
+        <parameter name="acceleratable">
+          <type name="GObject.Object" c:type="GObject*"/>
+        </parameter>
+        <parameter name="keyval">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="modifier">
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="AccelGroupFindFunc" c:type="GtkAccelGroupFindFunc">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="key">
+          <type name="AccelKey" c:type="GtkAccelKey*"/>
+        </parameter>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
     <function name="accel_group_attach" c:identifier="_gtk_accel_group_attach">
       <return-value>
         <type name="none" c:type="void"/>
@@ -1542,17 +1548,17 @@
           <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
         <parameter name="accel_key">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="accel_mods">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
         </parameter>
       </parameters>
     </function>
     <function name="accel_groups_from_object"
               c:identifier="gtk_accel_groups_from_object">
       <return-value>
-        <type name="GLib.GSList" c:type="GSList*"/>
+        <type name="GLib.SList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="object">
@@ -1566,10 +1572,10 @@
       </return-value>
       <parameters>
         <parameter name="keyval">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="modifiers">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
         </parameter>
       </parameters>
     </function>
@@ -1582,10 +1588,10 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="accelerator_key">
-          <type name="GLib.guint" c:type="guint*"/>
+          <type name="uint" c:type="guint*"/>
         </parameter>
         <parameter name="accelerator_mods">
-          <type name="GdkModifierType" c:type="GdkModifierType*"/>
+          <type name="Gdk.ModifierType" c:type="GdkModifierType*"/>
         </parameter>
       </parameters>
     </function>
@@ -1595,10 +1601,10 @@
       </return-value>
       <parameters>
         <parameter name="accelerator_key">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="accelerator_mods">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
         </parameter>
       </parameters>
     </function>
@@ -1609,10 +1615,10 @@
       </return-value>
       <parameters>
         <parameter name="accelerator_key">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="accelerator_mods">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
         </parameter>
       </parameters>
     </function>
@@ -1623,14 +1629,14 @@
       </return-value>
       <parameters>
         <parameter name="default_mod_mask">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
         </parameter>
       </parameters>
     </function>
     <function name="accelerator_get_default_mod_mask"
               c:identifier="gtk_accelerator_get_default_mod_mask">
       <return-value>
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
     </function>
     <function name="accel_group_reconnect"
@@ -1643,7 +1649,7 @@
           <type name="AccelGroup" c:type="GtkAccelGroup*"/>
         </parameter>
         <parameter name="accel_path_quark">
-          <type name="GLib.GQuark" c:type="GQuark"/>
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
@@ -3228,26 +3234,360 @@
               c:identifier="GTK_WIDGET_HELP_WHATS_THIS"
               glib:nick="whats-this"/>
     </enumeration>
-    <record name="GtkArg" c:type="GtkArg">
+    <record name="Arg" c:type="GtkArg">
       <field name="type">
-        <type name="GtkType" c:type="GtkType"/>
+        <type name="GObject.Type" c:type="GtkType"/>
       </field>
       <field name="name">
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="d">
-        <type name="???" c:type="???"/>
-      </field>
-    </record>
-    <record name="GtkObject" c:type="GtkObject">
-      <field name="parent_instance">
-        <type name="GObject.InitiallyUnowned" c:type="GInitiallyUnowned"/>
-      </field>
-      <field name="flags">
-        <type name="uint32" c:type="guint32"/>
+        <type name="any" c:type="any"/>
       </field>
     </record>
-    <callback name="GtkFunction">
+    <class name="Object"
+           c:type="GtkObject"
+           parent="GObject.InitiallyUnowned"
+           glib:type-name="GtkObject"
+           glib:get-type="gtk_object_get_type">
+      <constructor name="new" c:identifier="gtk_object_new">
+        <return-value>
+          <type name="Object" c:type="GtkObject*"/>
+        </return-value>
+        <parameters>
+          <parameter name="type">
+            <type name="GObject.Type" c:type="GtkType"/>
+          </parameter>
+          <parameter name="first_property_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="ref" c:identifier="gtk_object_ref">
+        <return-value>
+          <type name="Object" c:type="GtkObject*"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="sink" c:identifier="gtk_object_sink">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="destroy" c:identifier="gtk_object_destroy">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unref" c:identifier="gtk_object_unref">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="weakref" c:identifier="gtk_object_weakref">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+          <parameter name="notify">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="weakunref" c:identifier="gtk_object_weakunref">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+          <parameter name="notify">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_data" c:identifier="gtk_object_set_data">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_data_full" c:identifier="gtk_object_set_data_full">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_data" c:identifier="gtk_object_remove_data">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_data" c:identifier="gtk_object_get_data">
+        <return-value>
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_no_notify"
+              c:identifier="gtk_object_remove_no_notify">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_user_data" c:identifier="gtk_object_set_user_data">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_user_data" c:identifier="gtk_object_get_user_data">
+        <return-value>
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_data_by_id" c:identifier="gtk_object_set_data_by_id">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+          <parameter name="data_id">
+            <type name="GLib.Quark" c:type="GQuark"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_data_by_id_full"
+              c:identifier="gtk_object_set_data_by_id_full">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+          <parameter name="data_id">
+            <type name="GLib.Quark" c:type="GQuark"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_data_by_id" c:identifier="gtk_object_get_data_by_id">
+        <return-value>
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+          <parameter name="data_id">
+            <type name="GLib.Quark" c:type="GQuark"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_data_by_id"
+              c:identifier="gtk_object_remove_data_by_id">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+          <parameter name="data_id">
+            <type name="GLib.Quark" c:type="GQuark"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_no_notify_by_id"
+              c:identifier="gtk_object_remove_no_notify_by_id">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+          <parameter name="key_id">
+            <type name="GLib.Quark" c:type="GQuark"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get" c:identifier="gtk_object_get">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+          <parameter name="first_property_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set" c:identifier="gtk_object_set">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+          <parameter name="first_property_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="user-data">
+        <type name="any" c:type="gpointer"/>
+      </property>
+      <callback name="set_arg" c:type="set_arg">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+          <parameter name="arg">
+            <type name="Arg" c:type="GtkArg*"/>
+          </parameter>
+          <parameter name="arg_id">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_arg" c:type="get_arg">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+          <parameter name="arg">
+            <type name="Arg" c:type="GtkArg*"/>
+          </parameter>
+          <parameter name="arg_id">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="destroy" c:type="destroy">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Object" c:type="GtkObject*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <glib:signal name="destroy">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <callback name="Function" c:type="GtkFunction">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
@@ -3257,7 +3597,7 @@
         </parameter>
       </parameters>
     </callback>
-    <callback name="GtkDestroyNotify">
+    <callback name="DestroyNotify" c:type="GtkDestroyNotify">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -3267,45 +3607,45 @@
         </parameter>
       </parameters>
     </callback>
-    <callback name="GtkCallbackMarshal">
+    <callback name="CallbackMarshal" c:type="GtkCallbackMarshal">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
+          <type name="Object" c:type="GtkObject*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="n_args">
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
         <parameter name="args">
-          <type name="GtkArg" c:type="GtkArg*"/>
+          <type name="Arg" c:type="GtkArg*"/>
         </parameter>
       </parameters>
     </callback>
-    <callback name="GtkSignalFunc">
+    <callback name="SignalFunc" c:type="GtkSignalFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
     </callback>
-    <record name="GtkTypeInfo" c:type="GtkTypeInfo">
+    <record name="TypeInfo" c:type="GtkTypeInfo">
       <field name="type_name">
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="object_size">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="class_size">
-        <type name="uint32" c:type="guint"/>
+        <type name="uint" c:type="guint"/>
       </field>
       <field name="class_init_func">
-        <type name="GtkClassInitFunc" c:type="GtkClassInitFunc"/>
+        <type name="ClassInitFunc" c:type="GtkClassInitFunc"/>
       </field>
       <field name="object_init_func">
-        <type name="GtkObjectInitFunc" c:type="GtkObjectInitFunc"/>
+        <type name="ObjectInitFunc" c:type="GtkObjectInitFunc"/>
       </field>
       <field name="reserved_1">
         <type name="any" c:type="gpointer"/>
@@ -3314,7 +3654,7 @@
         <type name="any" c:type="gpointer"/>
       </field>
       <field name="base_class_init_func">
-        <type name="GtkClassInitFunc" c:type="GtkClassInitFunc"/>
+        <type name="ClassInitFunc" c:type="GtkClassInitFunc"/>
       </field>
     </record>
     <function name="type_class" c:identifier="gtk_type_class">
@@ -3323,20 +3663,20 @@
       </return-value>
       <parameters>
         <parameter name="type">
-          <type name="GtkType" c:type="GtkType"/>
+          <type name="GObject.Type" c:type="GtkType"/>
         </parameter>
       </parameters>
     </function>
     <function name="type_unique" c:identifier="gtk_type_unique">
       <return-value>
-        <type name="GtkType" c:type="GtkType"/>
+        <type name="GObject.Type" c:type="GtkType"/>
       </return-value>
       <parameters>
         <parameter name="parent_type">
-          <type name="GtkType" c:type="GtkType"/>
+          <type name="GObject.Type" c:type="GtkType"/>
         </parameter>
         <parameter name="gtkinfo">
-          <type name="GtkTypeInfo" c:type="GtkTypeInfo*"/>
+          <type name="TypeInfo" c:type="GtkTypeInfo*"/>
         </parameter>
       </parameters>
     </function>
@@ -3346,40 +3686,40 @@
       </return-value>
       <parameters>
         <parameter name="type">
-          <type name="GtkType" c:type="GtkType"/>
+          <type name="GObject.Type" c:type="GtkType"/>
         </parameter>
       </parameters>
     </function>
     <function name="type_enum_get_values"
               c:identifier="gtk_type_enum_get_values">
       <return-value>
-        <type name="GtkEnumValue" c:type="GtkEnumValue*"/>
+        <type name="EnumValue" c:type="GtkEnumValue*"/>
       </return-value>
       <parameters>
         <parameter name="enum_type">
-          <type name="GtkType" c:type="GtkType"/>
+          <type name="GObject.Type" c:type="GtkType"/>
         </parameter>
       </parameters>
     </function>
     <function name="type_flags_get_values"
               c:identifier="gtk_type_flags_get_values">
       <return-value>
-        <type name="GtkFlagValue" c:type="GtkFlagValue*"/>
+        <type name="FlagValue" c:type="GtkFlagValue*"/>
       </return-value>
       <parameters>
         <parameter name="flags_type">
-          <type name="GtkType" c:type="GtkType"/>
+          <type name="GObject.Type" c:type="GtkType"/>
         </parameter>
       </parameters>
     </function>
     <function name="type_enum_find_value"
               c:identifier="gtk_type_enum_find_value">
       <return-value>
-        <type name="GtkEnumValue" c:type="GtkEnumValue*"/>
+        <type name="EnumValue" c:type="GtkEnumValue*"/>
       </return-value>
       <parameters>
         <parameter name="enum_type">
-          <type name="GtkType" c:type="GtkType"/>
+          <type name="GObject.Type" c:type="GtkType"/>
         </parameter>
         <parameter name="value_name">
           <type name="string" c:type="gchar*"/>
@@ -3389,11 +3729,11 @@
     <function name="type_flags_find_value"
               c:identifier="gtk_type_flags_find_value">
       <return-value>
-        <type name="GtkFlagValue" c:type="GtkFlagValue*"/>
+        <type name="FlagValue" c:type="GtkFlagValue*"/>
       </return-value>
       <parameters>
         <parameter name="flags_type">
-          <type name="GtkType" c:type="GtkType"/>
+          <type name="GObject.Type" c:type="GtkType"/>
         </parameter>
         <parameter name="value_name">
           <type name="string" c:type="gchar*"/>
@@ -3406,562 +3746,213 @@
       </return-value>
       <parameters>
         <parameter name="debug_flags">
-          <type name="GTypeDebugFlags" c:type="GTypeDebugFlags"/>
+          <type name="GObject.TypeDebugFlags" c:type="GTypeDebugFlags"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkObjectClass" c:type="GtkObjectClass">
-      <field name="parent_class">
-        <type name="GInitiallyUnownedClass" c:type="GInitiallyUnownedClass"/>
-      </field>
-      <callback name="set_arg">
+    <function name="object_add_arg_type"
+              c:identifier="gtk_object_add_arg_type">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="arg_name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="arg_type">
+          <type name="GObject.Type" c:type="GtkType"/>
+        </parameter>
+        <parameter name="arg_flags">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="arg_id">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="Adjustment"
+           c:type="GtkAdjustment"
+           parent="Object"
+           glib:type-name="GtkAdjustment"
+           glib:get-type="gtk_adjustment_get_type">
+      <method name="changed" c:identifier="gtk_adjustment_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkObject" c:type="GtkObject*"/>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
-          <parameter name="arg">
-            <type name="GtkArg" c:type="GtkArg*"/>
+        </parameters>
+      </method>
+      <method name="value_changed" c:identifier="gtk_adjustment_value_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
-          <parameter name="arg_id">
-            <type name="uint32" c:type="guint"/>
+        </parameters>
+      </method>
+      <method name="clamp_page" c:identifier="gtk_adjustment_clamp_page">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+          <parameter name="lower">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="upper">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_arg">
+      </method>
+      <method name="get_value" c:identifier="gtk_adjustment_get_value">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_value" c:identifier="gtk_adjustment_set_value">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkObject" c:type="GtkObject*"/>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
-          <parameter name="arg">
-            <type name="GtkArg" c:type="GtkArg*"/>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
           </parameter>
-          <parameter name="arg_id">
-            <type name="uint32" c:type="guint"/>
+        </parameters>
+      </method>
+      <property name="value">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="lower">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="upper">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="step-increment">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="page-increment">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="page-size">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <callback name="changed" c:type="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="destroy">
+      <callback name="value_changed" c:type="value_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GtkObject" c:type="GtkObject*"/>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </callback>
-    </record>
-    <function name="object_get_type" c:identifier="gtk_object_get_type">
-      <return-value>
-        <type name="GtkType" c:type="GtkType"/>
-      </return-value>
-    </function>
-    <function name="object_sink" c:identifier="gtk_object_sink">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_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>
+      <glib:signal name="value-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="adjustment_new" c:identifier="gtk_adjustment_new">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Object" c:type="GtkObject*"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
+        <parameter name="value">
+          <type name="double" c:type="gdouble"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="object_destroy" c:identifier="gtk_object_destroy">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
+        <parameter name="lower">
+          <type name="double" c:type="gdouble"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="object_new" c:identifier="gtk_object_new">
-      <return-value>
-        <type name="GtkObject" c:type="GtkObject*"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="GtkType" c:type="GtkType"/>
+        <parameter name="upper">
+          <type name="double" c:type="gdouble"/>
         </parameter>
-        <parameter name="first_property_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_ref" c:identifier="gtk_object_ref">
-      <return-value>
-        <type name="GtkObject" c:type="GtkObject*"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_unref" c:identifier="gtk_object_unref">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_weakref" c:identifier="gtk_object_weakref">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="notify">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_weakunref" c:identifier="gtk_object_weakunref">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="notify">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_set_data" c:identifier="gtk_object_set_data">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="key">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_set_data_full"
-              c:identifier="gtk_object_set_data_full">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="key">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="destroy">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_remove_data" c:identifier="gtk_object_remove_data">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="key">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_get_data" c:identifier="gtk_object_get_data">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="key">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_remove_no_notify"
-              c:identifier="gtk_object_remove_no_notify">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="key">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_set_user_data"
-              c:identifier="gtk_object_set_user_data">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_get_user_data"
-              c:identifier="gtk_object_get_user_data">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_set_data_by_id"
-              c:identifier="gtk_object_set_data_by_id">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="data_id">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_set_data_by_id_full"
-              c:identifier="gtk_object_set_data_by_id_full">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="data_id">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="destroy">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_get_data_by_id"
-              c:identifier="gtk_object_get_data_by_id">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="data_id">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_remove_data_by_id"
-              c:identifier="gtk_object_remove_data_by_id">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="data_id">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_remove_no_notify_by_id"
-              c:identifier="gtk_object_remove_no_notify_by_id">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="key_id">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_get" c:identifier="gtk_object_get">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="first_property_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_set" c:identifier="gtk_object_set">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="first_property_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_add_arg_type"
-              c:identifier="gtk_object_add_arg_type">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="arg_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="arg_type">
-          <type name="GtkType" c:type="GtkType"/>
+        <parameter name="step_increment">
+          <type name="double" c:type="gdouble"/>
         </parameter>
-        <parameter name="arg_flags">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="page_increment">
+          <type name="double" c:type="gdouble"/>
         </parameter>
-        <parameter name="arg_id">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="page_size">
+          <type name="double" c:type="gdouble"/>
         </parameter>
       </parameters>
     </function>
-    <class name="Adjustment"
-           c:type="GtkAdjustment"
-           parent="GtkObject"
-           glib:type-name="GtkAdjustment"
-           glib:get-type="gtk_adjustment_get_type">
-      <method name="changed" c:identifier="gtk_adjustment_changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="value_changed" c:identifier="gtk_adjustment_value_changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="clamp_page" c:identifier="gtk_adjustment_clamp_page">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
-          </parameter>
-          <parameter name="lower">
-            <type name="double" c:type="gdouble"/>
-          </parameter>
-          <parameter name="upper">
-            <type name="double" c:type="gdouble"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_value" c:identifier="gtk_adjustment_get_value">
+    <glib:boxed c:type="GtkBorder"
+                glib:name="Border"
+                glib:type-name="GtkBorder"
+                glib:get-type="gtk_border_get_type">
+      <constructor name="copy" c:identifier="gtk_border_copy">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="Border" c:type="GtkBorder*"/>
         </return-value>
         <parameters>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="border_">
+            <type name="Border" c:type="GtkBorder*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_value" c:identifier="gtk_adjustment_set_value">
+      </constructor>
+      <method name="free" c:identifier="gtk_border_free">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="border_">
+            <type name="Border" c:type="GtkBorder*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="value">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <property name="lower">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <property name="upper">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <property name="step-increment">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <property name="page-increment">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <property name="page-size">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <callback name="changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="value_changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="adjustment">
-            <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="changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="value-changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="adjustment_new" c:identifier="gtk_adjustment_new">
-      <return-value>
-        <type name="GtkObject" c:type="GtkObject*"/>
-      </return-value>
-      <parameters>
-        <parameter name="value">
-          <type name="double" c:type="gdouble"/>
-        </parameter>
-        <parameter name="lower">
-          <type name="double" c:type="gdouble"/>
-        </parameter>
-        <parameter name="upper">
-          <type name="double" c:type="gdouble"/>
-        </parameter>
-        <parameter name="step_increment">
-          <type name="double" c:type="gdouble"/>
-        </parameter>
-        <parameter name="page_increment">
-          <type name="double" c:type="gdouble"/>
-        </parameter>
-        <parameter name="page_size">
-          <type name="double" c:type="gdouble"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkThemeEngine" c:type="GtkThemeEngine"/>
-    <record name="GtkRcProperty" c:type="GtkRcProperty">
-      <field name="type_name">
-        <type name="GLib.GQuark" c:type="GQuark"/>
-      </field>
-      <field name="property_name">
-        <type name="GLib.GQuark" c:type="GQuark"/>
-      </field>
-      <field name="origin">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="value">
-        <type name="GObject.GValue" c:type="GValue"/>
-      </field>
-    </record>
-    <callback name="GtkRcPropertyParser">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="pspec">
-          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-        <parameter name="rc_string">
-          <type name="GLib.GString" c:type="GString*"/>
-        </parameter>
-        <parameter name="property_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </callback>
+    </glib:boxed>
     <class name="Style"
            c:type="GtkStyle"
            parent="GObject.Object"
@@ -4027,7 +4018,7 @@
       </method>
       <method name="get_font" c:identifier="gtk_style_get_font">
         <return-value>
-          <type name="GdkFont" c:type="GdkFont*"/>
+          <type name="Gdk.Font" c:type="GdkFont*"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4044,7 +4035,7 @@
             <type name="Style" c:type="GtkStyle*"/>
           </parameter>
           <parameter name="font">
-            <type name="GdkFont" c:type="GdkFont*"/>
+            <type name="Gdk.Font" c:type="GdkFont*"/>
           </parameter>
         </parameters>
       </method>
@@ -4083,19 +4074,19 @@
             <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="area" allow-none="1">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -4124,13 +4115,13 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="color">
-            <type name="GdkColor" c:type="GdkColor*"/>
+            <type name="Gdk.Color" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
       <method name="render_icon" c:identifier="gtk_style_render_icon">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4156,7 +4147,7 @@
           </parameter>
         </parameters>
       </method>
-      <callback name="realize">
+      <callback name="realize" c:type="realize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4166,7 +4157,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="unrealize">
+      <callback name="unrealize" c:type="unrealize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4176,7 +4167,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="copy">
+      <callback name="copy" c:type="copy">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4189,7 +4180,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="clone">
+      <callback name="clone" c:type="clone">
         <return-value>
           <type name="Style" c:type="GtkStyle*"/>
         </return-value>
@@ -4199,7 +4190,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="init_from_rc">
+      <callback name="init_from_rc" c:type="init_from_rc">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4212,7 +4203,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_background">
+      <callback name="set_background" c:type="set_background">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4228,9 +4219,9 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="render_icon">
+      <callback name="render_icon" c:type="render_icon">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4256,7 +4247,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_hline">
+      <callback name="draw_hline" c:type="draw_hline">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4271,7 +4262,7 @@
             <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -4280,17 +4271,17 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x1">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="x2">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_vline">
+      <callback name="draw_vline" c:type="draw_vline">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4305,7 +4296,7 @@
             <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -4314,17 +4305,17 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="y1_">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y2_">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_shadow">
+      <callback name="draw_shadow" c:type="draw_shadow">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4342,7 +4333,7 @@
             <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -4351,20 +4342,20 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_polygon">
+      <callback name="draw_polygon" c:type="draw_polygon">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4382,7 +4373,7 @@
             <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -4391,17 +4382,17 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="point">
-            <type name="Gdk.GdkPoint" c:type="GdkPoint*"/>
+            <type name="Gdk.Point" c:type="GdkPoint*"/>
           </parameter>
           <parameter name="npoints">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="fill">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_arrow">
+      <callback name="draw_arrow" c:type="draw_arrow">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4419,7 +4410,7 @@
             <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -4434,20 +4425,20 @@
             <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_diamond">
+      <callback name="draw_diamond" c:type="draw_diamond">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4465,7 +4456,7 @@
             <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -4474,20 +4465,20 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_string">
+      <callback name="draw_string" c:type="draw_string">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4502,7 +4493,7 @@
             <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -4511,17 +4502,17 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="string">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_box">
+      <callback name="draw_box" c:type="draw_box">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4539,7 +4530,7 @@
             <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -4548,20 +4539,20 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_flat_box">
+      <callback name="draw_flat_box" c:type="draw_flat_box">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4579,7 +4570,7 @@
             <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -4588,20 +4579,20 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_check">
+      <callback name="draw_check" c:type="draw_check">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4619,7 +4610,7 @@
             <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -4628,20 +4619,20 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_option">
+      <callback name="draw_option" c:type="draw_option">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4659,7 +4650,7 @@
             <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -4668,20 +4659,20 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_tab">
+      <callback name="draw_tab" c:type="draw_tab">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4699,7 +4690,7 @@
             <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -4708,20 +4699,20 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_shadow_gap">
+      <callback name="draw_shadow_gap" c:type="draw_shadow_gap">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4739,7 +4730,7 @@
             <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -4748,29 +4739,29 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="gap_side">
             <type name="PositionType" c:type="GtkPositionType"/>
           </parameter>
           <parameter name="gap_x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="gap_width">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_box_gap">
+      <callback name="draw_box_gap" c:type="draw_box_gap">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4788,7 +4779,7 @@
             <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -4797,29 +4788,29 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="gap_side">
             <type name="PositionType" c:type="GtkPositionType"/>
           </parameter>
           <parameter name="gap_x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="gap_width">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_extension">
+      <callback name="draw_extension" c:type="draw_extension">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4837,7 +4828,7 @@
             <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -4846,23 +4837,23 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="gap_side">
             <type name="PositionType" c:type="GtkPositionType"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_focus">
+      <callback name="draw_focus" c:type="draw_focus">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4877,7 +4868,7 @@
             <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -4886,20 +4877,20 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_slider">
+      <callback name="draw_slider" c:type="draw_slider">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4917,7 +4908,7 @@
             <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -4926,23 +4917,23 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="orientation">
             <type name="Orientation" c:type="GtkOrientation"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_handle">
+      <callback name="draw_handle" c:type="draw_handle">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -4960,7 +4951,7 @@
             <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -4969,23 +4960,23 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="orientation">
             <type name="Orientation" c:type="GtkOrientation"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_expander">
+      <callback name="draw_expander" c:type="draw_expander">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -5000,7 +4991,7 @@
             <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -5009,17 +5000,17 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="expander_style">
             <type name="ExpanderStyle" c:type="GtkExpanderStyle"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_layout">
+      <callback name="draw_layout" c:type="draw_layout">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -5037,7 +5028,7 @@
             <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -5046,17 +5037,17 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="layout">
             <type name="Pango.Layout" c:type="PangoLayout*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="draw_resize_grip">
+      <callback name="draw_resize_grip" c:type="draw_resize_grip">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -5071,7 +5062,7 @@
             <type name="StateType" c:type="GtkStateType"/>
           </parameter>
           <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -5080,78 +5071,78 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="edge">
-            <type name="GdkWindowEdge" c:type="GdkWindowEdge"/>
+            <type name="Gdk.WindowEdge" c:type="GdkWindowEdge"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved5">
+      <callback name="gtk_reserved5" c:type="_gtk_reserved5">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved6">
+      <callback name="gtk_reserved6" c:type="_gtk_reserved6">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved7">
+      <callback name="gtk_reserved7" c:type="_gtk_reserved7">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved8">
+      <callback name="gtk_reserved8" c:type="_gtk_reserved8">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved9">
+      <callback name="gtk_reserved9" c:type="_gtk_reserved9">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved10">
+      <callback name="gtk_reserved10" c:type="_gtk_reserved10">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved11">
+      <callback name="gtk_reserved11" c:type="_gtk_reserved11">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved12">
+      <callback name="gtk_reserved12" c:type="_gtk_reserved12">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -5167,2654 +5158,1505 @@
         </return-value>
       </glib:signal>
     </class>
-    <function name="draw_hline" c:identifier="gtk_draw_hline">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="x1">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="x2">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="draw_vline" c:identifier="gtk_draw_vline">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
+    <record name="ThemeEngine" c:type="GtkThemeEngine"/>
+    <class name="RcStyle"
+           c:type="GtkRcStyle"
+           parent="GObject.Object"
+           glib:type-name="GtkRcStyle"
+           glib:get-type="gtk_rc_style_get_type">
+      <constructor name="new" c:identifier="gtk_rc_style_new">
+        <return-value>
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
+        </return-value>
+      </constructor>
+      <constructor name="copy" c:identifier="gtk_rc_style_copy">
+        <return-value>
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
+        </return-value>
+        <parameters>
+          <parameter name="orig">
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="ref" c:identifier="gtk_rc_style_ref">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="rc_style">
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unref" c:identifier="gtk_rc_style_unref">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="rc_style">
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <callback name="create_rc_style" c:type="create_rc_style">
+        <return-value>
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
+        </return-value>
+        <parameters>
+          <parameter name="rc_style">
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="parse" c:type="parse">
+        <return-value>
+          <type name="uint" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="rc_style">
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
+          </parameter>
+          <parameter name="settings">
+            <type name="Settings" c:type="GtkSettings*"/>
+          </parameter>
+          <parameter name="scanner">
+            <type name="GLib.Scanner" c:type="GScanner*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="merge" c:type="merge">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="dest">
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
+          </parameter>
+          <parameter name="src">
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="create_style" c:type="create_style">
+        <return-value>
           <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="y1_">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y2_">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="draw_shadow" c:identifier="gtk_draw_shadow">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </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="draw_polygon" c:identifier="gtk_draw_polygon">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="points">
-          <type name="Gdk.GdkPoint" c:type="GdkPoint*"/>
-        </parameter>
-        <parameter name="npoints">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="fill">
+        </return-value>
+        <parameters>
+          <parameter name="rc_style">
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <glib:boxed c:type="GtkIconSet"
+                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">
+        <return-value>
+          <type name="IconSet" c:type="GtkIconSet*"/>
+        </return-value>
+        <parameters>
+          <parameter name="pixbuf">
+            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="ref" c:identifier="gtk_icon_set_ref">
+        <return-value>
+          <type name="IconSet" c:type="GtkIconSet*"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
+          </parameter>
+        </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>
+      </constructor>
+      <method name="unref" c:identifier="gtk_icon_set_unref">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="render_icon" c:identifier="gtk_icon_set_render_icon">
+        <return-value>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
+          </parameter>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
+          </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>
+        </parameters>
+      </method>
+      <method name="add_source" c:identifier="gtk_icon_set_add_source">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <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="get_sizes" c:identifier="gtk_icon_set_get_sizes">
+        <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>
+          <parameter name="n_sizes">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </glib:boxed>
+    <glib:boxed c:type="GtkIconSource"
+                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">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_filename" c:identifier="gtk_icon_source_set_filename">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+          <parameter name="filename">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_icon_name"
+              c:identifier="gtk_icon_source_set_icon_name">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </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>
+        </parameters>
+      </method>
+      <method name="set_pixbuf" c:identifier="gtk_icon_source_set_pixbuf">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+          <parameter name="pixbuf">
+            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_filename" c:identifier="gtk_icon_source_get_filename">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_icon_name"
+              c:identifier="gtk_icon_source_get_icon_name">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_pixbuf" c:identifier="gtk_icon_source_get_pixbuf">
+        <return-value>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+        </return-value>
+        <parameters>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_direction_wildcarded"
+              c:identifier="gtk_icon_source_set_direction_wildcarded">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <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_state_wildcarded"
+              c:identifier="gtk_icon_source_set_state_wildcarded">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <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>
+        <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="get_size_wildcarded"
+              c:identifier="gtk_icon_source_get_size_wildcarded">
+        <return-value>
           <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="draw_arrow" c:identifier="gtk_draw_arrow">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="arrow_type">
-          <type name="ArrowType" c:type="GtkArrowType"/>
-        </parameter>
-        <parameter name="fill">
+        </return-value>
+        <parameters>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_state_wildcarded"
+              c:identifier="gtk_icon_source_get_state_wildcarded">
+        <return-value>
           <type name="boolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </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="draw_diamond" c:identifier="gtk_draw_diamond">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </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="draw_box" c:identifier="gtk_draw_box">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </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="draw_flat_box" c:identifier="gtk_draw_flat_box">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
+        </return-value>
+        <parameters>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_direction_wildcarded"
+              c:identifier="gtk_icon_source_get_direction_wildcarded">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <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="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+          <parameter name="direction">
+            <type name="TextDirection" c:type="GtkTextDirection"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_state" c:identifier="gtk_icon_source_set_state">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+          <parameter name="state">
+            <type name="StateType" c:type="GtkStateType"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_size" c:identifier="gtk_icon_source_set_size">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+          <parameter name="size">
+            <type name="IconSize" c:type="GtkIconSize"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_direction"
+              c:identifier="gtk_icon_source_get_direction">
+        <return-value>
+          <type name="TextDirection" c:type="GtkTextDirection"/>
+        </return-value>
+        <parameters>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_state" c:identifier="gtk_icon_source_get_state">
+        <return-value>
           <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </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="draw_check" c:identifier="gtk_draw_check">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </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="draw_option" c:identifier="gtk_draw_option">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </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="draw_tab" c:identifier="gtk_draw_tab">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </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="draw_shadow_gap" c:identifier="gtk_draw_shadow_gap">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="gap_side">
-          <type name="PositionType" c:type="GtkPositionType"/>
-        </parameter>
-        <parameter name="gap_x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="gap_width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="draw_box_gap" c:identifier="gtk_draw_box_gap">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="gap_side">
-          <type name="PositionType" c:type="GtkPositionType"/>
-        </parameter>
-        <parameter name="gap_x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="gap_width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="draw_extension" c:identifier="gtk_draw_extension">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="gap_side">
-          <type name="PositionType" c:type="GtkPositionType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="draw_focus" c:identifier="gtk_draw_focus">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </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="draw_slider" c:identifier="gtk_draw_slider">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="orientation">
-          <type name="Orientation" c:type="GtkOrientation"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="draw_handle" c:identifier="gtk_draw_handle">
+        </return-value>
+        <parameters>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_size" c:identifier="gtk_icon_source_get_size">
+        <return-value>
+          <type name="IconSize" c:type="GtkIconSize"/>
+        </return-value>
+        <parameters>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </glib:boxed>
+    <record name="RcProperty" c:type="GtkRcProperty">
+      <field name="type_name">
+        <type name="GLib.Quark" c:type="GQuark"/>
+      </field>
+      <field name="property_name">
+        <type name="GLib.Quark" c:type="GQuark"/>
+      </field>
+      <field name="origin">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="value">
+        <type name="GObject.Value" c:type="GValue"/>
+      </field>
+    </record>
+    <class name="Settings"
+           c:type="GtkSettings"
+           parent="GObject.Object"
+           glib:type-name="GtkSettings"
+           glib:get-type="gtk_settings_get_type">
+      <constructor name="get_default" c:identifier="gtk_settings_get_default">
+        <return-value>
+          <type name="Settings" c:type="GtkSettings*"/>
+        </return-value>
+      </constructor>
+      <constructor name="get_for_screen"
+                   c:identifier="gtk_settings_get_for_screen">
+        <return-value>
+          <type name="Settings" c:type="GtkSettings*"/>
+        </return-value>
+        <parameters>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="set_property_value"
+              c:identifier="gtk_settings_set_property_value">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="Settings" c:type="GtkSettings*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="svalue">
+            <type name="SettingsValue" c:type="GtkSettingsValue*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_string_property"
+              c:identifier="gtk_settings_set_string_property">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="Settings" c:type="GtkSettings*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="v_string">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="origin">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_long_property"
+              c:identifier="gtk_settings_set_long_property">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="Settings" c:type="GtkSettings*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="v_long">
+            <type name="long" c:type="glong"/>
+          </parameter>
+          <parameter name="origin">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_double_property"
+              c:identifier="gtk_settings_set_double_property">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="settings">
+            <type name="Settings" c:type="GtkSettings*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="v_double">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="origin">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="gtk-double-click-time">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="gtk-double-click-distance">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="gtk-cursor-blink">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="gtk-cursor-blink-time">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="gtk-cursor-blink-timeout">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="gtk-split-cursor">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="gtk-theme-name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="gtk-icon-theme-name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="gtk-fallback-icon-theme">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="gtk-key-theme-name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="gtk-menu-bar-accel">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="gtk-dnd-drag-threshold">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="gtk-font-name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="gtk-icon-sizes">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="gtk-modules">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="gtk-xft-antialias">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="gtk-xft-hinting">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="gtk-xft-hintstyle">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="gtk-xft-rgba">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="gtk-xft-dpi">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="gtk-cursor-theme-name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="gtk-cursor-theme-size">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="gtk-alternative-button-order">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="gtk-alternative-sort-arrows">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="gtk-show-input-method-menu">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="gtk-show-unicode-menu">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="gtk-timeout-initial">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="gtk-timeout-repeat">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="gtk-timeout-expand">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="gtk-color-scheme">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="gtk-enable-animations">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="gtk-touchscreen-mode">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="gtk-tooltip-timeout">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="gtk-tooltip-browse-timeout">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="gtk-tooltip-browse-mode-timeout">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="gtk-keynav-cursor-only">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="gtk-keynav-wrap-around">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="gtk-error-bell">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="color-hash">
+        <type name="GObject.HashTable" c:type="GHashTable"/>
+      </property>
+      <property name="gtk-file-chooser-backend">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="gtk-print-backends">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="gtk-print-preview-command">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="gtk-enable-mnemonics">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="gtk-enable-accels">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="gtk-recent-files-limit">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="gtk-im-module">
+        <type name="string" c:type="gchararray"/>
+      </property>
+    </class>
+    <callback name="RcPropertyParser" c:type="GtkRcPropertyParser">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="width">
-          <type name="int32" c:type="gint"/>
+        <parameter name="pspec">
+          <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
         </parameter>
-        <parameter name="height">
-          <type name="int32" c:type="gint"/>
+        <parameter name="rc_string">
+          <type name="GObject.String" c:type="GString*"/>
         </parameter>
-        <parameter name="orientation">
-          <type name="Orientation" c:type="GtkOrientation"/>
+        <parameter name="property_value">
+          <type name="GObject.Value" c:type="GValue*"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="draw_expander" c:identifier="gtk_draw_expander">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="expander_style">
-          <type name="ExpanderStyle" c:type="GtkExpanderStyle"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="draw_layout" c:identifier="gtk_draw_layout">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="use_text">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="layout">
-          <type name="Pango.Layout" c:type="PangoLayout*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="draw_resize_grip" c:identifier="gtk_draw_resize_grip">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="edge">
-          <type name="GdkWindowEdge" c:type="GdkWindowEdge"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </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="paint_hline" c:identifier="gtk_paint_hline">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </parameter>
-        <parameter name="widget" allow-none="1">
+    </callback>
+    <class name="Widget"
+           c:type="GtkWidget"
+           parent="Object"
+           glib:type-name="GtkWidget"
+           glib:get-type="gtk_widget_get_type">
+      <constructor name="new" c:identifier="gtk_widget_new">
+        <return-value>
           <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="detail" allow-none="1">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="x1">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="x2">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="paint_vline" c:identifier="gtk_paint_vline">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </parameter>
-        <parameter name="widget" allow-none="1">
+        </return-value>
+        <parameters>
+          <parameter name="type">
+            <type name="GObject.Type" c:type="GType"/>
+          </parameter>
+          <parameter name="first_property_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="ref" c:identifier="gtk_widget_ref">
+        <return-value>
           <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="detail" allow-none="1">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="y1_">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y2_">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="paint_shadow" c:identifier="gtk_paint_shadow">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </parameter>
-        <parameter name="widget" allow-none="1">
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="get_parent" c:identifier="gtk_widget_get_parent">
+        <return-value>
           <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="detail" allow-none="1">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </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="paint_polygon" c:identifier="gtk_paint_polygon">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </parameter>
-        <parameter name="widget" allow-none="1">
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="get_toplevel" c:identifier="gtk_widget_get_toplevel">
+        <return-value>
           <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="detail" allow-none="1">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="points">
-          <type name="Gdk.GdkPoint" c:type="GdkPoint*"/>
-        </parameter>
-        <parameter name="npoints">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="fill">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="paint_arrow" c:identifier="gtk_paint_arrow">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </parameter>
-        <parameter name="widget" allow-none="1">
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="get_ancestor" c:identifier="gtk_widget_get_ancestor">
+        <return-value>
           <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="detail" allow-none="1">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="arrow_type">
-          <type name="ArrowType" c:type="GtkArrowType"/>
-        </parameter>
-        <parameter name="fill">
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="widget_type">
+            <type name="GObject.Type" c:type="GType"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="destroy" c:identifier="gtk_widget_destroy">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="destroyed" c:identifier="gtk_widget_destroyed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="widget_pointer">
+            <type name="Widget" c:type="GtkWidget**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unref" c:identifier="gtk_widget_unref">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set" c:identifier="gtk_widget_set">
+        <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>
+        </parameters>
+      </method>
+      <method name="unparent" c:identifier="gtk_widget_unparent">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="show" c:identifier="gtk_widget_show">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="show_now" c:identifier="gtk_widget_show_now">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="hide" c:identifier="gtk_widget_hide">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="show_all" c:identifier="gtk_widget_show_all">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="hide_all" c:identifier="gtk_widget_hide_all">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_no_show_all" c:identifier="gtk_widget_set_no_show_all">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="no_show_all">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_no_show_all" c:identifier="gtk_widget_get_no_show_all">
+        <return-value>
           <type name="boolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </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="paint_diamond" c:identifier="gtk_paint_diamond">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </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="gchar*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </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="paint_box" c:identifier="gtk_paint_box">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </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="gchar*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </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="paint_flat_box" c:identifier="gtk_paint_flat_box">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </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="gchar*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </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="paint_check" c:identifier="gtk_paint_check">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </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="gchar*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </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="paint_option" c:identifier="gtk_paint_option">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </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="gchar*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </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="paint_tab" c:identifier="gtk_paint_tab">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </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="gchar*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </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="paint_shadow_gap" c:identifier="gtk_paint_shadow_gap">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </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="gchar*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="gap_side">
-          <type name="PositionType" c:type="GtkPositionType"/>
-        </parameter>
-        <parameter name="gap_x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="gap_width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="paint_box_gap" c:identifier="gtk_paint_box_gap">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </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="gchar*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="gap_side">
-          <type name="PositionType" c:type="GtkPositionType"/>
-        </parameter>
-        <parameter name="gap_x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="gap_width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="paint_extension" c:identifier="gtk_paint_extension">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </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="gchar*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="gap_side">
-          <type name="PositionType" c:type="GtkPositionType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="paint_focus" c:identifier="gtk_paint_focus">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </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="gchar*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </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="paint_slider" c:identifier="gtk_paint_slider">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </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="gchar*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="orientation">
-          <type name="Orientation" c:type="GtkOrientation"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="paint_handle" c:identifier="gtk_paint_handle">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </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="gchar*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="orientation">
-          <type name="Orientation" c:type="GtkOrientation"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="paint_expander" c:identifier="gtk_paint_expander">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </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="gchar*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="expander_style">
-          <type name="ExpanderStyle" c:type="GtkExpanderStyle"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="paint_layout" c:identifier="gtk_paint_layout">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="use_text">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </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="gchar*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="layout">
-          <type name="Pango.Layout" c:type="PangoLayout*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="paint_resize_grip" c:identifier="gtk_paint_resize_grip">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </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="gchar*"/>
-        </parameter>
-        <parameter name="edge">
-          <type name="GdkWindowEdge" c:type="GdkWindowEdge"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <glib:boxed c:type="Border"
-                glib:name="Border"
-                glib:type-name="GtkBorder"
-                glib:get-type="gtk_border_get_type">
-      <constructor name="copy" c:identifier="gtk_border_copy">
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="map" c:identifier="gtk_widget_map">
         <return-value>
-          <type name="Border" c:type="GtkBorder*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="border_">
-            <type name="Border" c:type="GtkBorder*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="free" c:identifier="gtk_border_free">
+      </method>
+      <method name="unmap" c:identifier="gtk_widget_unmap">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="border_">
-            <type name="Border" c:type="GtkBorder*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-    </glib:boxed>
-    <function name="style_peek_property_value"
-              c:identifier="_gtk_style_peek_property_value">
-      <return-value>
-        <type name="GObject.GValue" c:type="GValue*"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="widget_type">
-          <type name="GObject.GType" c:type="GType"/>
-        </parameter>
-        <parameter name="pspec">
-          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-        <parameter name="parser">
-          <type name="GtkRcPropertyParser" c:type="GtkRcPropertyParser"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="style_init_for_settings"
-              c:identifier="_gtk_style_init_for_settings">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="settings">
-          <type name="Settings" c:type="GtkSettings*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="style_shade" c:identifier="_gtk_style_shade">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="a">
-          <type name="GdkColor" c:type="GdkColor*"/>
-        </parameter>
-        <parameter name="b">
-          <type name="GdkColor" c:type="GdkColor*"/>
-        </parameter>
-        <parameter name="k">
-          <type name="double" c:type="gdouble"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="draw_string" c:identifier="gtk_draw_string">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="string">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="paint_string" c:identifier="gtk_paint_string">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </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="gchar*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="string">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="draw_insertion_cursor"
-              c:identifier="gtk_draw_insertion_cursor">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="drawable">
-          <type name="Gdk.Drawable" c:type="GdkDrawable*"/>
-        </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </parameter>
-        <parameter name="location">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
-        </parameter>
-        <parameter name="is_primary">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="direction">
-          <type name="TextDirection" c:type="GtkTextDirection"/>
-        </parameter>
-        <parameter name="draw_arrow">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="widget_get_cursor_gc"
-              c:identifier="_gtk_widget_get_cursor_gc">
-      <return-value>
-        <type name="Gdk.GC" c:type="GdkGC*"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="widget_get_cursor_color"
-              c:identifier="_gtk_widget_get_cursor_color">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="color">
-          <type name="GdkColor" c:type="GdkColor*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkRcContext" c:type="GtkRcContext"/>
-    <function name="rc_init" c:identifier="_gtk_rc_init">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="rc_parse_widget_class_path"
-              c:identifier="_gtk_rc_parse_widget_class_path">
-      <return-value>
-        <type name="GLib.GSList" c:type="GSList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="pattern">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_free_widget_class_path"
-              c:identifier="_gtk_rc_free_widget_class_path">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GLib.GSList" c:type="GSList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_match_widget_class"
-              c:identifier="_gtk_rc_match_widget_class">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GLib.GSList" c:type="GSList*"/>
-        </parameter>
-        <parameter name="length">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="path">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="path_reversed">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_add_default_file"
-              c:identifier="gtk_rc_add_default_file">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="filename">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_set_default_files"
-              c:identifier="gtk_rc_set_default_files">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="filenames">
-          <type name="GLib.gchar" c:type="gchar**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_get_default_files"
-              c:identifier="gtk_rc_get_default_files">
-      <return-value>
-        <type name="GLib.gchar" c:type="gchar**"/>
-      </return-value>
-    </function>
-    <function name="rc_get_style" c:identifier="gtk_rc_get_style">
-      <return-value>
-        <type name="Style" c:type="GtkStyle*"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_get_style_by_paths"
-              c:identifier="gtk_rc_get_style_by_paths">
-      <return-value>
-        <type name="Style" c:type="GtkStyle*"/>
-      </return-value>
-      <parameters>
-        <parameter name="settings">
-          <type name="Settings" c:type="GtkSettings*"/>
-        </parameter>
-        <parameter name="widget_path" allow-none="1">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="class_path" allow-none="1">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="type">
-          <type name="GObject.GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_reparse_all_for_settings"
-              c:identifier="gtk_rc_reparse_all_for_settings">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="settings">
-          <type name="Settings" c:type="GtkSettings*"/>
-        </parameter>
-        <parameter name="force_load">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_reset_styles" c:identifier="gtk_rc_reset_styles">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="settings">
-          <type name="Settings" c:type="GtkSettings*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_find_pixmap_in_path"
-              c:identifier="gtk_rc_find_pixmap_in_path">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="settings">
-          <type name="Settings" c:type="GtkSettings*"/>
-        </parameter>
-        <parameter name="scanner">
-          <type name="GLib.GScanner" c:type="GScanner*"/>
-        </parameter>
-        <parameter name="pixmap_file">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_parse" c:identifier="gtk_rc_parse">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="filename">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_parse_string" c:identifier="gtk_rc_parse_string">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="rc_string">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_reparse_all" c:identifier="gtk_rc_reparse_all">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-    </function>
-    <function name="rc_add_widget_name_style"
-              c:identifier="gtk_rc_add_widget_name_style">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="rc_style">
-          <type name="RcStyle" c:type="GtkRcStyle*"/>
-        </parameter>
-        <parameter name="pattern">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_add_widget_class_style"
-              c:identifier="gtk_rc_add_widget_class_style">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="rc_style">
-          <type name="RcStyle" c:type="GtkRcStyle*"/>
-        </parameter>
-        <parameter name="pattern">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_add_class_style" c:identifier="gtk_rc_add_class_style">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="rc_style">
-          <type name="RcStyle" c:type="GtkRcStyle*"/>
-        </parameter>
-        <parameter name="pattern">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="RcStyle"
-           c:type="GtkRcStyle"
-           parent="GObject.Object"
-           glib:type-name="GtkRcStyle"
-           glib:get-type="gtk_rc_style_get_type">
-      <constructor name="new" c:identifier="gtk_rc_style_new">
+      <method name="realize" c:identifier="gtk_widget_realize">
         <return-value>
-          <type name="RcStyle" c:type="GtkRcStyle*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </constructor>
-      <constructor name="copy" c:identifier="gtk_rc_style_copy">
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unrealize" c:identifier="gtk_widget_unrealize">
         <return-value>
-          <type name="RcStyle" c:type="GtkRcStyle*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="orig">
-            <type name="RcStyle" c:type="GtkRcStyle*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="ref" c:identifier="gtk_rc_style_ref">
+      </method>
+      <method name="queue_draw" c:identifier="gtk_widget_queue_draw">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="rc_style">
-            <type name="RcStyle" c:type="GtkRcStyle*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unref" c:identifier="gtk_rc_style_unref">
+      <method name="queue_draw_area" c:identifier="gtk_widget_queue_draw_area">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="rc_style">
-            <type name="RcStyle" c:type="GtkRcStyle*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="width">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="height">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <callback name="create_rc_style">
+      <method name="queue_clear" c:identifier="gtk_widget_queue_clear">
         <return-value>
-          <type name="RcStyle" c:type="GtkRcStyle*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="rc_style">
-            <type name="RcStyle" c:type="GtkRcStyle*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="parse">
+      </method>
+      <method name="queue_clear_area"
+              c:identifier="gtk_widget_queue_clear_area">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="rc_style">
-            <type name="RcStyle" c:type="GtkRcStyle*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="settings">
-            <type name="Settings" c:type="GtkSettings*"/>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="scanner">
-            <type name="GLib.GScanner" c:type="GScanner*"/>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="width">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="height">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="merge">
+      </method>
+      <method name="queue_resize" c:identifier="gtk_widget_queue_resize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="dest">
-            <type name="RcStyle" c:type="GtkRcStyle*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="src">
-            <type name="RcStyle" c:type="GtkRcStyle*"/>
+        </parameters>
+      </method>
+      <method name="queue_resize_no_redraw"
+              c:identifier="gtk_widget_queue_resize_no_redraw">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="create_style">
+      </method>
+      <method name="draw" c:identifier="gtk_widget_draw">
         <return-value>
-          <type name="Style" c:type="GtkStyle*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="rc_style">
-            <type name="RcStyle" c:type="GtkRcStyle*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
+      </method>
+      <method name="size_request" c:identifier="gtk_widget_size_request">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="requisition">
+            <type name="Requisition" c:type="GtkRequisition*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="size_allocate" c:identifier="gtk_widget_size_allocate">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="allocation">
+            <type name="Allocation" c:type="GtkAllocation*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_child_requisition"
+              c:identifier="gtk_widget_get_child_requisition">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="requisition">
+            <type name="Requisition" c:type="GtkRequisition*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_accelerator" c:identifier="gtk_widget_add_accelerator">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-    </class>
-    <function name="rc_find_module_in_path"
-              c:identifier="gtk_rc_find_module_in_path">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="module_file">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_get_theme_dir" c:identifier="gtk_rc_get_theme_dir">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-    </function>
-    <function name="rc_get_module_dir" c:identifier="gtk_rc_get_module_dir">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-    </function>
-    <function name="rc_get_im_module_path"
-              c:identifier="gtk_rc_get_im_module_path">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-    </function>
-    <function name="rc_get_im_module_file"
-              c:identifier="gtk_rc_get_im_module_file">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-    </function>
-    <function name="rc_scanner_new" c:identifier="gtk_rc_scanner_new">
-      <return-value>
-        <type name="GLib.GScanner" c:type="GScanner*"/>
-      </return-value>
-    </function>
-    <function name="rc_parse_color" c:identifier="gtk_rc_parse_color">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="scanner">
-          <type name="GLib.GScanner" c:type="GScanner*"/>
-        </parameter>
-        <parameter name="color">
-          <type name="GdkColor" c:type="GdkColor*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_parse_color_full"
-              c:identifier="gtk_rc_parse_color_full">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="scanner">
-          <type name="GLib.GScanner" c:type="GScanner*"/>
-        </parameter>
-        <parameter name="style">
-          <type name="RcStyle" c:type="GtkRcStyle*"/>
-        </parameter>
-        <parameter name="color">
-          <type name="GdkColor" c:type="GdkColor*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_parse_state" c:identifier="gtk_rc_parse_state">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="scanner">
-          <type name="GLib.GScanner" c:type="GScanner*"/>
-        </parameter>
-        <parameter name="state">
-          <type name="StateType" c:type="GtkStateType*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_parse_priority" c:identifier="gtk_rc_parse_priority">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="scanner">
-          <type name="GLib.GScanner" c:type="GScanner*"/>
-        </parameter>
-        <parameter name="priority">
-          <type name="PathPriorityType" c:type="GtkPathPriorityType*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_style_lookup_rc_property"
-              c:identifier="_gtk_rc_style_lookup_rc_property">
-      <return-value>
-        <type name="GtkRcProperty" c:type="GtkRcProperty*"/>
-      </return-value>
-      <parameters>
-        <parameter name="rc_style">
-          <type name="RcStyle" c:type="GtkRcStyle*"/>
-        </parameter>
-        <parameter name="type_name">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
-        <parameter name="property_name">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_style_set_rc_property"
-              c:identifier="_gtk_rc_style_set_rc_property">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="rc_style">
-          <type name="RcStyle" c:type="GtkRcStyle*"/>
-        </parameter>
-        <parameter name="property">
-          <type name="GtkRcProperty" c:type="GtkRcProperty*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_style_unset_rc_property"
-              c:identifier="_gtk_rc_style_unset_rc_property">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="rc_style">
-          <type name="RcStyle" c:type="GtkRcStyle*"/>
-        </parameter>
-        <parameter name="type_name">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
-        <parameter name="property_name">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_style_get_color_hashes"
-              c:identifier="_gtk_rc_style_get_color_hashes">
-      <return-value>
-        <type name="GLib.GSList" c:type="GSList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="rc_style">
-          <type name="RcStyle" c:type="GtkRcStyle*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_context_get_default_font_name"
-              c:identifier="_gtk_rc_context_get_default_font_name">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="settings">
-          <type name="Settings" c:type="GtkSettings*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_context_destroy" c:identifier="_gtk_rc_context_destroy">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="settings">
-          <type name="Settings" c:type="GtkSettings*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkSettingsValue" c:type="GtkSettingsValue">
-      <field name="origin">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="value">
-        <type name="GObject.GValue" c:type="GValue"/>
-      </field>
-    </record>
-    <record name="GtkSettingsPropertyValue" c:type="GtkSettingsPropertyValue"/>
-    <class name="Settings"
-           c:type="GtkSettings"
-           parent="GObject.Object"
-           glib:type-name="GtkSettings"
-           glib:get-type="gtk_settings_get_type">
-      <constructor name="get_default" c:identifier="gtk_settings_get_default">
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="accel_signal">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="accel_group">
+            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+          </parameter>
+          <parameter name="accel_key">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="accel_mods">
+            <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+          </parameter>
+          <parameter name="accel_flags">
+            <type name="AccelFlags" c:type="GtkAccelFlags"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_accelerator"
+              c:identifier="gtk_widget_remove_accelerator">
         <return-value>
-          <type name="Settings" c:type="GtkSettings*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </constructor>
-      <constructor name="get_for_screen"
-                   c:identifier="gtk_settings_get_for_screen">
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="accel_group">
+            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+          </parameter>
+          <parameter name="accel_key">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="accel_mods">
+            <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_accel_path" c:identifier="gtk_widget_set_accel_path">
         <return-value>
-          <type name="Settings" c:type="GtkSettings*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="accel_path" allow-none="1">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="accel_group" allow-none="1">
+            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="set_property_value"
-              c:identifier="gtk_settings_set_property_value">
+      </method>
+      <method name="list_accel_closures"
+              c:identifier="gtk_widget_list_accel_closures">
+        <return-value>
+          <type name="GLib.List" c:type="GList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="can_activate_accel"
+              c:identifier="gtk_widget_can_activate_accel">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="signal_id">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="mnemonic_activate"
+              c:identifier="gtk_widget_mnemonic_activate">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="group_cycling">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="event" c:identifier="gtk_widget_event">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.Event" c:type="GdkEvent*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="send_expose" c:identifier="gtk_widget_send_expose">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.Event" c:type="GdkEvent*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="activate" c:identifier="gtk_widget_activate">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_scroll_adjustments"
+              c:identifier="gtk_widget_set_scroll_adjustments">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="hadjustment" allow-none="1">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+          <parameter name="vadjustment" allow-none="1">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="reparent" c:identifier="gtk_widget_reparent">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="Settings" c:type="GtkSettings*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="new_parent">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="svalue">
-            <type name="GtkSettingsValue" c:type="GtkSettingsValue*"/>
+        </parameters>
+      </method>
+      <method name="intersect" c:identifier="gtk_widget_intersect">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="intersection">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_string_property"
-              c:identifier="gtk_settings_set_string_property">
+      <method name="region_intersect"
+              c:identifier="gtk_widget_region_intersect">
+        <return-value>
+          <type name="Gdk.Region" c:type="GdkRegion*"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="region">
+            <type name="Gdk.Region" c:type="GdkRegion*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="freeze_child_notify"
+              c:identifier="gtk_widget_freeze_child_notify">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="Settings" c:type="GtkSettings*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
+        </parameters>
+      </method>
+      <method name="child_notify" c:identifier="gtk_widget_child_notify">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="v_string">
+          <parameter name="child_property">
             <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="origin">
-            <type name="string" c:type="gchar*"/>
+        </parameters>
+      </method>
+      <method name="thaw_child_notify"
+              c:identifier="gtk_widget_thaw_child_notify">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_long_property"
-              c:identifier="gtk_settings_set_long_property">
+      <method name="is_focus" c:identifier="gtk_widget_is_focus">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="grab_focus" c:identifier="gtk_widget_grab_focus">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="Settings" c:type="GtkSettings*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="grab_default" c:identifier="gtk_widget_grab_default">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_name" c:identifier="gtk_widget_set_name">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="name">
             <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="v_long">
-            <type name="long" c:type="glong"/>
+        </parameters>
+      </method>
+      <method name="get_name" c:identifier="gtk_widget_get_name">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="origin">
-            <type name="string" c:type="gchar*"/>
+        </parameters>
+      </method>
+      <method name="set_state" c:identifier="gtk_widget_set_state">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="state">
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_double_property"
-              c:identifier="gtk_settings_set_double_property">
+      <method name="set_sensitive" c:identifier="gtk_widget_set_sensitive">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="Settings" c:type="GtkSettings*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="sensitive">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="v_double">
-            <type name="double" c:type="gdouble"/>
+        </parameters>
+      </method>
+      <method name="set_app_paintable"
+              c:identifier="gtk_widget_set_app_paintable">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="origin">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="app_paintable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <property name="gtk-double-click-time">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="gtk-double-click-distance">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="gtk-cursor-blink">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="gtk-cursor-blink-time">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="gtk-cursor-blink-timeout">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="gtk-split-cursor">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="gtk-theme-name">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="gtk-icon-theme-name">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="gtk-fallback-icon-theme">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="gtk-key-theme-name">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="gtk-menu-bar-accel">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="gtk-dnd-drag-threshold">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="gtk-font-name">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="gtk-icon-sizes">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="gtk-modules">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="gtk-xft-antialias">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="gtk-xft-hinting">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="gtk-xft-hintstyle">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="gtk-xft-rgba">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="gtk-xft-dpi">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="gtk-cursor-theme-name">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="gtk-cursor-theme-size">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="gtk-alternative-button-order">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="gtk-alternative-sort-arrows">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="gtk-show-input-method-menu">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="gtk-show-unicode-menu">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="gtk-timeout-initial">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="gtk-timeout-repeat">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="gtk-timeout-expand">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="gtk-color-scheme">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="gtk-enable-animations">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="gtk-touchscreen-mode">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="gtk-tooltip-timeout">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="gtk-tooltip-browse-timeout">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="gtk-tooltip-browse-mode-timeout">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="gtk-keynav-cursor-only">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="gtk-keynav-wrap-around">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="gtk-error-bell">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="color-hash">
-        <type name="GHashTable" c:type="GHashTable"/>
-      </property>
-      <property name="gtk-file-chooser-backend">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="gtk-print-backends">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="gtk-print-preview-command">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="gtk-enable-mnemonics">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="gtk-enable-accels">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="gtk-recent-files-limit">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="gtk-im-module">
-        <type name="string" c:type="gchararray"/>
-      </property>
-    </class>
-    <function name="settings_install_property"
-              c:identifier="gtk_settings_install_property">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="pspec">
-          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="settings_install_property_parser"
-              c:identifier="gtk_settings_install_property_parser">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="pspec">
-          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-        <parameter name="parser">
-          <type name="GtkRcPropertyParser" c:type="GtkRcPropertyParser"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_property_parse_color"
-              c:identifier="gtk_rc_property_parse_color">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="pspec">
-          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-        <parameter name="gstring">
-          <type name="GLib.GString" c:type="GString*"/>
-        </parameter>
-        <parameter name="property_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_property_parse_enum"
-              c:identifier="gtk_rc_property_parse_enum">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="pspec">
-          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-        <parameter name="gstring">
-          <type name="GLib.GString" c:type="GString*"/>
-        </parameter>
-        <parameter name="property_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_property_parse_flags"
-              c:identifier="gtk_rc_property_parse_flags">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="pspec">
-          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-        <parameter name="gstring">
-          <type name="GLib.GString" c:type="GString*"/>
-        </parameter>
-        <parameter name="property_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_property_parse_requisition"
-              c:identifier="gtk_rc_property_parse_requisition">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="pspec">
-          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-        <parameter name="gstring">
-          <type name="GLib.GString" c:type="GString*"/>
-        </parameter>
-        <parameter name="property_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_property_parse_border"
-              c:identifier="gtk_rc_property_parse_border">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="pspec">
-          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-        <parameter name="gstring">
-          <type name="GLib.GString" c:type="GString*"/>
-        </parameter>
-        <parameter name="property_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="settings_set_property_value_from_rc"
-              c:identifier="_gtk_settings_set_property_value_from_rc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="settings">
-          <type name="Settings" c:type="GtkSettings*"/>
-        </parameter>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="svalue">
-          <type name="GtkSettingsValue" c:type="GtkSettingsValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="settings_reset_rc_values"
-              c:identifier="_gtk_settings_reset_rc_values">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="settings">
-          <type name="Settings" c:type="GtkSettings*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="settings_handle_event"
-              c:identifier="_gtk_settings_handle_event">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="event">
-          <type name="Gdk.GdkEventSetting" c:type="GdkEventSetting*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="rc_property_parser_from_type"
-              c:identifier="_gtk_rc_property_parser_from_type">
-      <return-value>
-        <type name="GtkRcPropertyParser" c:type="GtkRcPropertyParser"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="GObject.GType" c:type="GType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="settings_parse_convert"
-              c:identifier="_gtk_settings_parse_convert">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="parser">
-          <type name="GtkRcPropertyParser" c:type="GtkRcPropertyParser"/>
-        </parameter>
-        <parameter name="src_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="pspec">
-          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-        <parameter name="dest_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkWidgetAuxInfo" c:type="GtkWidgetAuxInfo">
-      <field name="x">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="y">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="width">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="height">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="x_set">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="y_set">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GtkWidgetShapeInfo" c:type="GtkWidgetShapeInfo">
-      <field name="offset_x">
-        <type name="int16" c:type="gint16"/>
-      </field>
-      <field name="offset_y">
-        <type name="int16" c:type="gint16"/>
-      </field>
-      <field name="shape_mask">
-        <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-      </field>
-    </record>
-    <callback name="GtkCallback">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <class name="Widget"
-           c:type="GtkWidget"
-           parent="GtkObject"
-           glib:type-name="GtkWidget"
-           glib:get-type="gtk_widget_get_type">
-      <constructor name="new" c:identifier="gtk_widget_new">
+      <method name="set_double_buffered"
+              c:identifier="gtk_widget_set_double_buffered">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="type">
-            <type name="GObject.GType" c:type="GType"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="first_property_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="double_buffered">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="ref" c:identifier="gtk_widget_ref">
+      </method>
+      <method name="set_redraw_on_allocate"
+              c:identifier="gtk_widget_set_redraw_on_allocate">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="redraw_on_allocate">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
         </parameters>
-      </constructor>
-      <constructor name="get_parent" c:identifier="gtk_widget_get_parent">
+      </method>
+      <method name="set_parent" c:identifier="gtk_widget_set_parent">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="parent">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
         </parameters>
-      </constructor>
-      <constructor name="get_toplevel" c:identifier="gtk_widget_get_toplevel">
+      </method>
+      <method name="set_parent_window"
+              c:identifier="gtk_widget_set_parent_window">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="parent_window">
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
+          </parameter>
         </parameters>
-      </constructor>
-      <constructor name="get_ancestor" c:identifier="gtk_widget_get_ancestor">
+      </method>
+      <method name="set_child_visible"
+              c:identifier="gtk_widget_set_child_visible">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="widget_type">
-            <type name="GObject.GType" c:type="GType"/>
+          <parameter name="is_visible">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="destroy" c:identifier="gtk_widget_destroy">
+      </method>
+      <method name="get_child_visible"
+              c:identifier="gtk_widget_get_child_visible">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7822,43 +6664,44 @@
           </parameter>
         </parameters>
       </method>
-      <method name="destroyed" c:identifier="gtk_widget_destroyed">
+      <method name="get_parent_window"
+              c:identifier="gtk_widget_get_parent_window">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="widget_pointer">
-            <type name="Widget" c:type="GtkWidget**"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="unref" c:identifier="gtk_widget_unref">
+      <method name="child_focus" c:identifier="gtk_widget_child_focus">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="direction">
+            <type name="DirectionType" c:type="GtkDirectionType"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="set" c:identifier="gtk_widget_set">
+      <method name="keynav_failed" c:identifier="gtk_widget_keynav_failed">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </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 name="direction">
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unparent" c:identifier="gtk_widget_unparent">
+      <method name="error_bell" c:identifier="gtk_widget_error_bell">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7868,7 +6711,8 @@
           </parameter>
         </parameters>
       </method>
-      <method name="show" c:identifier="gtk_widget_show">
+      <method name="set_size_request"
+              c:identifier="gtk_widget_set_size_request">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7876,9 +6720,16 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="width">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="height">
+            <type name="int" c:type="gint"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="show_now" c:identifier="gtk_widget_show_now">
+      <method name="get_size_request"
+              c:identifier="gtk_widget_get_size_request">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7886,9 +6737,15 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="width" direction="out">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="height" direction="out">
+            <type name="int" c:type="gint*"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="hide" c:identifier="gtk_widget_hide">
+      <method name="set_uposition" c:identifier="gtk_widget_set_uposition">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7896,9 +6753,15 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="show_all" c:identifier="gtk_widget_show_all">
+      <method name="set_usize" c:identifier="gtk_widget_set_usize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7906,9 +6769,15 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="width">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="height">
+            <type name="int" c:type="gint"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="hide_all" c:identifier="gtk_widget_hide_all">
+      <method name="set_events" c:identifier="gtk_widget_set_events">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7916,9 +6785,12 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="events">
+            <type name="int" c:type="gint"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="set_no_show_all" c:identifier="gtk_widget_set_no_show_all">
+      <method name="add_events" c:identifier="gtk_widget_add_events">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7926,24 +6798,29 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="no_show_all">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="events">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_no_show_all" c:identifier="gtk_widget_get_no_show_all">
+      <method name="set_extension_events"
+              c:identifier="gtk_widget_set_extension_events">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="mode">
+            <type name="Gdk.ExtensionMode" c:type="GdkExtensionMode"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="map" c:identifier="gtk_widget_map">
+      <method name="get_extension_events"
+              c:identifier="gtk_widget_get_extension_events">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Gdk.ExtensionMode" c:type="GdkExtensionMode"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7951,9 +6828,9 @@
           </parameter>
         </parameters>
       </method>
-      <method name="unmap" c:identifier="gtk_widget_unmap">
+      <method name="get_colormap" c:identifier="gtk_widget_get_colormap">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7961,9 +6838,9 @@
           </parameter>
         </parameters>
       </method>
-      <method name="realize" c:identifier="gtk_widget_realize">
+      <method name="get_visual" c:identifier="gtk_widget_get_visual">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Gdk.Visual" c:type="GdkVisual*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7971,9 +6848,9 @@
           </parameter>
         </parameters>
       </method>
-      <method name="unrealize" c:identifier="gtk_widget_unrealize">
+      <method name="get_screen" c:identifier="gtk_widget_get_screen">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Gdk.Screen" c:type="GdkScreen*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7981,9 +6858,9 @@
           </parameter>
         </parameters>
       </method>
-      <method name="queue_draw" c:identifier="gtk_widget_queue_draw">
+      <method name="has_screen" c:identifier="gtk_widget_has_screen">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7991,31 +6868,19 @@
           </parameter>
         </parameters>
       </method>
-      <method name="queue_draw_area" c:identifier="gtk_widget_queue_draw_area">
+      <method name="get_display" c:identifier="gtk_widget_get_display">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Gdk.Display" c:type="GdkDisplay*"/>
         </return-value>
         <parameters>
           <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>
-          <parameter name="width">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="height">
-            <type name="int32" c:type="gint"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="queue_clear" c:identifier="gtk_widget_queue_clear">
+      <method name="get_root_window" c:identifier="gtk_widget_get_root_window">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8023,43 +6888,32 @@
           </parameter>
         </parameters>
       </method>
-      <method name="queue_clear_area"
-              c:identifier="gtk_widget_queue_clear_area">
+      <method name="get_settings" c:identifier="gtk_widget_get_settings">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Settings" c:type="GtkSettings*"/>
         </return-value>
         <parameters>
           <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>
-          <parameter name="width">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="height">
-            <type name="int32" c:type="gint"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="queue_resize" c:identifier="gtk_widget_queue_resize">
+      <method name="get_clipboard" c:identifier="gtk_widget_get_clipboard">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Clipboard" c:type="GtkClipboard*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="selection">
+            <type name="GdkAtom" c:type="GdkAtom"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="queue_resize_no_redraw"
-              c:identifier="gtk_widget_queue_resize_no_redraw">
+      <method name="get_accessible" c:identifier="gtk_widget_get_accessible">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Atk.Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8067,7 +6921,7 @@
           </parameter>
         </parameters>
       </method>
-      <method name="draw" c:identifier="gtk_widget_draw">
+      <method name="set_colormap" c:identifier="gtk_widget_set_colormap">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8075,25 +6929,22 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="colormap">
+            <type name="Gdk.Colormap" c:type="GdkColormap*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="size_request" c:identifier="gtk_widget_size_request">
+      <method name="get_events" c:identifier="gtk_widget_get_events">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="requisition">
-            <type name="Requisition" c:type="GtkRequisition*"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="size_allocate" c:identifier="gtk_widget_size_allocate">
+      <method name="get_pointer" c:identifier="gtk_widget_get_pointer">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8101,52 +6952,54 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="allocation">
-            <type name="GtkAllocation" c:type="GtkAllocation*"/>
+          <parameter name="x">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_child_requisition"
-              c:identifier="gtk_widget_get_child_requisition">
+      <method name="is_ancestor" c:identifier="gtk_widget_is_ancestor">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="requisition">
-            <type name="Requisition" c:type="GtkRequisition*"/>
+          <parameter name="ancestor">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_accelerator" c:identifier="gtk_widget_add_accelerator">
+      <method name="translate_coordinates"
+              c:identifier="gtk_widget_translate_coordinates">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
+          <parameter name="src_widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="accel_signal">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="dest_widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="accel_group">
-            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+          <parameter name="src_x">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="accel_key">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="src_y">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="accel_mods">
-            <type name="GdkModifierType" c:type="GdkModifierType"/>
+          <parameter name="dest_x" direction="out">
+            <type name="int" c:type="gint*"/>
           </parameter>
-          <parameter name="accel_flags">
-            <type name="AccelFlags" c:type="GtkAccelFlags"/>
+          <parameter name="dest_y" direction="out">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_accelerator"
-              c:identifier="gtk_widget_remove_accelerator">
+      <method name="hide_on_delete" c:identifier="gtk_widget_hide_on_delete">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -8154,18 +7007,9 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="accel_group">
-            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
-          </parameter>
-          <parameter name="accel_key">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="accel_mods">
-            <type name="GdkModifierType" c:type="GdkModifierType"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="set_accel_path" c:identifier="gtk_widget_set_accel_path">
+      <method name="set_style" c:identifier="gtk_widget_set_style">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8173,18 +7017,14 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="accel_path" allow-none="1">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="accel_group" allow-none="1">
-            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+          <parameter name="style" allow-none="1">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="list_accel_closures"
-              c:identifier="gtk_widget_list_accel_closures">
+      <method name="ensure_style" c:identifier="gtk_widget_ensure_style">
         <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8192,88 +7032,89 @@
           </parameter>
         </parameters>
       </method>
-      <method name="can_activate_accel"
-              c:identifier="gtk_widget_can_activate_accel">
+      <method name="get_style" c:identifier="gtk_widget_get_style">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Style" c:type="GtkStyle*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="signal_id">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="mnemonic_activate"
-              c:identifier="gtk_widget_mnemonic_activate">
+      <method name="modify_style" c:identifier="gtk_widget_modify_style">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="group_cycling">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="style">
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="event" c:identifier="gtk_widget_event">
+      <method name="get_modifier_style"
+              c:identifier="gtk_widget_get_modifier_style">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="send_expose" c:identifier="gtk_widget_send_expose">
+      <method name="modify_fg" c:identifier="gtk_widget_modify_fg">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
+          <parameter name="state">
+            <type name="StateType" c:type="GtkStateType"/>
+          </parameter>
+          <parameter name="color" allow-none="1">
+            <type name="Gdk.Color" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="activate" c:identifier="gtk_widget_activate">
+      <method name="modify_bg" c:identifier="gtk_widget_modify_bg">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="state">
+            <type name="StateType" c:type="GtkStateType"/>
+          </parameter>
+          <parameter name="color" allow-none="1">
+            <type name="Gdk.Color" c:type="GdkColor*"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="set_scroll_adjustments"
-              c:identifier="gtk_widget_set_scroll_adjustments">
+      <method name="modify_text" c:identifier="gtk_widget_modify_text">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="hadjustment" allow-none="1">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="state">
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
-          <parameter name="vadjustment" allow-none="1">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="color" allow-none="1">
+            <type name="Gdk.Color" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="reparent" c:identifier="gtk_widget_reparent">
+      <method name="modify_base" c:identifier="gtk_widget_modify_base">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8281,45 +7122,47 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="new_parent">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="state">
+            <type name="StateType" c:type="GtkStateType"/>
+          </parameter>
+          <parameter name="color" allow-none="1">
+            <type name="Gdk.Color" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="intersect" c:identifier="gtk_widget_intersect">
+      <method name="modify_cursor" c:identifier="gtk_widget_modify_cursor">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="primary">
+            <type name="Gdk.Color" c:type="GdkColor*"/>
           </parameter>
-          <parameter name="intersection">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="secondary">
+            <type name="Gdk.Color" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="region_intersect"
-              c:identifier="gtk_widget_region_intersect">
+      <method name="modify_font" c:identifier="gtk_widget_modify_font">
         <return-value>
-          <type name="Gdk.GdkRegion" c:type="GdkRegion*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="region">
-            <type name="Gdk.GdkRegion" c:type="GdkRegion*"/>
+          <parameter name="font_desc" allow-none="1">
+            <type name="Pango.FontDescription" c:type="PangoFontDescription*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="freeze_child_notify"
-              c:identifier="gtk_widget_freeze_child_notify">
+      <method name="create_pango_context"
+              c:identifier="gtk_widget_create_pango_context">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Pango.Context" c:type="PangoContext*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8327,41 +7170,52 @@
           </parameter>
         </parameters>
       </method>
-      <method name="child_notify" c:identifier="gtk_widget_child_notify">
+      <method name="get_pango_context"
+              c:identifier="gtk_widget_get_pango_context">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Pango.Context" c:type="PangoContext*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="child_property">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="thaw_child_notify"
-              c:identifier="gtk_widget_thaw_child_notify">
+      <method name="create_pango_layout"
+              c:identifier="gtk_widget_create_pango_layout">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Pango.Layout" c:type="PangoLayout*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="is_focus" c:identifier="gtk_widget_is_focus">
+      <method name="render_icon" c:identifier="gtk_widget_render_icon">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="size">
+            <type name="IconSize" c:type="GtkIconSize"/>
+          </parameter>
+          <parameter name="detail" allow-none="1">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="grab_focus" c:identifier="gtk_widget_grab_focus">
+      <method name="set_composite_name"
+              c:identifier="gtk_widget_set_composite_name">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8369,11 +7223,15 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="grab_default" c:identifier="gtk_widget_grab_default">
+      <method name="get_composite_name"
+              c:identifier="gtk_widget_get_composite_name">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8381,7 +7239,7 @@
           </parameter>
         </parameters>
       </method>
-      <method name="set_name" c:identifier="gtk_widget_set_name">
+      <method name="reset_rc_styles" c:identifier="gtk_widget_reset_rc_styles">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8389,22 +7247,26 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="get_name" c:identifier="gtk_widget_get_name">
+      <method name="style_get_property"
+              c:identifier="gtk_widget_style_get_property">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="property_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="GObject.Value" c:type="GValue*"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="set_state" c:identifier="gtk_widget_set_state">
+      <method name="style_get" c:identifier="gtk_widget_style_get">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8412,12 +7274,12 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="state">
-            <type name="StateType" c:type="GtkStateType"/>
+          <parameter name="first_property_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_sensitive" c:identifier="gtk_widget_set_sensitive">
+      <method name="set_direction" c:identifier="gtk_widget_set_direction">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8425,41 +7287,33 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="sensitive">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="dir">
+            <type name="TextDirection" c:type="GtkTextDirection"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_app_paintable"
-              c:identifier="gtk_widget_set_app_paintable">
+      <method name="get_direction" c:identifier="gtk_widget_get_direction">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TextDirection" c:type="GtkTextDirection"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="app_paintable">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="set_double_buffered"
-              c:identifier="gtk_widget_set_double_buffered">
+      <method name="is_composited" c:identifier="gtk_widget_is_composited">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="double_buffered">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="set_redraw_on_allocate"
-              c:identifier="gtk_widget_set_redraw_on_allocate">
+      <method name="shape_combine_mask"
+              c:identifier="gtk_widget_shape_combine_mask">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8467,12 +7321,19 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="redraw_on_allocate">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="shape_mask">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
+          </parameter>
+          <parameter name="offset_x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="offset_y">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_parent" c:identifier="gtk_widget_set_parent">
+      <method name="input_shape_combine_mask"
+              c:identifier="gtk_widget_input_shape_combine_mask">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8480,13 +7341,18 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="parent">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="shape_mask" allow-none="1">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
+          </parameter>
+          <parameter name="offset_x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="offset_y">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_parent_window"
-              c:identifier="gtk_widget_set_parent_window">
+      <method name="reset_shapes" c:identifier="gtk_widget_reset_shapes">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8494,13 +7360,9 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="parent_window">
-            <type name="Gdk.Window" c:type="GdkWindow*"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="set_child_visible"
-              c:identifier="gtk_widget_set_child_visible">
+      <method name="path" c:identifier="gtk_widget_path">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8508,26 +7370,40 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="is_visible">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="path_length" direction="out">
+            <type name="uint" c:type="guint*"/>
+          </parameter>
+          <parameter name="path" direction="out">
+            <type name="GLib.char" c:type="gchar**"/>
+          </parameter>
+          <parameter name="path_reversed" direction="out">
+            <type name="GLib.char" c:type="gchar**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_child_visible"
-              c:identifier="gtk_widget_get_child_visible">
+      <method name="class_path" c:identifier="gtk_widget_class_path">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="path_length" direction="out">
+            <type name="uint" c:type="guint*"/>
+          </parameter>
+          <parameter name="path" direction="out">
+            <type name="GLib.char" c:type="gchar**"/>
+          </parameter>
+          <parameter name="path_reversed" direction="out">
+            <type name="GLib.char" c:type="gchar**"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="get_parent_window"
-              c:identifier="gtk_widget_get_parent_window">
+      <method name="list_mnemonic_labels"
+              c:identifier="gtk_widget_list_mnemonic_labels">
         <return-value>
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8535,33 +7411,36 @@
           </parameter>
         </parameters>
       </method>
-      <method name="child_focus" c:identifier="gtk_widget_child_focus">
+      <method name="add_mnemonic_label"
+              c:identifier="gtk_widget_add_mnemonic_label">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="direction">
-            <type name="DirectionType" c:type="GtkDirectionType"/>
+          <parameter name="label">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="keynav_failed" c:identifier="gtk_widget_keynav_failed">
+      <method name="remove_mnemonic_label"
+              c:identifier="gtk_widget_remove_mnemonic_label">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="direction">
-            <type name="DirectionType" c:type="GtkDirectionType"/>
+          <parameter name="label">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="error_bell" c:identifier="gtk_widget_error_bell">
+      <method name="set_tooltip_window"
+              c:identifier="gtk_widget_set_tooltip_window">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8569,27 +7448,24 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="custom_window">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="set_size_request"
-              c:identifier="gtk_widget_set_size_request">
+      <method name="get_tooltip_window"
+              c:identifier="gtk_widget_get_tooltip_window">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Window" c:type="GtkWindow*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="width">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="height">
-            <type name="int32" c:type="gint"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="get_size_request"
-              c:identifier="gtk_widget_get_size_request">
+      <method name="trigger_tooltip_query"
+              c:identifier="gtk_widget_trigger_tooltip_query">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8597,15 +7473,10 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="width" direction="out">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="height" direction="out">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="set_uposition" c:identifier="gtk_widget_set_uposition">
+      <method name="set_tooltip_text"
+              c:identifier="gtk_widget_set_tooltip_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8613,31 +7484,24 @@
           <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="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_usize" c:identifier="gtk_widget_set_usize">
+      <method name="get_tooltip_text"
+              c:identifier="gtk_widget_get_tooltip_text">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="width">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="height">
-            <type name="int32" c:type="gint"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="set_events" c:identifier="gtk_widget_set_events">
+      <method name="set_tooltip_markup"
+              c:identifier="gtk_widget_set_tooltip_markup">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8645,26 +7509,23 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="events">
-            <type name="int32" c:type="gint"/>
+          <parameter name="markup">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_events" c:identifier="gtk_widget_add_events">
+      <method name="get_tooltip_markup"
+              c:identifier="gtk_widget_get_tooltip_markup">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="events">
-            <type name="int32" c:type="gint"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="set_extension_events"
-              c:identifier="gtk_widget_set_extension_events">
+      <method name="set_has_tooltip" c:identifier="gtk_widget_set_has_tooltip">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8672,15 +7533,14 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="mode">
-            <type name="GdkExtensionMode" c:type="GdkExtensionMode"/>
+          <parameter name="has_tooltip">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_extension_events"
-              c:identifier="gtk_widget_get_extension_events">
+      <method name="get_has_tooltip" c:identifier="gtk_widget_get_has_tooltip">
         <return-value>
-          <type name="GdkExtensionMode" c:type="GdkExtensionMode"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8688,9 +7548,9 @@
           </parameter>
         </parameters>
       </method>
-      <method name="get_colormap" c:identifier="gtk_widget_get_colormap">
+      <method name="get_action" c:identifier="gtk_widget_get_action">
         <return-value>
-          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
+          <type name="Action" c:type="GtkAction*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -8698,90 +7558,163 @@
           </parameter>
         </parameters>
       </method>
-      <method name="get_visual" c:identifier="gtk_widget_get_visual">
+      <property name="name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="parent">
+        <type name="Container" c:type="GtkContainer"/>
+      </property>
+      <property name="width-request">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="height-request">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="visible">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="sensitive">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="app-paintable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="can-focus">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="has-focus">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="is-focus">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="can-default">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="has-default">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="receives-default">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="composite-child">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="style">
+        <type name="Style" c:type="GtkStyle"/>
+      </property>
+      <property name="events">
+        <type name="Gdk.EventMask" c:type="GdkEventMask"/>
+      </property>
+      <property name="extension-events">
+        <type name="Gdk.ExtensionMode" c:type="GdkExtensionMode"/>
+      </property>
+      <property name="no-show-all">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="has-tooltip">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="tooltip-markup">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="tooltip-text">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <field name="activate_signal">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="set_scroll_adjustments_signal">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <callback name="dispatch_child_properties_changed"
+                c:type="dispatch_child_properties_changed">
         <return-value>
-          <type name="Gdk.Visual" c:type="GdkVisual*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="n_pspecs">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="pspecs">
+            <type name="GObject.ParamSpec" c:type="GParamSpec**"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="get_screen" c:identifier="gtk_widget_get_screen">
+      </callback>
+      <callback name="show" c:type="show">
         <return-value>
-          <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="has_screen" c:identifier="gtk_widget_has_screen">
+      </callback>
+      <callback name="show_all" c:type="show_all">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_display" c:identifier="gtk_widget_get_display">
+      </callback>
+      <callback name="hide" c:type="hide">
         <return-value>
-          <type name="Gdk.Display" c:type="GdkDisplay*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_root_window" c:identifier="gtk_widget_get_root_window">
+      </callback>
+      <callback name="hide_all" c:type="hide_all">
         <return-value>
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_settings" c:identifier="gtk_widget_get_settings">
+      </callback>
+      <callback name="map" c:type="map">
         <return-value>
-          <type name="Settings" c:type="GtkSettings*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_clipboard" c:identifier="gtk_widget_get_clipboard">
+      </callback>
+      <callback name="unmap" c:type="unmap">
         <return-value>
-          <type name="Clipboard" c:type="GtkClipboard*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="selection">
-            <type name="GdkAtom" c:type="GdkAtom"/>
-          </parameter>
         </parameters>
-      </method>
-      <method name="get_accessible" c:identifier="gtk_widget_get_accessible">
+      </callback>
+      <callback name="realize" c:type="realize">
         <return-value>
-          <type name="Atk.Object" c:type="AtkObject*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_colormap" c:identifier="gtk_widget_set_colormap">
+      </callback>
+      <callback name="unrealize" c:type="unrealize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8789,22 +7722,22 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="colormap">
-            <type name="Gdk.Colormap" c:type="GdkColormap*"/>
-          </parameter>
         </parameters>
-      </method>
-      <method name="get_events" c:identifier="gtk_widget_get_events">
+      </callback>
+      <callback name="size_request" c:type="size_request">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <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>
-      </method>
-      <method name="get_pointer" c:identifier="gtk_widget_get_pointer">
+      </callback>
+      <callback name="size_allocate" c:type="size_allocate">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8812,64 +7745,51 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="x">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="allocation">
+            <type name="Allocation" c:type="GtkAllocation*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="is_ancestor" c:identifier="gtk_widget_is_ancestor">
+      </callback>
+      <callback name="state_changed" c:type="state_changed">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="ancestor">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="previous_state">
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="translate_coordinates"
-              c:identifier="gtk_widget_translate_coordinates">
+      </callback>
+      <callback name="parent_set" c:type="parent_set">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="src_widget">
+          <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="dest_widget">
+          <parameter name="previous_parent">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="src_x">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="src_y">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="dest_x" direction="out">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="dest_y" direction="out">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
         </parameters>
-      </method>
-      <method name="hide_on_delete" c:identifier="gtk_widget_hide_on_delete">
+      </callback>
+      <callback name="hierarchy_changed" c:type="hierarchy_changed">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="previous_toplevel">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="set_style" c:identifier="gtk_widget_set_style">
+      </callback>
+      <callback name="style_set" c:type="style_set">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8877,12 +7797,12 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="style" allow-none="1">
+          <parameter name="previous_style">
             <type name="Style" c:type="GtkStyle*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="ensure_style" c:identifier="gtk_widget_ensure_style">
+      </callback>
+      <callback name="direction_changed" c:type="direction_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8890,19 +7810,25 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="previous_direction">
+            <type name="TextDirection" c:type="GtkTextDirection"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="get_style" c:identifier="gtk_widget_get_style">
+      </callback>
+      <callback name="grab_notify" c:type="grab_notify">
         <return-value>
-          <type name="Style" c:type="GtkStyle*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="was_grabbed">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="modify_style" c:identifier="gtk_widget_modify_style">
+      </callback>
+      <callback name="child_notify" c:type="child_notify">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8910,23 +7836,25 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="style">
-            <type name="RcStyle" c:type="GtkRcStyle*"/>
+          <parameter name="pspec">
+            <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_modifier_style"
-              c:identifier="gtk_widget_get_modifier_style">
+      </callback>
+      <callback name="mnemonic_activate" c:type="mnemonic_activate">
         <return-value>
-          <type name="RcStyle" c:type="GtkRcStyle*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="group_cycling">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="modify_fg" c:identifier="gtk_widget_modify_fg">
+      </callback>
+      <callback name="grab_focus" c:type="grab_focus">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8934,235 +7862,217 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="state">
-            <type name="StateType" c:type="GtkStateType"/>
-          </parameter>
-          <parameter name="color" allow-none="1">
-            <type name="GdkColor" c:type="GdkColor*"/>
-          </parameter>
         </parameters>
-      </method>
-      <method name="modify_bg" c:identifier="gtk_widget_modify_bg">
+      </callback>
+      <callback name="focus" c:type="focus">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="state">
-            <type name="StateType" c:type="GtkStateType"/>
-          </parameter>
-          <parameter name="color" allow-none="1">
-            <type name="GdkColor" c:type="GdkColor*"/>
+          <parameter name="direction">
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="modify_text" c:identifier="gtk_widget_modify_text">
+      </callback>
+      <callback name="event" c:type="event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="state">
-            <type name="StateType" c:type="GtkStateType"/>
-          </parameter>
-          <parameter name="color" allow-none="1">
-            <type name="GdkColor" c:type="GdkColor*"/>
+          <parameter name="event">
+            <type name="Gdk.Event" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="modify_base" c:identifier="gtk_widget_modify_base">
+      </callback>
+      <callback name="button_press_event" c:type="button_press_event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="state">
-            <type name="StateType" c:type="GtkStateType"/>
-          </parameter>
-          <parameter name="color" allow-none="1">
-            <type name="GdkColor" c:type="GdkColor*"/>
+          <parameter name="event">
+            <type name="Gdk.EventButton" c:type="GdkEventButton*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="modify_cursor" c:identifier="gtk_widget_modify_cursor">
+      </callback>
+      <callback name="button_release_event" c:type="button_release_event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="primary">
-            <type name="GdkColor" c:type="GdkColor*"/>
-          </parameter>
-          <parameter name="secondary">
-            <type name="GdkColor" c:type="GdkColor*"/>
+          <parameter name="event">
+            <type name="Gdk.EventButton" c:type="GdkEventButton*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="modify_font" c:identifier="gtk_widget_modify_font">
+      </callback>
+      <callback name="scroll_event" c:type="scroll_event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="font_desc" allow-none="1">
-            <type name="PangoFontDescription" c:type="PangoFontDescription*"/>
+          <parameter name="event">
+            <type name="Gdk.EventScroll" c:type="GdkEventScroll*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="create_pango_context"
-              c:identifier="gtk_widget_create_pango_context">
+      </callback>
+      <callback name="motion_notify_event" c:type="motion_notify_event">
         <return-value>
-          <type name="Pango.Context" c:type="PangoContext*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventMotion" c:type="GdkEventMotion*"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="get_pango_context"
-              c:identifier="gtk_widget_get_pango_context">
+      </callback>
+      <callback name="delete_event" c:type="delete_event">
         <return-value>
-          <type name="Pango.Context" c:type="PangoContext*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventAny" c:type="GdkEventAny*"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="create_pango_layout"
-              c:identifier="gtk_widget_create_pango_layout">
+      </callback>
+      <callback name="destroy_event" c:type="destroy_event">
         <return-value>
-          <type name="Pango.Layout" c:type="PangoLayout*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="event">
+            <type name="Gdk.EventAny" c:type="GdkEventAny*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="render_icon" c:identifier="gtk_widget_render_icon">
+      </callback>
+      <callback name="expose_event" c:type="expose_event">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="stock_id">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="size">
-            <type name="IconSize" c:type="GtkIconSize"/>
-          </parameter>
-          <parameter name="detail" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="event">
+            <type name="Gdk.EventExpose" c:type="GdkEventExpose*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_composite_name"
-              c:identifier="gtk_widget_set_composite_name">
+      </callback>
+      <callback name="key_press_event" c:type="key_press_event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="event">
+            <type name="Gdk.EventKey" c:type="GdkEventKey*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_composite_name"
-              c:identifier="gtk_widget_get_composite_name">
+      </callback>
+      <callback name="key_release_event" c:type="key_release_event">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventKey" c:type="GdkEventKey*"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="reset_rc_styles" c:identifier="gtk_widget_reset_rc_styles">
+      </callback>
+      <callback name="enter_notify_event" c:type="enter_notify_event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventCrossing" c:type="GdkEventCrossing*"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="style_get_property"
-              c:identifier="gtk_widget_style_get_property">
+      </callback>
+      <callback name="leave_notify_event" c:type="leave_notify_event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="property_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="GObject.GValue" c:type="GValue*"/>
+          <parameter name="event">
+            <type name="Gdk.EventCrossing" c:type="GdkEventCrossing*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="style_get" c:identifier="gtk_widget_style_get">
+      </callback>
+      <callback name="configure_event" c:type="configure_event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </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 name="event">
+            <type name="Gdk.EventConfigure" c:type="GdkEventConfigure*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_direction" c:identifier="gtk_widget_set_direction">
+      </callback>
+      <callback name="focus_in_event" c:type="focus_in_event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="dir">
-            <type name="TextDirection" c:type="GtkTextDirection"/>
+          <parameter name="event">
+            <type name="Gdk.EventFocus" c:type="GdkEventFocus*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_direction" c:identifier="gtk_widget_get_direction">
+      </callback>
+      <callback name="focus_out_event" c:type="focus_out_event">
         <return-value>
-          <type name="TextDirection" c:type="GtkTextDirection"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventFocus" c:type="GdkEventFocus*"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="is_composited" c:identifier="gtk_widget_is_composited">
+      </callback>
+      <callback name="map_event" c:type="map_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -9170,173 +8080,157 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventAny" c:type="GdkEventAny*"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="shape_combine_mask"
-              c:identifier="gtk_widget_shape_combine_mask">
+      </callback>
+      <callback name="unmap_event" c:type="unmap_event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="shape_mask">
-            <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-          </parameter>
-          <parameter name="offset_x">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="offset_y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="event">
+            <type name="Gdk.EventAny" c:type="GdkEventAny*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="input_shape_combine_mask"
-              c:identifier="gtk_widget_input_shape_combine_mask">
+      </callback>
+      <callback name="property_notify_event" c:type="property_notify_event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="shape_mask" allow-none="1">
-            <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-          </parameter>
-          <parameter name="offset_x">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="offset_y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="event">
+            <type name="Gdk.EventProperty" c:type="GdkEventProperty*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="reset_shapes" c:identifier="gtk_widget_reset_shapes">
+      </callback>
+      <callback name="selection_clear_event" c:type="selection_clear_event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventSelection" c:type="GdkEventSelection*"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="path" c:identifier="gtk_widget_path">
+      </callback>
+      <callback name="selection_request_event"
+                c:type="selection_request_event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="path_length" direction="out">
-            <type name="GLib.guint" c:type="guint*"/>
-          </parameter>
-          <parameter name="path" direction="out">
-            <type name="GLib.gchar" c:type="gchar**"/>
-          </parameter>
-          <parameter name="path_reversed" direction="out">
-            <type name="GLib.gchar" c:type="gchar**"/>
+          <parameter name="event">
+            <type name="Gdk.EventSelection" c:type="GdkEventSelection*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="class_path" c:identifier="gtk_widget_class_path">
+      </callback>
+      <callback name="selection_notify_event" c:type="selection_notify_event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="path_length" direction="out">
-            <type name="GLib.guint" c:type="guint*"/>
-          </parameter>
-          <parameter name="path" direction="out">
-            <type name="GLib.gchar" c:type="gchar**"/>
-          </parameter>
-          <parameter name="path_reversed" direction="out">
-            <type name="GLib.gchar" c:type="gchar**"/>
+          <parameter name="event">
+            <type name="Gdk.EventSelection" c:type="GdkEventSelection*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="list_mnemonic_labels"
-              c:identifier="gtk_widget_list_mnemonic_labels">
+      </callback>
+      <callback name="proximity_in_event" c:type="proximity_in_event">
         <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventProximity" c:type="GdkEventProximity*"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="add_mnemonic_label"
-              c:identifier="gtk_widget_add_mnemonic_label">
+      </callback>
+      <callback name="proximity_out_event" c:type="proximity_out_event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="label">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="event">
+            <type name="Gdk.EventProximity" c:type="GdkEventProximity*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="remove_mnemonic_label"
-              c:identifier="gtk_widget_remove_mnemonic_label">
+      </callback>
+      <callback name="visibility_notify_event"
+                c:type="visibility_notify_event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="label">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="event">
+            <type name="Gdk.EventVisibility" c:type="GdkEventVisibility*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_tooltip_window"
-              c:identifier="gtk_widget_set_tooltip_window">
+      </callback>
+      <callback name="client_event" c:type="client_event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="custom_window">
-            <type name="Window" c:type="GtkWindow*"/>
+          <parameter name="event">
+            <type name="Gdk.EventClient" c:type="GdkEventClient*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_tooltip_window"
-              c:identifier="gtk_widget_get_tooltip_window">
+      </callback>
+      <callback name="no_expose_event" c:type="no_expose_event">
         <return-value>
-          <type name="Window" c:type="GtkWindow*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventAny" c:type="GdkEventAny*"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="trigger_tooltip_query"
-              c:identifier="gtk_widget_trigger_tooltip_query">
+      </callback>
+      <callback name="window_state_event" c:type="window_state_event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventWindowState" c:type="GdkEventWindowState*"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="set_tooltip_text"
-              c:identifier="gtk_widget_set_tooltip_text">
+      </callback>
+      <callback name="selection_get" c:type="selection_get">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -9344,24 +8238,18 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="selection_data">
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_tooltip_text"
-              c:identifier="gtk_widget_get_tooltip_text">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="info">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="time_">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_tooltip_markup"
-              c:identifier="gtk_widget_set_tooltip_markup">
+      </callback>
+      <callback name="selection_received" c:type="selection_received">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -9369,23 +8257,15 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="markup">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="selection_data">
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_tooltip_markup"
-              c:identifier="gtk_widget_get_tooltip_markup">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="time_">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_has_tooltip" c:identifier="gtk_widget_set_has_tooltip">
+      </callback>
+      <callback name="drag_begin" c:type="drag_begin">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -9393,101 +8273,25 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="has_tooltip">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="context">
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_has_tooltip" c:identifier="gtk_widget_get_has_tooltip">
+      </callback>
+      <callback name="drag_end" c:type="drag_end">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_action" c:identifier="gtk_widget_get_action">
-        <return-value>
-          <type name="Action" c:type="GtkAction*"/>
-        </return-value>
-        <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="context">
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="name">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="parent">
-        <type name="Container" c:type="GtkContainer"/>
-      </property>
-      <property name="width-request">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="height-request">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="visible">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="sensitive">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="app-paintable">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="can-focus">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="has-focus">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="is-focus">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="can-default">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="has-default">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="receives-default">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="composite-child">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="style">
-        <type name="Style" c:type="GtkStyle"/>
-      </property>
-      <property name="events">
-        <type name="GdkEventMask" c:type="GdkEventMask"/>
-      </property>
-      <property name="extension-events">
-        <type name="GdkExtensionMode" c:type="GdkExtensionMode"/>
-      </property>
-      <property name="no-show-all">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="has-tooltip">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="tooltip-markup">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="tooltip-text">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <field name="activate_signal">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="set_scroll_adjustments_signal">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <callback name="dispatch_child_properties_changed">
+      </callback>
+      <callback name="drag_data_get" c:type="drag_data_get">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -9495,15 +8299,21 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="n_pspecs">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="context">
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
           </parameter>
-          <parameter name="pspecs">
-            <type name="GObject.GParamSpec" c:type="GParamSpec**"/>
+          <parameter name="selection_data">
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
+          </parameter>
+          <parameter name="info">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="time_">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="show">
+      <callback name="drag_data_delete" c:type="drag_data_delete">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -9511,9 +8321,12 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="context">
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+          </parameter>
         </parameters>
       </callback>
-      <callback name="show_all">
+      <callback name="drag_leave" c:type="drag_leave">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -9521,29 +8334,59 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="context">
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+          </parameter>
+          <parameter name="time_">
+            <type name="uint" c:type="guint"/>
+          </parameter>
         </parameters>
       </callback>
-      <callback name="hide">
+      <callback name="drag_motion" c:type="drag_motion">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="context">
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="time_">
+            <type name="uint" c:type="guint"/>
+          </parameter>
         </parameters>
       </callback>
-      <callback name="hide_all">
+      <callback name="drag_drop" c:type="drag_drop">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="context">
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="time_">
+            <type name="uint" c:type="guint"/>
+          </parameter>
         </parameters>
       </callback>
-      <callback name="map">
+      <callback name="drag_data_received" c:type="drag_data_received">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -9551,11 +8394,29 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="context">
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="selection_data">
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
+          </parameter>
+          <parameter name="info">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="time_">
+            <type name="uint" c:type="guint"/>
+          </parameter>
         </parameters>
       </callback>
-      <callback name="unmap">
+      <callback name="popup_menu" c:type="popup_menu">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9563,19 +8424,22 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="realize">
+      <callback name="show_help" c:type="show_help">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="help_type">
+            <type name="WidgetHelpType" c:type="GtkWidgetHelpType"/>
+          </parameter>
         </parameters>
       </callback>
-      <callback name="unrealize">
+      <callback name="get_accessible" c:type="get_accessible">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Atk.Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -9583,7 +8447,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="size_request">
+      <callback name="screen_changed" c:type="screen_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -9591,38 +8455,38 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="requisition">
-            <type name="Requisition" c:type="GtkRequisition*"/>
+          <parameter name="previous_screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="size_allocate">
+      <callback name="can_activate_accel" c:type="can_activate_accel">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="allocation">
-            <type name="GtkAllocation" c:type="GtkAllocation*"/>
+          <parameter name="signal_id">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="state_changed">
+      <callback name="grab_broken_event" c:type="grab_broken_event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="previous_state">
-            <type name="StateType" c:type="GtkStateType"/>
+          <parameter name="event">
+            <type name="Gdk.EventGrabBroken" c:type="GdkEventGrabBroken*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="parent_set">
+      <callback name="composited_changed" c:type="composited_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -9630,15595 +8494,12520 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="previous_parent">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
         </parameters>
       </callback>
-      <callback name="hierarchy_changed">
+      <callback name="query_tooltip" c:type="query_tooltip">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="previous_toplevel">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="keyboard_tooltip">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="style_set">
+      <callback name="gtk_reserved5" c:type="_gtk_reserved5">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="previous_style">
-            <type name="Style" c:type="GtkStyle*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="direction_changed">
+      <callback name="gtk_reserved6" c:type="_gtk_reserved6">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="previous_direction">
-            <type name="TextDirection" c:type="GtkTextDirection"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="grab_notify">
+      <callback name="gtk_reserved7" c:type="_gtk_reserved7">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="was_grabbed">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="child_notify">
+      <glib:signal name="realize">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="unrealize">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="show">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="hide">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="map">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="unmap">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="size-request">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="pspec">
-            <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
+          <parameter name="object">
+            <type name="Requisition" c:type="GtkRequisition"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="mnemonic_activate">
+      </glib:signal>
+      <glib:signal name="size-allocate">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="group_cycling">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="object">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="grab_focus">
+      </glib:signal>
+      <glib:signal name="state-changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="object">
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="focus">
+      </glib:signal>
+      <glib:signal name="parent-set">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="direction">
-            <type name="DirectionType" c:type="GtkDirectionType"/>
+          <parameter name="object">
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="event">
+      </glib:signal>
+      <glib:signal name="hierarchy-changed">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
+          <parameter name="object">
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="button_press_event">
+      </glib:signal>
+      <glib:signal name="style-set">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="object">
+            <type name="Style" c:type="GtkStyle"/>
           </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventButton" c:type="GdkEventButton*"/>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="direction-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="TextDirection" c:type="GtkTextDirection"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="button_release_event">
+      </glib:signal>
+      <glib:signal name="grab-notify">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="object">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventButton" c:type="GdkEventButton*"/>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="child-notify">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GParam" c:type="GParam"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="scroll_event">
+      </glib:signal>
+      <glib:signal name="mnemonic-activate">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventScroll" c:type="GdkEventScroll*"/>
+          <parameter name="object">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="motion_notify_event">
+      </glib:signal>
+      <glib:signal name="grab-focus">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="focus">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="object">
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventMotion" c:type="GdkEventMotion*"/>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="move-focus">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="delete_event">
+      </glib:signal>
+      <glib:signal name="event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventAny" c:type="GdkEventAny*"/>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="event-after">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="destroy_event">
+      </glib:signal>
+      <glib:signal name="button-press-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventAny" c:type="GdkEventAny*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="expose_event">
+      </glib:signal>
+      <glib:signal name="button-release-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventExpose" c:type="GdkEventExpose*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="key_press_event">
+      </glib:signal>
+      <glib:signal name="scroll-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventKey" c:type="GdkEventKey*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="key_release_event">
+      </glib:signal>
+      <glib:signal name="motion-notify-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventKey" c:type="GdkEventKey*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="enter_notify_event">
+      </glib:signal>
+      <glib:signal name="composited-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="keynav-failed">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventCrossing" c:type="GdkEventCrossing*"/>
+          <parameter name="object">
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="leave_notify_event">
+      </glib:signal>
+      <glib:signal name="delete-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventCrossing" c:type="GdkEventCrossing*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="configure_event">
+      </glib:signal>
+      <glib:signal name="destroy-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventConfigure" c:type="GdkEventConfigure*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="focus_in_event">
+      </glib:signal>
+      <glib:signal name="expose-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventFocus" c:type="GdkEventFocus*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="focus_out_event">
+      </glib:signal>
+      <glib:signal name="key-press-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventFocus" c:type="GdkEventFocus*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="map_event">
+      </glib:signal>
+      <glib:signal name="key-release-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventAny" c:type="GdkEventAny*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="unmap_event">
+      </glib:signal>
+      <glib:signal name="enter-notify-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventAny" c:type="GdkEventAny*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="property_notify_event">
+      </glib:signal>
+      <glib:signal name="leave-notify-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventProperty" c:type="GdkEventProperty*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="selection_clear_event">
+      </glib:signal>
+      <glib:signal name="configure-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventSelection" c:type="GdkEventSelection*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="selection_request_event">
+      </glib:signal>
+      <glib:signal name="focus-in-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventSelection" c:type="GdkEventSelection*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="selection_notify_event">
+      </glib:signal>
+      <glib:signal name="focus-out-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventSelection" c:type="GdkEventSelection*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="proximity_in_event">
+      </glib:signal>
+      <glib:signal name="map-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventProximity" c:type="GdkEventProximity*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="proximity_out_event">
+      </glib:signal>
+      <glib:signal name="unmap-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventProximity" c:type="GdkEventProximity*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="visibility_notify_event">
+      </glib:signal>
+      <glib:signal name="property-notify-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventVisibility" c:type="GdkEventVisibility*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="client_event">
+      </glib:signal>
+      <glib:signal name="selection-clear-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventClient" c:type="GdkEventClient*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="no_expose_event">
+      </glib:signal>
+      <glib:signal name="selection-request-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventAny" c:type="GdkEventAny*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="window_state_event">
+      </glib:signal>
+      <glib:signal name="selection-notify-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventWindowState"
-                  c:type="GdkEventWindowState*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="selection_get">
+      </glib:signal>
+      <glib:signal name="selection-received">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="selection_data">
-            <type name="SelectionData" c:type="GtkSelectionData*"/>
-          </parameter>
-          <parameter name="info">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="object">
+            <type name="SelectionData" c:type="GtkSelectionData"/>
           </parameter>
-          <parameter name="time_">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="p0">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="selection_received">
+      </glib:signal>
+      <glib:signal name="selection-get">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="object">
+            <type name="SelectionData" c:type="GtkSelectionData"/>
           </parameter>
-          <parameter name="selection_data">
-            <type name="SelectionData" c:type="GtkSelectionData*"/>
+          <parameter name="p0">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="time_">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="p1">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="drag_begin">
+      </glib:signal>
+      <glib:signal name="proximity-in-event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
-          <parameter name="context">
-            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="proximity-out-event">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="drag_end">
+      </glib:signal>
+      <glib:signal name="drag-leave">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="object">
+            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
           </parameter>
-          <parameter name="context">
-            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+          <parameter name="p0">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="drag_data_get">
+      </glib:signal>
+      <glib:signal name="drag-begin">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="context">
-            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
-          </parameter>
-          <parameter name="selection_data">
-            <type name="SelectionData" c:type="GtkSelectionData*"/>
-          </parameter>
-          <parameter name="info">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="time_">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="object">
+            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="drag_data_delete">
+      </glib:signal>
+      <glib:signal name="drag-end">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="context">
-            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+          <parameter name="object">
+            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="drag_leave">
+      </glib:signal>
+      <glib:signal name="drag-data-delete">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="object">
+            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
           </parameter>
-          <parameter name="context">
-            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="drag-failed">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
           </parameter>
-          <parameter name="time_">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="p0">
+            <type name="DragResult" c:type="GtkDragResult"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="drag_motion">
+      </glib:signal>
+      <glib:signal name="drag-motion">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="context">
-            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+          <parameter name="object">
+            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
           </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="p1">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="time_">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="p2">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="drag_drop">
+      </glib:signal>
+      <glib:signal name="drag-drop">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="context">
-            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+          <parameter name="object">
+            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
           </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="p1">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="time_">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="p2">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="drag_data_received">
+      </glib:signal>
+      <glib:signal name="drag-data-get">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="context">
-            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="object">
+            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
           </parameter>
-          <parameter name="selection_data">
-            <type name="SelectionData" c:type="GtkSelectionData*"/>
+          <parameter name="p0">
+            <type name="SelectionData" c:type="GtkSelectionData"/>
           </parameter>
-          <parameter name="info">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="p1">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="time_">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="p2">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="popup_menu">
+      </glib:signal>
+      <glib:signal name="drag-data-received">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="object">
+            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="show_help">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="help_type">
-            <type name="WidgetHelpType" c:type="GtkWidgetHelpType"/>
+          <parameter name="p1">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="p2">
+            <type name="SelectionData" c:type="GtkSelectionData"/>
+          </parameter>
+          <parameter name="p3">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="p4">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_accessible">
+      </glib:signal>
+      <glib:signal name="visibility-notify-event">
         <return-value>
-          <type name="Atk.Object" c:type="AtkObject*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="screen_changed">
+      </glib:signal>
+      <glib:signal name="client-event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="previous_screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="can_activate_accel">
+      </glib:signal>
+      <glib:signal name="no-expose-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="signal_id">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="grab_broken_event">
+      </glib:signal>
+      <glib:signal name="window-state-event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventGrabBroken" c:type="GdkEventGrabBroken*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="composited_changed">
+      </glib:signal>
+      <glib:signal name="grab-broken-event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="query_tooltip">
+      </glib:signal>
+      <glib:signal name="query-tooltip">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="keyboard_tooltip">
+          <parameter name="p1">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
+          <parameter name="p2">
+            <type name="Tooltip" c:type="GtkTooltip"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved5">
+      </glib:signal>
+      <glib:signal name="popup-menu">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </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="realize">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="unrealize">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="show">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="hide">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="map">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="unmap">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="size-request">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Requisition" c:type="GtkRequisition"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="size-allocate">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GdkRectangle" c:type="GdkRectangle"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="state-changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="StateType" c:type="GtkStateType"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="parent-set">
-        <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="hierarchy-changed">
-        <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="style-set">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Style" c:type="GtkStyle"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="direction-changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="TextDirection" c:type="GtkTextDirection"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="grab-notify">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="child-notify">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GParam" c:type="GParam"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="mnemonic-activate">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="grab-focus">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="focus">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="DirectionType" c:type="GtkDirectionType"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="move-focus">
-        <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="event">
+      <glib:signal name="show-help">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
+            <type name="WidgetHelpType" c:type="GtkWidgetHelpType"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="event-after">
+      <glib:signal name="accel-closures-changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="button-press-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="button-release-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="scroll-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="motion-notify-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
       </glib:signal>
-      <glib:signal name="composited-changed">
+      <glib:signal name="screen-changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="keynav-failed">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="DirectionType" c:type="GtkDirectionType"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="delete-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="destroy-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="expose-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="key-press-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="key-release-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="enter-notify-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="leave-notify-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="configure-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="focus-in-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="focus-out-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="map-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="unmap-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="property-notify-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="selection-clear-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="selection-request-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
         <parameters>
           <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
+            <type name="Gdk.Screen" c:type="GdkScreen"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="selection-notify-event">
+      <glib:signal name="can-activate-accel">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="selection-received">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="SelectionData" c:type="GtkSelectionData"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="selection-get">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="SelectionData" c:type="GtkSelectionData"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="uint32" c:type="guint"/>
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="proximity-in-event">
-        <return-value>
+    </class>
+    <function name="draw_hline" c:identifier="gtk_draw_hline">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="x1">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="x2">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="draw_vline" c:identifier="gtk_draw_vline">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="y1_">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y2_">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="draw_shadow" c:identifier="gtk_draw_shadow">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="draw_polygon" c:identifier="gtk_draw_polygon">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="points">
+          <type name="Gdk.Point" c:type="GdkPoint*"/>
+        </parameter>
+        <parameter name="npoints">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="fill">
           <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="proximity-out-event">
-        <return-value>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="draw_arrow" c:identifier="gtk_draw_arrow">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="arrow_type">
+          <type name="ArrowType" c:type="GtkArrowType"/>
+        </parameter>
+        <parameter name="fill">
           <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="drag-leave">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="drag-begin">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="drag-end">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="drag-data-delete">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="drag-failed">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="DragResult" c:type="GtkDragResult"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="drag-motion">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="p2">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="drag-drop">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="p2">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="drag-data-get">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="SelectionData" c:type="GtkSelectionData"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="p2">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="drag-data-received">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="p2">
-            <type name="SelectionData" c:type="GtkSelectionData"/>
-          </parameter>
-          <parameter name="p3">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="p4">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="visibility-notify-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="client-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="no-expose-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="window-state-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="grab-broken-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="query-tooltip">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="p2">
-            <type name="Tooltip" c:type="GtkTooltip"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="popup-menu">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="show-help">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="WidgetHelpType" c:type="GtkWidgetHelpType"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="accel-closures-changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="screen-changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.Screen" c:type="GdkScreen"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="can-activate-accel">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </class>
-    <function name="widget_get_accel_path"
-              c:identifier="_gtk_widget_get_accel_path">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="locked">
-          <type name="GLib.gboolean" c:type="gboolean*"/>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="widget_push_colormap"
-              c:identifier="gtk_widget_push_colormap">
+    <function name="draw_diamond" c:identifier="gtk_draw_diamond">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="cmap">
-          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="widget_push_composite_child"
-              c:identifier="gtk_widget_push_composite_child">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="widget_pop_composite_child"
-              c:identifier="gtk_widget_pop_composite_child">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="widget_pop_colormap"
-              c:identifier="gtk_widget_pop_colormap">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="widget_class_install_style_property"
-              c:identifier="gtk_widget_class_install_style_property">
+    <function name="draw_box" c:identifier="gtk_draw_box">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="klass">
-          <type name="GtkWidgetClass" c:type="GtkWidgetClass*"/>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
         </parameter>
-        <parameter name="pspec">
-          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="widget_class_install_style_property_parser"
-              c:identifier="gtk_widget_class_install_style_property_parser">
+    <function name="draw_flat_box" c:identifier="gtk_draw_flat_box">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="klass">
-          <type name="GtkWidgetClass" c:type="GtkWidgetClass*"/>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
         </parameter>
-        <parameter name="pspec">
-          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
         </parameter>
-        <parameter name="parser">
-          <type name="GtkRcPropertyParser" c:type="GtkRcPropertyParser"/>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="widget_class_find_style_property"
-              c:identifier="gtk_widget_class_find_style_property">
-      <return-value>
-        <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
-      </return-value>
-      <parameters>
-        <parameter name="klass">
-          <type name="GtkWidgetClass" c:type="GtkWidgetClass*"/>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
-        <parameter name="property_name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="widget_class_list_style_properties"
-              c:identifier="gtk_widget_class_list_style_properties">
-      <return-value>
-        <type name="GObject.GParamSpec" c:type="GParamSpec**"/>
-      </return-value>
-      <parameters>
-        <parameter name="klass">
-          <type name="GtkWidgetClass" c:type="GtkWidgetClass*"/>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="n_properties">
-          <type name="GLib.guint" c:type="guint*"/>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="widget_set_default_colormap"
-              c:identifier="gtk_widget_set_default_colormap">
+    <function name="draw_check" c:identifier="gtk_draw_check">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="colormap">
-          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="widget_get_default_style"
-              c:identifier="gtk_widget_get_default_style">
-      <return-value>
-        <type name="Style" c:type="GtkStyle*"/>
-      </return-value>
-    </function>
-    <function name="widget_get_default_colormap"
-              c:identifier="gtk_widget_get_default_colormap">
-      <return-value>
-        <type name="Gdk.Colormap" c:type="GdkColormap*"/>
-      </return-value>
-    </function>
-    <function name="widget_get_default_visual"
-              c:identifier="gtk_widget_get_default_visual">
-      <return-value>
-        <type name="Gdk.Visual" c:type="GdkVisual*"/>
-      </return-value>
-    </function>
-    <function name="widget_set_default_direction"
-              c:identifier="gtk_widget_set_default_direction">
+    <function name="draw_option" c:identifier="gtk_draw_option">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="dir">
-          <type name="TextDirection" c:type="GtkTextDirection"/>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="widget_get_default_direction"
-              c:identifier="gtk_widget_get_default_direction">
-      <return-value>
-        <type name="TextDirection" c:type="GtkTextDirection"/>
-      </return-value>
-    </function>
-    <glib:boxed c:type="Requisition"
-                glib:name="Requisition"
-                glib:type-name="GtkRequisition"
-                glib:get-type="gtk_requisition_get_type">
-      <constructor name="copy" c:identifier="gtk_requisition_copy">
-        <return-value>
-          <type name="Requisition" c:type="GtkRequisition*"/>
-        </return-value>
-        <parameters>
-          <parameter name="requisition">
-            <type name="Requisition" c:type="GtkRequisition*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="free" c:identifier="gtk_requisition_free">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="requisition">
-            <type name="Requisition" c:type="GtkRequisition*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </glib:boxed>
-    <function name="widget_grab_notify" c:identifier="_gtk_widget_grab_notify">
+    <function name="draw_tab" c:identifier="gtk_draw_tab">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
         </parameter>
-        <parameter name="was_grabbed">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="widget_get_aux_info"
-              c:identifier="_gtk_widget_get_aux_info">
-      <return-value>
-        <type name="GtkWidgetAuxInfo" c:type="GtkWidgetAuxInfo*"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
         </parameter>
-        <parameter name="create">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="widget_propagate_hierarchy_changed"
-              c:identifier="_gtk_widget_propagate_hierarchy_changed">
+    <function name="draw_shadow_gap" c:identifier="gtk_draw_shadow_gap">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
         </parameter>
-        <parameter name="previous_toplevel">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="gap_side">
+          <type name="PositionType" c:type="GtkPositionType"/>
+        </parameter>
+        <parameter name="gap_x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="gap_width">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="widget_propagate_screen_changed"
-              c:identifier="_gtk_widget_propagate_screen_changed">
+    <function name="draw_box_gap" c:identifier="gtk_draw_box_gap">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="previous_screen">
-          <type name="Gdk.Screen" c:type="GdkScreen*"/>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="gap_side">
+          <type name="PositionType" c:type="GtkPositionType"/>
+        </parameter>
+        <parameter name="gap_x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="gap_width">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="widget_propagate_composited_changed"
-              c:identifier="_gtk_widget_propagate_composited_changed">
+    <function name="draw_extension" c:identifier="gtk_draw_extension">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="gap_side">
+          <type name="PositionType" c:type="GtkPositionType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="draw_focus" c:identifier="gtk_draw_focus">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="draw_slider" c:identifier="gtk_draw_slider">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="orientation">
+          <type name="Orientation" c:type="GtkOrientation"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="draw_handle" c:identifier="gtk_draw_handle">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="orientation">
+          <type name="Orientation" c:type="GtkOrientation"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="draw_expander" c:identifier="gtk_draw_expander">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="expander_style">
+          <type name="ExpanderStyle" c:type="GtkExpanderStyle"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="draw_layout" c:identifier="gtk_draw_layout">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="use_text">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="layout">
+          <type name="Pango.Layout" c:type="PangoLayout*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="draw_resize_grip" c:identifier="gtk_draw_resize_grip">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="edge">
+          <type name="Gdk.WindowEdge" c:type="GdkWindowEdge"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="paint_hline" c:identifier="gtk_paint_hline">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </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="gchar*"/>
+        </parameter>
+        <parameter name="x1">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="x2">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
       </parameters>
     </function>
-    <function name="widget_peek_colormap"
-              c:identifier="_gtk_widget_peek_colormap">
+    <function name="paint_vline" c:identifier="gtk_paint_vline">
       <return-value>
-        <type name="Gdk.Colormap" c:type="GdkColormap*"/>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </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="gchar*"/>
+        </parameter>
+        <parameter name="y1_">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y2_">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="paint_shadow" c:identifier="gtk_paint_shadow">
+      <return-value>
+        <type name="none" c:type="void"/>
       </return-value>
+      <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </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="gchar*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
     </function>
-    <class name="Container"
-           c:type="GtkContainer"
-           parent="Widget"
-           glib:type-name="GtkContainer"
-           glib:get-type="gtk_container_get_type">
-      <method name="set_border_width"
-              c:identifier="gtk_container_set_border_width">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-          <parameter name="border_width">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_border_width"
-              c:identifier="gtk_container_get_border_width">
-        <return-value>
-          <type name="uint32" c:type="guint"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add" c:identifier="gtk_container_add">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="remove" c:identifier="gtk_container_remove">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_resize_mode"
-              c:identifier="gtk_container_set_resize_mode">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-          <parameter name="resize_mode">
-            <type name="ResizeMode" c:type="GtkResizeMode"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_resize_mode"
-              c:identifier="gtk_container_get_resize_mode">
-        <return-value>
-          <type name="ResizeMode" c:type="GtkResizeMode"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="check_resize" c:identifier="gtk_container_check_resize">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="foreach" c:identifier="gtk_container_foreach">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkCallback" c:type="GtkCallback"/>
-          </parameter>
-          <parameter name="callback_data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="foreach_full" c:identifier="gtk_container_foreach_full">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkCallback" c:type="GtkCallback"/>
-          </parameter>
-          <parameter name="marshal">
-            <type name="GtkCallbackMarshal" c:type="GtkCallbackMarshal"/>
-          </parameter>
-          <parameter name="callback_data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-          <parameter name="notify">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_children" c:identifier="gtk_container_get_children">
-        <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="propagate_expose"
-              c:identifier="gtk_container_propagate_expose">
-        <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="event">
-            <type name="Gdk.GdkEventExpose" c:type="GdkEventExpose*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_focus_chain"
-              c:identifier="gtk_container_set_focus_chain">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-          <parameter name="focusable_widgets">
-            <type name="GLib.GList" c:type="GList*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_focus_chain"
-              c:identifier="gtk_container_get_focus_chain">
-        <return-value>
+    <function name="paint_polygon" c:identifier="gtk_paint_polygon">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </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="gchar*"/>
+        </parameter>
+        <parameter name="points">
+          <type name="Gdk.Point" c:type="GdkPoint*"/>
+        </parameter>
+        <parameter name="npoints">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="fill">
           <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-          <parameter name="focusable_widgets">
-            <type name="GLib.GList" c:type="GList**"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="unset_focus_chain"
-              c:identifier="gtk_container_unset_focus_chain">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_reallocate_redraws"
-              c:identifier="gtk_container_set_reallocate_redraws">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-          <parameter name="needs_redraws">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_focus_child"
-              c:identifier="gtk_container_set_focus_child">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-          <parameter name="child" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_focus_vadjustment"
-              c:identifier="gtk_container_set_focus_vadjustment">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_focus_vadjustment"
-              c:identifier="gtk_container_get_focus_vadjustment">
-        <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_focus_hadjustment"
-              c:identifier="gtk_container_set_focus_hadjustment">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_focus_hadjustment"
-              c:identifier="gtk_container_get_focus_hadjustment">
-        <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="resize_children"
-              c:identifier="gtk_container_resize_children">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="child_type" c:identifier="gtk_container_child_type">
-        <return-value>
-          <type name="GObject.GType" c:type="GType"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_with_properties"
-              c:identifier="gtk_container_add_with_properties">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="first_prop_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="child_set" c:identifier="gtk_container_child_set">
-        <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_prop_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="child_get" c:identifier="gtk_container_child_get">
-        <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_prop_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="child_set_property"
-              c:identifier="gtk_container_child_set_property">
-        <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="property_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="GObject.GValue" c:type="GValue*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="child_get_property"
-              c:identifier="gtk_container_child_get_property">
-        <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="property_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="GObject.GValue" c:type="GValue*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="forall" c:identifier="gtk_container_forall">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkCallback" c:type="GtkCallback"/>
-          </parameter>
-          <parameter name="callback_data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="border-width">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <property name="resize-mode">
-        <type name="ResizeMode" c:type="GtkResizeMode"/>
-      </property>
-      <property name="child">
-        <type name="Widget" c:type="GtkWidget"/>
-      </property>
-      <callback name="add">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="remove">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="check_resize">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="forall">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-          <parameter name="include_internals">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkCallback" c:type="GtkCallback"/>
-          </parameter>
-          <parameter name="callback_data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_focus_child">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="child_type">
-        <return-value>
-          <type name="GObject.GType" c:type="GType"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="composite_name">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="container">
-            <type name="Container" c:type="GtkContainer*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_child_property">
-        <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="property_id">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="value">
-            <type name="GObject.GValue" c:type="GValue*"/>
-          </parameter>
-          <parameter name="pspec">
-            <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_child_property">
-        <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="property_id">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="value">
-            <type name="GObject.GValue" c:type="GValue*"/>
-          </parameter>
-          <parameter name="pspec">
-            <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
-          </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="add">
-        <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="remove">
-        <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="check-resize">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="set-focus-child">
-        <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="container_class_install_child_property"
-              c:identifier="gtk_container_class_install_child_property">
+        </parameter>
+      </parameters>
+    </function>
+    <function name="paint_arrow" c:identifier="gtk_paint_arrow">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="cclass">
-          <type name="GtkContainerClass" c:type="GtkContainerClass*"/>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
         </parameter>
-        <parameter name="property_id">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
         </parameter>
-        <parameter name="pspec">
-          <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="container_class_find_child_property"
-              c:identifier="gtk_container_class_find_child_property">
-      <return-value>
-        <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
-      </return-value>
-      <parameters>
-        <parameter name="cclass">
-          <type name="GObjectClass" c:type="GObjectClass*"/>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
-        <parameter name="property_name">
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </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="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="container_class_list_child_properties"
-              c:identifier="gtk_container_class_list_child_properties">
-      <return-value>
-        <type name="GObject.GParamSpec" c:type="GParamSpec**"/>
-      </return-value>
-      <parameters>
-        <parameter name="cclass">
-          <type name="GObjectClass" c:type="GObjectClass*"/>
+        <parameter name="arrow_type">
+          <type name="ArrowType" c:type="GtkArrowType"/>
         </parameter>
-        <parameter name="n_properties">
-          <type name="GLib.guint" c:type="guint*"/>
+        <parameter name="fill">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="container_queue_resize"
-              c:identifier="_gtk_container_queue_resize">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="container">
-          <type name="Container" c:type="GtkContainer*"/>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="container_clear_resize_widgets"
-              c:identifier="_gtk_container_clear_resize_widgets">
+    <function name="paint_diamond" c:identifier="gtk_paint_diamond">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="container">
-          <type name="Container" c:type="GtkContainer*"/>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="container_child_composite_name"
-              c:identifier="_gtk_container_child_composite_name">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="container">
-          <type name="Container" c:type="GtkContainer*"/>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
         </parameter>
-        <parameter name="child">
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </parameter>
+        <parameter name="widget" allow-none="1">
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="container_dequeue_resize_handler"
-              c:identifier="_gtk_container_dequeue_resize_handler">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="container">
-          <type name="Container" c:type="GtkContainer*"/>
+        <parameter name="detail" allow-none="1">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="container_focus_sort"
-              c:identifier="_gtk_container_focus_sort">
+    <function name="paint_box" c:identifier="gtk_paint_box">
       <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="container">
-          <type name="Container" c:type="GtkContainer*"/>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
         </parameter>
-        <parameter name="children">
-          <type name="GLib.GList" c:type="GList*"/>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
         </parameter>
-        <parameter name="direction">
-          <type name="DirectionType" c:type="GtkDirectionType"/>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
         </parameter>
-        <parameter name="old_focus">
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </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="gchar*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
+        </parameter>
       </parameters>
     </function>
-    <class name="Bin"
-           c:type="GtkBin"
-           parent="Container"
-           glib:type-name="GtkBin"
-           glib:get-type="gtk_bin_get_type">
-      <method name="get_child" c:identifier="gtk_bin_get_child">
-        <return-value>
+    <function name="paint_flat_box" c:identifier="gtk_paint_flat_box">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </parameter>
+        <parameter name="widget" allow-none="1">
           <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="bin">
-            <type name="Bin" c:type="GtkBin*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </class>
-    <record name="GtkWindowGeometryInfo" c:type="GtkWindowGeometryInfo"/>
-    <class name="Window"
-           c:type="GtkWindow"
-           parent="Bin"
-           glib:type-name="GtkWindow"
-           glib:get-type="gtk_window_get_type">
-      <constructor name="get_transient_for"
-                   c:identifier="gtk_window_get_transient_for">
-        <return-value>
-          <type name="Window" c:type="GtkWindow*"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="set_title" c:identifier="gtk_window_set_title">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="title">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_title" c:identifier="gtk_window_get_title">
-        <return-value>
+        </parameter>
+        <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_wmclass" c:identifier="gtk_window_set_wmclass">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="wmclass_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="wmclass_class">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_role" c:identifier="gtk_window_set_role">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="role">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_startup_id" c:identifier="gtk_window_set_startup_id">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="startup_id">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_role" c:identifier="gtk_window_get_role">
-        <return-value>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="paint_check" c:identifier="gtk_paint_check">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </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="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_accel_group" c:identifier="gtk_window_add_accel_group">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="accel_group">
-            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="remove_accel_group"
-              c:identifier="gtk_window_remove_accel_group">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="accel_group">
-            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_position" c:identifier="gtk_window_set_position">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="WindowPosition" c:type="GtkWindowPosition"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="activate_focus" c:identifier="gtk_window_activate_focus">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_focus" c:identifier="gtk_window_set_focus">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="focus" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_focus" c:identifier="gtk_window_get_focus">
-        <return-value>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="paint_option" c:identifier="gtk_paint_option">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </parameter>
+        <parameter name="widget" allow-none="1">
           <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_default" c:identifier="gtk_window_set_default">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="default_widget" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="activate_default"
-              c:identifier="gtk_window_activate_default">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_transient_for"
-              c:identifier="gtk_window_set_transient_for">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="parent" allow-none="1">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_opacity" c:identifier="gtk_window_set_opacity">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="opacity">
-            <type name="double" c:type="gdouble"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_opacity" c:identifier="gtk_window_get_opacity">
-        <return-value>
-          <type name="double" c:type="gdouble"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_type_hint" c:identifier="gtk_window_set_type_hint">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="hint">
-            <type name="GdkWindowTypeHint" c:type="GdkWindowTypeHint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_type_hint" c:identifier="gtk_window_get_type_hint">
-        <return-value>
-          <type name="GdkWindowTypeHint" c:type="GdkWindowTypeHint"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_skip_taskbar_hint"
-              c:identifier="gtk_window_set_skip_taskbar_hint">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_skip_taskbar_hint"
-              c:identifier="gtk_window_get_skip_taskbar_hint">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_skip_pager_hint"
-              c:identifier="gtk_window_set_skip_pager_hint">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_skip_pager_hint"
-              c:identifier="gtk_window_get_skip_pager_hint">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_urgency_hint"
-              c:identifier="gtk_window_set_urgency_hint">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_urgency_hint"
-              c:identifier="gtk_window_get_urgency_hint">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_accept_focus"
-              c:identifier="gtk_window_set_accept_focus">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_accept_focus"
-              c:identifier="gtk_window_get_accept_focus">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_focus_on_map"
-              c:identifier="gtk_window_set_focus_on_map">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_focus_on_map"
-              c:identifier="gtk_window_get_focus_on_map">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_destroy_with_parent"
-              c:identifier="gtk_window_set_destroy_with_parent">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_destroy_with_parent"
-              c:identifier="gtk_window_get_destroy_with_parent">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_resizable" c:identifier="gtk_window_set_resizable">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="resizable">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_resizable" c:identifier="gtk_window_get_resizable">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_gravity" c:identifier="gtk_window_set_gravity">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="gravity">
-            <type name="GdkGravity" c:type="GdkGravity"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_gravity" c:identifier="gtk_window_get_gravity">
-        <return-value>
-          <type name="GdkGravity" c:type="GdkGravity"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_geometry_hints"
-              c:identifier="gtk_window_set_geometry_hints">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="geometry_widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="geometry">
-            <type name="Gdk.GdkGeometry" c:type="GdkGeometry*"/>
-          </parameter>
-          <parameter name="geom_mask">
-            <type name="GdkWindowHints" c:type="GdkWindowHints"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_screen" c:identifier="gtk_window_set_screen">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_screen" c:identifier="gtk_window_get_screen">
-        <return-value>
-          <type name="Gdk.Screen" c:type="GdkScreen*"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="is_active" c:identifier="gtk_window_is_active">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="has_toplevel_focus"
-              c:identifier="gtk_window_has_toplevel_focus">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_has_frame" c:identifier="gtk_window_set_has_frame">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_has_frame" c:identifier="gtk_window_get_has_frame">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_frame_dimensions"
-              c:identifier="gtk_window_set_frame_dimensions">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="left">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="top">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="right">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="bottom">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_frame_dimensions"
-              c:identifier="gtk_window_get_frame_dimensions">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="left">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="top">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="right">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="bottom">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_decorated" c:identifier="gtk_window_set_decorated">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_decorated" c:identifier="gtk_window_get_decorated">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_deletable" c:identifier="gtk_window_set_deletable">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_deletable" c:identifier="gtk_window_get_deletable">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_icon_list" c:identifier="gtk_window_set_icon_list">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="list">
-            <type name="GLib.GList" c:type="GList*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_icon_list" c:identifier="gtk_window_get_icon_list">
-        <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_icon" c:identifier="gtk_window_set_icon">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="icon" allow-none="1">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_icon_name" c:identifier="gtk_window_set_icon_name">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="name" allow-none="1">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_icon_from_file"
-              c:identifier="gtk_window_set_icon_from_file">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="filename">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="err">
-            <type name="GLib.GError" c:type="GError**"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_icon" c:identifier="gtk_window_get_icon">
-        <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_icon_name" c:identifier="gtk_window_get_icon_name">
-        <return-value>
+        </parameter>
+        <parameter name="detail" allow-none="1">
           <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_modal" c:identifier="gtk_window_set_modal">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="modal">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_modal" c:identifier="gtk_window_get_modal">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_mnemonic" c:identifier="gtk_window_add_mnemonic">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="keyval">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="target">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="remove_mnemonic" c:identifier="gtk_window_remove_mnemonic">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="keyval">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="target">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="mnemonic_activate"
-              c:identifier="gtk_window_mnemonic_activate">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="keyval">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="modifier">
-            <type name="GdkModifierType" c:type="GdkModifierType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_mnemonic_modifier"
-              c:identifier="gtk_window_set_mnemonic_modifier">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="modifier">
-            <type name="GdkModifierType" c:type="GdkModifierType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_mnemonic_modifier"
-              c:identifier="gtk_window_get_mnemonic_modifier">
-        <return-value>
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="activate_key" c:identifier="gtk_window_activate_key">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventKey" c:type="GdkEventKey*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="propagate_key_event"
-              c:identifier="gtk_window_propagate_key_event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventKey" c:type="GdkEventKey*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="present" c:identifier="gtk_window_present">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="present_with_time"
-              c:identifier="gtk_window_present_with_time">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="timestamp">
-            <type name="uint32" c:type="guint32"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="iconify" c:identifier="gtk_window_iconify">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="deiconify" c:identifier="gtk_window_deiconify">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="stick" c:identifier="gtk_window_stick">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="unstick" c:identifier="gtk_window_unstick">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="maximize" c:identifier="gtk_window_maximize">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="unmaximize" c:identifier="gtk_window_unmaximize">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="fullscreen" c:identifier="gtk_window_fullscreen">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="unfullscreen" c:identifier="gtk_window_unfullscreen">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_keep_above" c:identifier="gtk_window_set_keep_above">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_keep_below" c:identifier="gtk_window_set_keep_below">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="begin_resize_drag"
-              c:identifier="gtk_window_begin_resize_drag">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="edge">
-            <type name="GdkWindowEdge" c:type="GdkWindowEdge"/>
-          </parameter>
-          <parameter name="button">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="root_x">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="root_y">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="timestamp">
-            <type name="uint32" c:type="guint32"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="begin_move_drag" c:identifier="gtk_window_begin_move_drag">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="button">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="root_x">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="root_y">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="timestamp">
-            <type name="uint32" c:type="guint32"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_policy" c:identifier="gtk_window_set_policy">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="allow_shrink">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="allow_grow">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="auto_shrink">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_default_size"
-              c:identifier="gtk_window_set_default_size">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="height">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_default_size"
-              c:identifier="gtk_window_get_default_size">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="height">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="resize" c:identifier="gtk_window_resize">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="height">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_size" c:identifier="gtk_window_get_size">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="width" direction="out">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="height" direction="out">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="move" c:identifier="gtk_window_move">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </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="get_position" c:identifier="gtk_window_get_position">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="root_x">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="root_y">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="parse_geometry" c:identifier="gtk_window_parse_geometry">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="geometry">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_group" c:identifier="gtk_window_get_group">
-        <return-value>
-          <type name="WindowGroup" c:type="GtkWindowGroup*"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="reshow_with_initial_size"
-              c:identifier="gtk_window_reshow_with_initial_size">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="remove_embedded_xid"
-              c:identifier="gtk_window_remove_embedded_xid">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="xid">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_embedded_xid"
-              c:identifier="gtk_window_add_embedded_xid">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="xid">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="type">
-        <type name="WindowType" c:type="GtkWindowType"/>
-      </property>
-      <property name="title">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="role">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="startup-id">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="allow-shrink">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="allow-grow">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="resizable">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="modal">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="window-position">
-        <type name="WindowPosition" c:type="GtkWindowPosition"/>
-      </property>
-      <property name="default-width">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="default-height">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="destroy-with-parent">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="icon">
-        <type name="GdkPixbuf" c:type="GdkPixbuf"/>
-      </property>
-      <property name="icon-name">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="screen">
-        <type name="Gdk.Screen" c:type="GdkScreen"/>
-      </property>
-      <property name="type-hint">
-        <type name="GdkWindowTypeHint" c:type="GdkWindowTypeHint"/>
-      </property>
-      <property name="skip-taskbar-hint">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="skip-pager-hint">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="urgency-hint">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="accept-focus">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="focus-on-map">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="decorated">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="deletable">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="gravity">
-        <type name="GdkGravity" c:type="GdkGravity"/>
-      </property>
-      <property name="transient-for">
-        <type name="Window" c:type="GtkWindow"/>
-      </property>
-      <property name="opacity">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <property name="is-active">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="has-toplevel-focus">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="set_focus">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="focus">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="frame_event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="activate_focus">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="activate_default">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="move_focus">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="direction">
-            <type name="DirectionType" c:type="GtkDirectionType"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="keys_changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </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-focus">
-        <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="frame-event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="activate-focus">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="activate-default">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="keys-changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="window_new" c:identifier="gtk_window_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="WindowType" c:type="GtkWindowType"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="window_set_default_icon_list"
-              c:identifier="gtk_window_set_default_icon_list">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GLib.GList" c:type="GList*"/>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="window_get_default_icon_list"
-              c:identifier="gtk_window_get_default_icon_list">
-      <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
-      </return-value>
-    </function>
-    <function name="window_set_default_icon"
-              c:identifier="gtk_window_set_default_icon">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="icon">
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="window_set_default_icon_name"
-              c:identifier="gtk_window_set_default_icon_name">
+    <function name="paint_tab" c:identifier="gtk_paint_tab">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="window_set_default_icon_from_file"
-              c:identifier="gtk_window_set_default_icon_from_file">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="filename">
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </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="gchar*"/>
         </parameter>
-        <parameter name="err">
-          <type name="GLib.GError" c:type="GError**"/>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="window_set_auto_startup_notification"
-              c:identifier="gtk_window_set_auto_startup_notification">
+    <function name="paint_shadow_gap" c:identifier="gtk_paint_shadow_gap">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="setting">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="window_list_toplevels"
-              c:identifier="gtk_window_list_toplevels">
-      <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </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="gchar*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="gap_side">
+          <type name="PositionType" c:type="GtkPositionType"/>
+        </parameter>
+        <parameter name="gap_x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="gap_width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="paint_box_gap" c:identifier="gtk_paint_box_gap">
+      <return-value>
+        <type name="none" c:type="void"/>
       </return-value>
+      <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </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="gchar*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="gap_side">
+          <type name="PositionType" c:type="GtkPositionType"/>
+        </parameter>
+        <parameter name="gap_x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="gap_width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
     </function>
-    <class name="WindowGroup"
-           c:type="GtkWindowGroup"
-           parent="GObject.Object"
-           glib:type-name="GtkWindowGroup"
-           glib:get-type="gtk_window_group_get_type">
-      <constructor name="new" c:identifier="gtk_window_group_new">
-        <return-value>
-          <type name="WindowGroup" c:type="GtkWindowGroup*"/>
-        </return-value>
-      </constructor>
-      <method name="add_window" c:identifier="gtk_window_group_add_window">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window_group">
-            <type name="WindowGroup" c:type="GtkWindowGroup*"/>
-          </parameter>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="remove_window"
-              c:identifier="gtk_window_group_remove_window">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="window_group">
-            <type name="WindowGroup" c:type="GtkWindowGroup*"/>
-          </parameter>
-          <parameter name="window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </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="window_internal_set_focus"
-              c:identifier="_gtk_window_internal_set_focus">
+    <function name="paint_extension" c:identifier="gtk_paint_extension">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
         <parameter name="window">
-          <type name="Window" c:type="GtkWindow*"/>
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
         </parameter>
-        <parameter name="focus">
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </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="gchar*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="gap_side">
+          <type name="PositionType" c:type="GtkPositionType"/>
+        </parameter>
       </parameters>
     </function>
-    <function name="window_reposition" c:identifier="_gtk_window_reposition">
+    <function name="paint_focus" c:identifier="gtk_paint_focus">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
         <parameter name="window">
-          <type name="Window" c:type="GtkWindow*"/>
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </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="gchar*"/>
         </parameter>
         <parameter name="x">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="y">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="window_constrain_size"
-              c:identifier="_gtk_window_constrain_size">
+    <function name="paint_slider" c:identifier="gtk_paint_slider">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
         <parameter name="window">
-          <type name="Window" c:type="GtkWindow*"/>
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </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="gchar*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="width">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="height">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="new_width">
-          <type name="GLib.gint" c:type="gint*"/>
+        <parameter name="orientation">
+          <type name="Orientation" c:type="GtkOrientation"/>
         </parameter>
-        <parameter name="new_height">
-          <type name="GLib.gint" c:type="gint*"/>
+      </parameters>
+    </function>
+    <function name="paint_handle" c:identifier="gtk_paint_handle">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </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="gchar*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="orientation">
+          <type name="Orientation" c:type="GtkOrientation"/>
         </parameter>
       </parameters>
     </function>
-    <function name="window_group_get_current_grab"
-              c:identifier="_gtk_window_group_get_current_grab">
+    <function name="paint_expander" c:identifier="gtk_paint_expander">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="window_group">
-          <type name="WindowGroup" c:type="GtkWindowGroup*"/>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </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="gchar*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="expander_style">
+          <type name="ExpanderStyle" c:type="GtkExpanderStyle"/>
         </parameter>
       </parameters>
     </function>
-    <function name="window_set_has_toplevel_focus"
-              c:identifier="_gtk_window_set_has_toplevel_focus">
+    <function name="paint_layout" c:identifier="gtk_paint_layout">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
         <parameter name="window">
-          <type name="Window" c:type="GtkWindow*"/>
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
         </parameter>
-        <parameter name="has_toplevel_focus">
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="use_text">
           <type name="boolean" c:type="gboolean"/>
         </parameter>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </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="gchar*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="layout">
+          <type name="Pango.Layout" c:type="PangoLayout*"/>
+        </parameter>
       </parameters>
     </function>
-    <function name="window_unset_focus_and_default"
-              c:identifier="_gtk_window_unset_focus_and_default">
+    <function name="paint_resize_grip" c:identifier="gtk_paint_resize_grip">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
         <parameter name="window">
-          <type name="Window" c:type="GtkWindow*"/>
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
         </parameter>
-        <parameter name="widget">
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </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="gchar*"/>
+        </parameter>
+        <parameter name="edge">
+          <type name="Gdk.WindowEdge" c:type="GdkWindowEdge"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
+        </parameter>
       </parameters>
     </function>
-    <function name="window_set_is_active"
-              c:identifier="_gtk_window_set_is_active">
+    <function name="style_peek_property_value"
+              c:identifier="_gtk_style_peek_property_value">
+      <return-value>
+        <type name="GObject.Value" c:type="GValue*"/>
+      </return-value>
+      <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
+        <parameter name="widget_type">
+          <type name="GObject.Type" c:type="GType"/>
+        </parameter>
+        <parameter name="pspec">
+          <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
+        </parameter>
+        <parameter name="parser">
+          <type name="RcPropertyParser" c:type="GtkRcPropertyParser"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="style_init_for_settings"
+              c:identifier="_gtk_style_init_for_settings">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="window">
-          <type name="Window" c:type="GtkWindow*"/>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
         </parameter>
-        <parameter name="is_active">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="settings">
+          <type name="Settings" c:type="GtkSettings*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="style_shade" c:identifier="_gtk_style_shade">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="a">
+          <type name="Gdk.Color" c:type="GdkColor*"/>
+        </parameter>
+        <parameter name="b">
+          <type name="Gdk.Color" c:type="GdkColor*"/>
+        </parameter>
+        <parameter name="k">
+          <type name="double" c:type="gdouble"/>
         </parameter>
       </parameters>
     </function>
-    <callback name="GtkWindowKeysForeachFunc">
+    <function name="draw_string" c:identifier="gtk_draw_string">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
         <parameter name="window">
-          <type name="Window" c:type="GtkWindow*"/>
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
         </parameter>
-        <parameter name="keyval">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
         </parameter>
-        <parameter name="modifiers">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="is_mnemonic">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="string">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
-    </callback>
-    <function name="window_keys_foreach"
-              c:identifier="_gtk_window_keys_foreach">
+    </function>
+    <function name="paint_string" c:identifier="gtk_paint_string">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
+        <parameter name="style">
+          <type name="Style" c:type="GtkStyle*"/>
+        </parameter>
         <parameter name="window">
-          <type name="Window" c:type="GtkWindow*"/>
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
         </parameter>
-        <parameter name="func">
-          <type name="GtkWindowKeysForeachFunc"
-                c:type="GtkWindowKeysForeachFunc"/>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
         </parameter>
-        <parameter name="func_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </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="gchar*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="string">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="window_query_nonaccels"
-              c:identifier="_gtk_window_query_nonaccels">
+    <function name="draw_insertion_cursor"
+              c:identifier="gtk_draw_insertion_cursor">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="window">
-          <type name="Window" c:type="GtkWindow*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="accel_key">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="drawable">
+          <type name="Gdk.Drawable" c:type="GdkDrawable*"/>
         </parameter>
-        <parameter name="accel_mods">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </parameter>
+        <parameter name="location">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </parameter>
+        <parameter name="is_primary">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+        <parameter name="direction">
+          <type name="TextDirection" c:type="GtkTextDirection"/>
+        </parameter>
+        <parameter name="draw_arrow">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <class name="Dialog"
-           c:type="GtkDialog"
-           parent="Window"
-           glib:type-name="GtkDialog"
-           glib:get-type="gtk_dialog_get_type">
-      <method name="add_action_widget"
-              c:identifier="gtk_dialog_add_action_widget">
+    <function name="widget_get_cursor_gc"
+              c:identifier="_gtk_widget_get_cursor_gc">
+      <return-value>
+        <type name="Gdk.GC" c:type="GdkGC*"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="widget_get_cursor_color"
+              c:identifier="_gtk_widget_get_cursor_color">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="color">
+          <type name="Gdk.Color" c:type="GdkColor*"/>
+        </parameter>
+      </parameters>
+    </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="IconFactory" c:type="GtkIconFactory*"/>
+        </return-value>
+      </constructor>
+      <method name="add" c:identifier="gtk_icon_factory_add">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="dialog">
-            <type name="Dialog" c:type="GtkDialog*"/>
+          <parameter name="factory">
+            <type name="IconFactory" c:type="GtkIconFactory*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="response_id">
-            <type name="int32" c:type="gint"/>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_button" c:identifier="gtk_dialog_add_button">
+      <method name="lookup" c:identifier="gtk_icon_factory_lookup">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="IconSet" c:type="GtkIconSet*"/>
         </return-value>
         <parameters>
-          <parameter name="dialog">
-            <type name="Dialog" c:type="GtkDialog*"/>
+          <parameter name="factory">
+            <type name="IconFactory" c:type="GtkIconFactory*"/>
           </parameter>
-          <parameter name="button_text">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="response_id">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_buttons" c:identifier="gtk_dialog_add_buttons">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="dialog">
-            <type name="Dialog" c:type="GtkDialog*"/>
-          </parameter>
-          <parameter name="first_button_text">
+          <parameter name="stock_id">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_response_sensitive"
-              c:identifier="gtk_dialog_set_response_sensitive">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="dialog">
-            <type name="Dialog" c:type="GtkDialog*"/>
-          </parameter>
-          <parameter name="response_id">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_default_response"
-              c:identifier="gtk_dialog_set_default_response">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="dialog">
-            <type name="Dialog" c:type="GtkDialog*"/>
-          </parameter>
-          <parameter name="response_id">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_response_for_widget"
-              c:identifier="gtk_dialog_get_response_for_widget">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="dialog">
-            <type name="Dialog" c:type="GtkDialog*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_has_separator"
-              c:identifier="gtk_dialog_set_has_separator">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="dialog">
-            <type name="Dialog" c:type="GtkDialog*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_has_separator"
-              c:identifier="gtk_dialog_get_has_separator">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="dialog">
-            <type name="Dialog" c:type="GtkDialog*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_alternative_button_order"
-              c:identifier="gtk_dialog_set_alternative_button_order">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="dialog">
-            <type name="Dialog" c:type="GtkDialog*"/>
-          </parameter>
-          <parameter name="first_response_id">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_alternative_button_order_from_array"
-              c:identifier="gtk_dialog_set_alternative_button_order_from_array">
+      <method name="add_default" c:identifier="gtk_icon_factory_add_default">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="dialog">
-            <type name="Dialog" c:type="GtkDialog*"/>
-          </parameter>
-          <parameter name="n_params">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="new_order">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="factory">
+            <type name="IconFactory" c:type="GtkIconFactory*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="response" c:identifier="gtk_dialog_response">
+      <method name="remove_default"
+              c:identifier="gtk_icon_factory_remove_default">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="dialog">
-            <type name="Dialog" c:type="GtkDialog*"/>
-          </parameter>
-          <parameter name="response_id">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="run" c:identifier="gtk_dialog_run">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="dialog">
-            <type name="Dialog" c:type="GtkDialog*"/>
+          <parameter name="factory">
+            <type name="IconFactory" c:type="GtkIconFactory*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="has-separator">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="response">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="dialog">
-            <type name="Dialog" c:type="GtkDialog*"/>
-          </parameter>
-          <parameter name="response_id">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="close">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="dialog">
-            <type name="Dialog" c:type="GtkDialog*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="response">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="close">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
     </class>
-    <function name="dialog_new" c:identifier="gtk_dialog_new">
+    <record name="RcContext" c:type="GtkRcContext"/>
+    <function name="rc_init" c:identifier="_gtk_rc_init">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
     </function>
-    <function name="dialog_new_with_buttons"
-              c:identifier="gtk_dialog_new_with_buttons">
+    <function name="rc_parse_widget_class_path"
+              c:identifier="_gtk_rc_parse_widget_class_path">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="GLib.SList" c:type="GSList*"/>
       </return-value>
       <parameters>
-        <parameter name="title" allow-none="1">
+        <parameter name="pattern">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="parent" allow-none="1">
-          <type name="Window" c:type="GtkWindow*"/>
+      </parameters>
+    </function>
+    <function name="rc_free_widget_class_path"
+              c:identifier="_gtk_rc_free_widget_class_path">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GLib.SList" c:type="GSList*"/>
         </parameter>
-        <parameter name="flags">
-          <type name="DialogFlags" c:type="GtkDialogFlags"/>
+      </parameters>
+    </function>
+    <function name="rc_match_widget_class"
+              c:identifier="_gtk_rc_match_widget_class">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="GLib.SList" c:type="GSList*"/>
         </parameter>
-        <parameter name="first_button_text" allow-none="1">
+        <parameter name="length">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="path">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="path_reversed">
           <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="alternative_dialog_button_order"
-              c:identifier="gtk_alternative_dialog_button_order">
+    <function name="rc_add_default_file"
+              c:identifier="gtk_rc_add_default_file">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="screen" allow-none="1">
-          <type name="Gdk.Screen" c:type="GdkScreen*"/>
+        <parameter name="filename">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="dialog_set_ignore_separator"
-              c:identifier="_gtk_dialog_set_ignore_separator">
+    <function name="rc_set_default_files"
+              c:identifier="gtk_rc_set_default_files">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="dialog">
-          <type name="Dialog" c:type="GtkDialog*"/>
+        <parameter name="filenames">
+          <type name="GLib.char" c:type="gchar**"/>
         </parameter>
-        <parameter name="ignore_separator">
+      </parameters>
+    </function>
+    <function name="rc_get_default_files"
+              c:identifier="gtk_rc_get_default_files">
+      <return-value>
+        <type name="GLib.char" c:type="gchar**"/>
+      </return-value>
+    </function>
+    <function name="rc_get_style" c:identifier="gtk_rc_get_style">
+      <return-value>
+        <type name="Style" c:type="GtkStyle*"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_get_style_by_paths"
+              c:identifier="gtk_rc_get_style_by_paths">
+      <return-value>
+        <type name="Style" c:type="GtkStyle*"/>
+      </return-value>
+      <parameters>
+        <parameter name="settings">
+          <type name="Settings" c:type="GtkSettings*"/>
+        </parameter>
+        <parameter name="widget_path" allow-none="1">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="class_path" allow-none="1">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="type">
+          <type name="GObject.Type" c:type="GType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_reparse_all_for_settings"
+              c:identifier="gtk_rc_reparse_all_for_settings">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="settings">
+          <type name="Settings" c:type="GtkSettings*"/>
+        </parameter>
+        <parameter name="force_load">
           <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <class name="AboutDialog"
-           c:type="GtkAboutDialog"
-           parent="Dialog"
-           glib:type-name="GtkAboutDialog"
-           glib:get-type="gtk_about_dialog_get_type">
-      <method name="get_name" c:identifier="gtk_about_dialog_get_name">
-        <return-value>
+    <function name="rc_reset_styles" c:identifier="gtk_rc_reset_styles">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="settings">
+          <type name="Settings" c:type="GtkSettings*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_find_pixmap_in_path"
+              c:identifier="gtk_rc_find_pixmap_in_path">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="settings">
+          <type name="Settings" c:type="GtkSettings*"/>
+        </parameter>
+        <parameter name="scanner">
+          <type name="GLib.Scanner" c:type="GScanner*"/>
+        </parameter>
+        <parameter name="pixmap_file">
           <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_name" c:identifier="gtk_about_dialog_set_name">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
-          </parameter>
-          <parameter name="name" allow-none="1">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_program_name"
-              c:identifier="gtk_about_dialog_get_program_name">
-        <return-value>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_parse" c:identifier="gtk_rc_parse">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="filename">
           <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_program_name"
-              c:identifier="gtk_about_dialog_set_program_name">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_version" c:identifier="gtk_about_dialog_get_version">
-        <return-value>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_parse_string" c:identifier="gtk_rc_parse_string">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="rc_string">
           <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_version" c:identifier="gtk_about_dialog_set_version">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
-          </parameter>
-          <parameter name="version" allow-none="1">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_copyright"
-              c:identifier="gtk_about_dialog_get_copyright">
-        <return-value>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_reparse_all" c:identifier="gtk_rc_reparse_all">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+    </function>
+    <function name="rc_add_widget_name_style"
+              c:identifier="gtk_rc_add_widget_name_style">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="rc_style">
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
+        </parameter>
+        <parameter name="pattern">
           <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_copyright"
-              c:identifier="gtk_about_dialog_set_copyright">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
-          </parameter>
-          <parameter name="copyright" allow-none="1">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_comments" c:identifier="gtk_about_dialog_get_comments">
-        <return-value>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_add_widget_class_style"
+              c:identifier="gtk_rc_add_widget_class_style">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="rc_style">
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
+        </parameter>
+        <parameter name="pattern">
           <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_comments" c:identifier="gtk_about_dialog_set_comments">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
-          </parameter>
-          <parameter name="comments" allow-none="1">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_license" c:identifier="gtk_about_dialog_get_license">
-        <return-value>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_add_class_style" c:identifier="gtk_rc_add_class_style">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="rc_style">
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
+        </parameter>
+        <parameter name="pattern">
           <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_license" c:identifier="gtk_about_dialog_set_license">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
-          </parameter>
-          <parameter name="license" allow-none="1">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_wrap_license"
-              c:identifier="gtk_about_dialog_get_wrap_license">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_wrap_license"
-              c:identifier="gtk_about_dialog_set_wrap_license">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
-          </parameter>
-          <parameter name="wrap_license">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_website" c:identifier="gtk_about_dialog_get_website">
-        <return-value>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_find_module_in_path"
+              c:identifier="gtk_rc_find_module_in_path">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="module_file">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_get_theme_dir" c:identifier="gtk_rc_get_theme_dir">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+    </function>
+    <function name="rc_get_module_dir" c:identifier="gtk_rc_get_module_dir">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+    </function>
+    <function name="rc_get_im_module_path"
+              c:identifier="gtk_rc_get_im_module_path">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+    </function>
+    <function name="rc_get_im_module_file"
+              c:identifier="gtk_rc_get_im_module_file">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+    </function>
+    <function name="rc_scanner_new" c:identifier="gtk_rc_scanner_new">
+      <return-value>
+        <type name="GLib.Scanner" c:type="GScanner*"/>
+      </return-value>
+    </function>
+    <function name="rc_parse_color" c:identifier="gtk_rc_parse_color">
+      <return-value>
+        <type name="uint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="scanner">
+          <type name="GLib.Scanner" c:type="GScanner*"/>
+        </parameter>
+        <parameter name="color">
+          <type name="Gdk.Color" c:type="GdkColor*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_parse_color_full"
+              c:identifier="gtk_rc_parse_color_full">
+      <return-value>
+        <type name="uint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="scanner">
+          <type name="GLib.Scanner" c:type="GScanner*"/>
+        </parameter>
+        <parameter name="style">
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
+        </parameter>
+        <parameter name="color">
+          <type name="Gdk.Color" c:type="GdkColor*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_parse_state" c:identifier="gtk_rc_parse_state">
+      <return-value>
+        <type name="uint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="scanner">
+          <type name="GLib.Scanner" c:type="GScanner*"/>
+        </parameter>
+        <parameter name="state">
+          <type name="StateType" c:type="GtkStateType*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_parse_priority" c:identifier="gtk_rc_parse_priority">
+      <return-value>
+        <type name="uint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="scanner">
+          <type name="GLib.Scanner" c:type="GScanner*"/>
+        </parameter>
+        <parameter name="priority">
+          <type name="PathPriorityType" c:type="GtkPathPriorityType*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_style_lookup_rc_property"
+              c:identifier="_gtk_rc_style_lookup_rc_property">
+      <return-value>
+        <type name="RcProperty" c:type="GtkRcProperty*"/>
+      </return-value>
+      <parameters>
+        <parameter name="rc_style">
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
+        </parameter>
+        <parameter name="type_name">
+          <type name="GLib.Quark" c:type="GQuark"/>
+        </parameter>
+        <parameter name="property_name">
+          <type name="GLib.Quark" c:type="GQuark"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_style_set_rc_property"
+              c:identifier="_gtk_rc_style_set_rc_property">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="rc_style">
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
+        </parameter>
+        <parameter name="property">
+          <type name="RcProperty" c:type="GtkRcProperty*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_style_unset_rc_property"
+              c:identifier="_gtk_rc_style_unset_rc_property">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="rc_style">
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
+        </parameter>
+        <parameter name="type_name">
+          <type name="GLib.Quark" c:type="GQuark"/>
+        </parameter>
+        <parameter name="property_name">
+          <type name="GLib.Quark" c:type="GQuark"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_style_get_color_hashes"
+              c:identifier="_gtk_rc_style_get_color_hashes">
+      <return-value>
+        <type name="GLib.SList" c:type="GSList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="rc_style">
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_context_get_default_font_name"
+              c:identifier="_gtk_rc_context_get_default_font_name">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="settings">
+          <type name="Settings" c:type="GtkSettings*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_context_destroy" c:identifier="_gtk_rc_context_destroy">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="settings">
+          <type name="Settings" c:type="GtkSettings*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="SettingsValue" c:type="GtkSettingsValue">
+      <field name="origin">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="value">
+        <type name="GObject.Value" c:type="GValue"/>
+      </field>
+    </record>
+    <record name="SettingsPropertyValue" c:type="GtkSettingsPropertyValue"/>
+    <function name="settings_install_property"
+              c:identifier="gtk_settings_install_property">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="pspec">
+          <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="settings_install_property_parser"
+              c:identifier="gtk_settings_install_property_parser">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="pspec">
+          <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
+        </parameter>
+        <parameter name="parser">
+          <type name="RcPropertyParser" c:type="GtkRcPropertyParser"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_property_parse_color"
+              c:identifier="gtk_rc_property_parse_color">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="pspec">
+          <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
+        </parameter>
+        <parameter name="gstring">
+          <type name="GObject.String" c:type="GString*"/>
+        </parameter>
+        <parameter name="property_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_property_parse_enum"
+              c:identifier="gtk_rc_property_parse_enum">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="pspec">
+          <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
+        </parameter>
+        <parameter name="gstring">
+          <type name="GObject.String" c:type="GString*"/>
+        </parameter>
+        <parameter name="property_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_property_parse_flags"
+              c:identifier="gtk_rc_property_parse_flags">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="pspec">
+          <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
+        </parameter>
+        <parameter name="gstring">
+          <type name="GObject.String" c:type="GString*"/>
+        </parameter>
+        <parameter name="property_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_property_parse_requisition"
+              c:identifier="gtk_rc_property_parse_requisition">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="pspec">
+          <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
+        </parameter>
+        <parameter name="gstring">
+          <type name="GObject.String" c:type="GString*"/>
+        </parameter>
+        <parameter name="property_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_property_parse_border"
+              c:identifier="gtk_rc_property_parse_border">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="pspec">
+          <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
+        </parameter>
+        <parameter name="gstring">
+          <type name="GObject.String" c:type="GString*"/>
+        </parameter>
+        <parameter name="property_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="settings_set_property_value_from_rc"
+              c:identifier="_gtk_settings_set_property_value_from_rc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="settings">
+          <type name="Settings" c:type="GtkSettings*"/>
+        </parameter>
+        <parameter name="name">
           <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="svalue">
+          <type name="SettingsValue" c:type="GtkSettingsValue*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="settings_reset_rc_values"
+              c:identifier="_gtk_settings_reset_rc_values">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="settings">
+          <type name="Settings" c:type="GtkSettings*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="settings_handle_event"
+              c:identifier="_gtk_settings_handle_event">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="event">
+          <type name="Gdk.EventSetting" c:type="GdkEventSetting*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="rc_property_parser_from_type"
+              c:identifier="_gtk_rc_property_parser_from_type">
+      <return-value>
+        <type name="RcPropertyParser" c:type="GtkRcPropertyParser"/>
+      </return-value>
+      <parameters>
+        <parameter name="type">
+          <type name="GObject.Type" c:type="GType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="settings_parse_convert"
+              c:identifier="_gtk_settings_parse_convert">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="parser">
+          <type name="RcPropertyParser" c:type="GtkRcPropertyParser"/>
+        </parameter>
+        <parameter name="src_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="pspec">
+          <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
+        </parameter>
+        <parameter name="dest_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <glib:boxed c:type="GtkRequisition"
+                glib:name="Requisition"
+                glib:type-name="GtkRequisition"
+                glib:get-type="gtk_requisition_get_type">
+      <constructor name="copy" c:identifier="gtk_requisition_copy">
+        <return-value>
+          <type name="Requisition" c:type="GtkRequisition*"/>
         </return-value>
         <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
+          <parameter name="requisition">
+            <type name="Requisition" c:type="GtkRequisition*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_website" c:identifier="gtk_about_dialog_set_website">
+      </constructor>
+      <method name="free" c:identifier="gtk_requisition_free">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
-          </parameter>
-          <parameter name="website" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="requisition">
+            <type name="Requisition" c:type="GtkRequisition*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_website_label"
-              c:identifier="gtk_about_dialog_get_website_label">
+    </glib:boxed>
+    <glib:boxed c:type="GtkSelectionData"
+                glib:name="SelectionData"
+                glib:type-name="GtkSelectionData"
+                glib:get-type="gtk_selection_data_get_type">
+      <constructor name="copy" c:identifier="gtk_selection_data_copy">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
         </return-value>
         <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
+          <parameter name="data">
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_website_label"
-              c:identifier="gtk_about_dialog_set_website_label">
+      </constructor>
+      <method name="free" c:identifier="gtk_selection_data_free">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
-          </parameter>
-          <parameter name="website_label" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="data">
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_authors" c:identifier="gtk_about_dialog_get_authors">
+    </glib:boxed>
+    <record name="WidgetAuxInfo" c:type="GtkWidgetAuxInfo">
+      <field name="x">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="y">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="width">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="height">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="x_set">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="y_set">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </record>
+    <record name="WidgetShapeInfo" c:type="GtkWidgetShapeInfo">
+      <field name="offset_x">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="offset_y">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="shape_mask">
+        <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
+      </field>
+    </record>
+    <class name="Clipboard"
+           c:type="GtkClipboard"
+           parent="GObject.Object"
+           glib:type-name="GtkClipboard"
+           glib:get-type="gtk_clipboard_get_type">
+      <constructor name="get_for_display"
+                   c:identifier="gtk_clipboard_get_for_display">
         <return-value>
-          <type name="GLib.gchar" c:type="gchar**"/>
+          <type name="Clipboard" c:type="GtkClipboard*"/>
         </return-value>
         <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
+          <parameter name="display">
+            <type name="Gdk.Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="selection">
+            <type name="GdkAtom" c:type="GdkAtom"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_authors" c:identifier="gtk_about_dialog_set_authors">
+      </constructor>
+      <constructor name="get" c:identifier="gtk_clipboard_get">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Clipboard" c:type="GtkClipboard*"/>
         </return-value>
         <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
-          </parameter>
-          <parameter name="authors">
-            <type name="GLib.gchar" c:type="gchar**"/>
+          <parameter name="selection">
+            <type name="GdkAtom" c:type="GdkAtom"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_documenters"
-              c:identifier="gtk_about_dialog_get_documenters">
+      </constructor>
+      <method name="get_display" c:identifier="gtk_clipboard_get_display">
         <return-value>
-          <type name="GLib.gchar" c:type="gchar**"/>
+          <type name="Gdk.Display" c:type="GdkDisplay*"/>
         </return-value>
         <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_documenters"
-              c:identifier="gtk_about_dialog_set_documenters">
+      <method name="set_with_data" c:identifier="gtk_clipboard_set_with_data">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="documenters">
-            <type name="GLib.gchar" c:type="gchar**"/>
+          <parameter name="targets">
+            <type name="TargetEntry" c:type="GtkTargetEntry*"/>
+          </parameter>
+          <parameter name="n_targets">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="get_func">
+            <type name="ClipboardGetFunc" c:type="GtkClipboardGetFunc"/>
+          </parameter>
+          <parameter name="clear_func">
+            <type name="ClipboardClearFunc" c:type="GtkClipboardClearFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_artists" c:identifier="gtk_about_dialog_get_artists">
+      <method name="set_with_owner"
+              c:identifier="gtk_clipboard_set_with_owner">
         <return-value>
-          <type name="GLib.gchar" c:type="gchar**"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
+          </parameter>
+          <parameter name="targets">
+            <type name="TargetEntry" c:type="GtkTargetEntry*"/>
+          </parameter>
+          <parameter name="n_targets">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="get_func">
+            <type name="ClipboardGetFunc" c:type="GtkClipboardGetFunc"/>
+          </parameter>
+          <parameter name="clear_func">
+            <type name="ClipboardClearFunc" c:type="GtkClipboardClearFunc"/>
+          </parameter>
+          <parameter name="owner">
+            <type name="GObject.Object" c:type="GObject*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_artists" c:identifier="gtk_about_dialog_set_artists">
+      <method name="get_owner" c:identifier="gtk_clipboard_get_owner">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </return-value>
         <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
-          </parameter>
-          <parameter name="artists">
-            <type name="GLib.gchar" c:type="gchar**"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_translator_credits"
-              c:identifier="gtk_about_dialog_get_translator_credits">
+      <method name="clear" c:identifier="gtk_clipboard_clear">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_translator_credits"
-              c:identifier="gtk_about_dialog_set_translator_credits">
+      <method name="set_text" c:identifier="gtk_clipboard_set_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="translator_credits" allow-none="1">
+          <parameter name="text">
             <type name="string" c:type="gchar*"/>
           </parameter>
+          <parameter name="len">
+            <type name="int" c:type="gint"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="get_logo" c:identifier="gtk_about_dialog_get_logo">
+      <method name="set_image" c:identifier="gtk_clipboard_set_image">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
+          </parameter>
+          <parameter name="pixbuf">
+            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_logo" c:identifier="gtk_about_dialog_set_logo">
+      <method name="request_contents"
+              c:identifier="gtk_clipboard_request_contents">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="logo" allow-none="1">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="target">
+            <type name="GdkAtom" c:type="GdkAtom"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="ClipboardReceivedFunc"
+                  c:type="GtkClipboardReceivedFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_logo_icon_name"
-              c:identifier="gtk_about_dialog_get_logo_icon_name">
+      <method name="request_text" c:identifier="gtk_clipboard_request_text">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="ClipboardTextReceivedFunc"
+                  c:type="GtkClipboardTextReceivedFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_logo_icon_name"
-              c:identifier="gtk_about_dialog_set_logo_icon_name">
+      <method name="request_rich_text"
+              c:identifier="gtk_clipboard_request_rich_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="about">
-            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="icon_name" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="ClipboardRichTextReceivedFunc"
+                  c:type="GtkClipboardRichTextReceivedFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <property name="program-name">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="version">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="copyright">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="comments">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="website">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="website-label">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="license">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="authors">
-        <type name="GStrv" c:type="GStrv"/>
-      </property>
-      <property name="documenters">
-        <type name="GStrv" c:type="GStrv"/>
-      </property>
-      <property name="translator-credits">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="artists">
-        <type name="GStrv" c:type="GStrv"/>
-      </property>
-      <property name="logo">
-        <type name="GdkPixbuf" c:type="GdkPixbuf"/>
-      </property>
-      <property name="logo-icon-name">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="wrap-license">
-        <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="about_dialog_new" c:identifier="gtk_about_dialog_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="show_about_dialog" c:identifier="gtk_show_about_dialog">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="parent">
-          <type name="Window" c:type="GtkWindow*"/>
-        </parameter>
-        <parameter name="first_property_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <callback name="GtkAboutDialogActivateLinkFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="about">
-          <type name="AboutDialog" c:type="GtkAboutDialog*"/>
-        </parameter>
-        <parameter name="link_">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <function name="about_dialog_set_email_hook"
-              c:identifier="gtk_about_dialog_set_email_hook">
-      <return-value>
-        <type name="GtkAboutDialogActivateLinkFunc"
-              c:type="GtkAboutDialogActivateLinkFunc"/>
-      </return-value>
-      <parameters>
-        <parameter name="func">
-          <type name="GtkAboutDialogActivateLinkFunc"
-                c:type="GtkAboutDialogActivateLinkFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="destroy">
-          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="about_dialog_set_url_hook"
-              c:identifier="gtk_about_dialog_set_url_hook">
-      <return-value>
-        <type name="GtkAboutDialogActivateLinkFunc"
-              c:type="GtkAboutDialogActivateLinkFunc"/>
-      </return-value>
-      <parameters>
-        <parameter name="func">
-          <type name="GtkAboutDialogActivateLinkFunc"
-                c:type="GtkAboutDialogActivateLinkFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="destroy">
-          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="Misc"
-           c:type="GtkMisc"
-           parent="Widget"
-           glib:type-name="GtkMisc"
-           glib:get-type="gtk_misc_get_type">
-      <method name="set_alignment" c:identifier="gtk_misc_set_alignment">
+      <method name="request_image" c:identifier="gtk_clipboard_request_image">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="misc">
-            <type name="Misc" c:type="GtkMisc*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="xalign">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="callback">
+            <type name="ClipboardImageReceivedFunc"
+                  c:type="GtkClipboardImageReceivedFunc"/>
           </parameter>
-          <parameter name="yalign">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_alignment" c:identifier="gtk_misc_get_alignment">
+      <method name="request_targets"
+              c:identifier="gtk_clipboard_request_targets">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="misc">
-            <type name="Misc" c:type="GtkMisc*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="xalign">
-            <type name="GLib.gfloat" c:type="gfloat*"/>
+          <parameter name="callback">
+            <type name="ClipboardTargetsReceivedFunc"
+                  c:type="GtkClipboardTargetsReceivedFunc"/>
           </parameter>
-          <parameter name="yalign">
-            <type name="GLib.gfloat" c:type="gfloat*"/>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_padding" c:identifier="gtk_misc_set_padding">
+      <method name="wait_for_contents"
+              c:identifier="gtk_clipboard_wait_for_contents">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
         </return-value>
         <parameters>
-          <parameter name="misc">
-            <type name="Misc" c:type="GtkMisc*"/>
-          </parameter>
-          <parameter name="xpad">
-            <type name="int32" c:type="gint"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="ypad">
-            <type name="int32" c:type="gint"/>
+          <parameter name="target">
+            <type name="GdkAtom" c:type="GdkAtom"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_padding" c:identifier="gtk_misc_get_padding">
+      <method name="wait_for_text" c:identifier="gtk_clipboard_wait_for_text">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="misc">
-            <type name="Misc" c:type="GtkMisc*"/>
-          </parameter>
-          <parameter name="xpad">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="ypad">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="xalign">
-        <type name="float" c:type="gfloat"/>
-      </property>
-      <property name="yalign">
-        <type name="float" c:type="gfloat"/>
-      </property>
-      <property name="xpad">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="ypad">
-        <type name="int32" c:type="gint"/>
-      </property>
-    </class>
-    <class name="MenuShell"
-           c:type="GtkMenuShell"
-           parent="Container"
-           glib:type-name="GtkMenuShell"
-           glib:get-type="gtk_menu_shell_get_type">
-      <method name="append" c:identifier="gtk_menu_shell_append">
+      <method name="wait_for_rich_text"
+              c:identifier="gtk_clipboard_wait_for_rich_text">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="uint8" c:type="guint8*"/>
         </return-value>
         <parameters>
-          <parameter name="menu_shell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="format">
+            <type name="GdkAtom" c:type="GdkAtom*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="size_t" c:type="gsize*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="prepend" c:identifier="gtk_menu_shell_prepend">
+      <method name="wait_for_image"
+              c:identifier="gtk_clipboard_wait_for_image">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="menu_shell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert" c:identifier="gtk_menu_shell_insert">
+      <method name="wait_for_targets"
+              c:identifier="gtk_clipboard_wait_for_targets">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="menu_shell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="targets">
+            <type name="GdkAtom" c:type="GdkAtom**"/>
           </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
+          <parameter name="n_targets">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="deactivate" c:identifier="gtk_menu_shell_deactivate">
+      <method name="wait_is_text_available"
+              c:identifier="gtk_clipboard_wait_is_text_available">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="menu_shell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="select_item" c:identifier="gtk_menu_shell_select_item">
+      <method name="wait_is_rich_text_available"
+              c:identifier="gtk_clipboard_wait_is_rich_text_available">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="menu_shell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="menu_item">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="deselect" c:identifier="gtk_menu_shell_deselect">
+      <method name="wait_is_image_available"
+              c:identifier="gtk_clipboard_wait_is_image_available">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="menu_shell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="activate_item" c:identifier="gtk_menu_shell_activate_item">
+      <method name="wait_is_target_available"
+              c:identifier="gtk_clipboard_wait_is_target_available">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="menu_shell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
-          </parameter>
-          <parameter name="menu_item">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="force_deactivate">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="target">
+            <type name="GdkAtom" c:type="GdkAtom"/>
           </parameter>
         </parameters>
       </method>
-      <method name="select_first" c:identifier="gtk_menu_shell_select_first">
+      <method name="set_can_store" c:identifier="gtk_clipboard_set_can_store">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu_shell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
-          <parameter name="search_sensitive">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="targets">
+            <type name="TargetEntry" c:type="GtkTargetEntry*"/>
+          </parameter>
+          <parameter name="n_targets">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="cancel" c:identifier="gtk_menu_shell_cancel">
+      <method name="store" c:identifier="gtk_clipboard_store">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu_shell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_take_focus"
-              c:identifier="gtk_menu_shell_get_take_focus">
+      <glib:signal name="owner-change">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu_shell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_take_focus"
-              c:identifier="gtk_menu_shell_set_take_focus">
+      </glib:signal>
+    </class>
+    <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">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu_shell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
           </parameter>
-          <parameter name="take_focus">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="markup">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="take-focus">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <field name="submenu_placement">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <callback name="deactivate">
+      <method name="set_text" c:identifier="gtk_tooltip_set_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu_shell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="selection_done">
+      </method>
+      <method name="set_icon" c:identifier="gtk_tooltip_set_icon">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu_shell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
+          </parameter>
+          <parameter name="pixbuf">
+            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="move_current">
+      </method>
+      <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="menu_shell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
           </parameter>
-          <parameter name="direction">
-            <type name="MenuDirectionType" c:type="GtkMenuDirectionType"/>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="size">
+            <type name="IconSize" c:type="GtkIconSize"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="activate_current">
+      </method>
+      <method name="set_custom" c:identifier="gtk_tooltip_set_custom">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu_shell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
           </parameter>
-          <parameter name="force_hide">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="custom_widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="cancel">
+      </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="menu_shell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
+          </parameter>
+          <parameter name="rect">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="select_item">
+      </method>
+    </class>
+    <class name="Window"
+           c:type="GtkWindow"
+           parent="Bin"
+           glib:type-name="GtkWindow"
+           glib:get-type="gtk_window_get_type">
+      <constructor name="get_transient_for"
+                   c:identifier="gtk_window_get_transient_for">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Window" c:type="GtkWindow*"/>
         </return-value>
         <parameters>
-          <parameter name="menu_shell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
-          </parameter>
-          <parameter name="menu_item">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="insert">
+      </constructor>
+      <method name="set_title" c:identifier="gtk_window_set_title">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu_shell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
+          <parameter name="title">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_popup_delay">
+      </method>
+      <method name="get_title" c:identifier="gtk_window_get_title">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="menu_shell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="move_selected">
+      </method>
+      <method name="set_wmclass" c:identifier="gtk_window_set_wmclass">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu_shell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="distance">
-            <type name="int32" c:type="gint"/>
+          <parameter name="wmclass_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="wmclass_class">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
+      </method>
+      <method name="set_role" c:identifier="gtk_window_set_role">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+        <parameters>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+          <parameter name="role">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_startup_id" c:identifier="gtk_window_set_startup_id">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <glib:signal name="deactivate">
+        <parameters>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+          <parameter name="startup_id">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_role" c:identifier="gtk_window_get_role">
         <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="selection-done">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="move-current">
-        <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="MenuDirectionType" c:type="GtkMenuDirectionType"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="activate-current">
+      </method>
+      <method name="add_accel_group" c:identifier="gtk_window_add_accel_group">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+          <parameter name="accel_group">
+            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="cancel">
+      </method>
+      <method name="remove_accel_group"
+              c:identifier="gtk_window_remove_accel_group">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="cycle-focus">
+        <parameters>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+          <parameter name="accel_group">
+            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_position" c:identifier="gtk_window_set_position">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="DirectionType" c:type="GtkDirectionType"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="WindowPosition" c:type="GtkWindowPosition"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="move-selected">
+      </method>
+      <method name="activate_focus" c:identifier="gtk_window_activate_focus">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="int32" c:type="gint"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <function name="menu_shell_select_last"
-              c:identifier="_gtk_menu_shell_select_last">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="menu_shell">
-          <type name="MenuShell" c:type="GtkMenuShell*"/>
-        </parameter>
-        <parameter name="search_sensitive">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="menu_shell_activate"
-              c:identifier="_gtk_menu_shell_activate">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="menu_shell">
-          <type name="MenuShell" c:type="GtkMenuShell*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="menu_shell_get_popup_delay"
-              c:identifier="_gtk_menu_shell_get_popup_delay">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="menu_shell">
-          <type name="MenuShell" c:type="GtkMenuShell*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="menu_shell_add_mnemonic"
-              c:identifier="_gtk_menu_shell_add_mnemonic">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="menu_shell">
-          <type name="MenuShell" c:type="GtkMenuShell*"/>
-        </parameter>
-        <parameter name="keyval">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="target">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="menu_shell_remove_mnemonic"
-              c:identifier="_gtk_menu_shell_remove_mnemonic">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="menu_shell">
-          <type name="MenuShell" c:type="GtkMenuShell*"/>
-        </parameter>
-        <parameter name="keyval">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="target">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <callback name="GtkMenuPositionFunc">
-      <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>
-    </callback>
-    <callback name="GtkMenuDetachFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="attach_widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="menu">
-          <type name="Menu" c:type="GtkMenu*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <class name="Menu"
-           c:type="GtkMenu"
-           parent="MenuShell"
-           glib:type-name="GtkMenu"
-           glib:get-type="gtk_menu_get_type">
-      <method name="popup" c:identifier="gtk_menu_popup">
+      </method>
+      <method name="set_focus" c:identifier="gtk_window_set_focus">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
-          </parameter>
-          <parameter name="parent_menu_shell">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="parent_menu_item">
+          <parameter name="focus" allow-none="1">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="func">
-            <type name="GtkMenuPositionFunc" c:type="GtkMenuPositionFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-          <parameter name="button">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="activate_time">
-            <type name="uint32" c:type="guint32"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="reposition" c:identifier="gtk_menu_reposition">
+      <method name="get_focus" c:identifier="gtk_window_get_focus">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="popdown" c:identifier="gtk_menu_popdown">
+      <method name="set_default" c:identifier="gtk_window_set_default">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+          <parameter name="default_widget" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_active" c:identifier="gtk_menu_get_active">
+      <method name="activate_default"
+              c:identifier="gtk_window_activate_default">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_active" c:identifier="gtk_menu_set_active">
+      <method name="set_transient_for"
+              c:identifier="gtk_window_set_transient_for">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="index_">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="parent" allow-none="1">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_accel_group" c:identifier="gtk_menu_set_accel_group">
+      <method name="set_opacity" c:identifier="gtk_window_set_opacity">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="accel_group" allow-none="1">
-            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+          <parameter name="opacity">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_accel_group" c:identifier="gtk_menu_get_accel_group">
+      <method name="get_opacity" c:identifier="gtk_window_get_opacity">
         <return-value>
-          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_accel_path" c:identifier="gtk_menu_set_accel_path">
+      <method name="set_type_hint" c:identifier="gtk_window_set_type_hint">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="accel_path" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="hint">
+            <type name="Gdk.WindowTypeHint" c:type="GdkWindowTypeHint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="attach_to_widget" c:identifier="gtk_menu_attach_to_widget">
+      <method name="get_type_hint" c:identifier="gtk_window_get_type_hint">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Gdk.WindowTypeHint" c:type="GdkWindowTypeHint"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
-          </parameter>
-          <parameter name="attach_widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="detacher">
-            <type name="GtkMenuDetachFunc" c:type="GtkMenuDetachFunc"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="detach" c:identifier="gtk_menu_detach">
+      <method name="set_skip_taskbar_hint"
+              c:identifier="gtk_window_set_skip_taskbar_hint">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_attach_widget"
-              c:identifier="gtk_menu_get_attach_widget">
+      <method name="get_skip_taskbar_hint"
+              c:identifier="gtk_window_get_skip_taskbar_hint">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tearoff_state"
-              c:identifier="gtk_menu_set_tearoff_state">
+      <method name="set_skip_pager_hint"
+              c:identifier="gtk_window_set_skip_pager_hint">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="torn_off">
+          <parameter name="setting">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_tearoff_state"
-              c:identifier="gtk_menu_get_tearoff_state">
+      <method name="get_skip_pager_hint"
+              c:identifier="gtk_window_get_skip_pager_hint">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_title" c:identifier="gtk_menu_set_title">
+      <method name="set_urgency_hint"
+              c:identifier="gtk_window_set_urgency_hint">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="title">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_title" c:identifier="gtk_menu_get_title">
+      <method name="get_urgency_hint"
+              c:identifier="gtk_window_get_urgency_hint">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="reorder_child" c:identifier="gtk_menu_reorder_child">
+      <method name="set_accept_focus"
+              c:identifier="gtk_window_set_accept_focus">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_screen" c:identifier="gtk_menu_set_screen">
+      <method name="get_accept_focus"
+              c:identifier="gtk_window_get_accept_focus">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
-          </parameter>
-          <parameter name="screen" allow-none="1">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="attach" c:identifier="gtk_menu_attach">
+      <method name="set_focus_on_map"
+              c:identifier="gtk_window_set_focus_on_map">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
-          </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 name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="bottom_attach">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_monitor" c:identifier="gtk_menu_set_monitor">
+      <method name="get_focus_on_map"
+              c:identifier="gtk_window_get_focus_on_map">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
-          </parameter>
-          <parameter name="monitor_num">
-            <type name="int32" c:type="gint"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="tearoff-state">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="tearoff-title">
-        <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>
-      <glib:signal name="move-scroll">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="ScrollType" c:type="GtkScrollType"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </class>
-    <function name="menu_new" c:identifier="gtk_menu_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="menu_get_for_attach_widget"
-              c:identifier="gtk_menu_get_for_attach_widget">
-      <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkLabelSelectionInfo" c:type="GtkLabelSelectionInfo"/>
-    <class name="Label"
-           c:type="GtkLabel"
-           parent="Misc"
-           glib:type-name="GtkLabel"
-           glib:get-type="gtk_label_get_type">
-      <method name="set_text" c:identifier="gtk_label_set_text">
+      <method name="set_destroy_with_parent"
+              c:identifier="gtk_window_set_destroy_with_parent">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="str">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_text" c:identifier="gtk_label_get_text">
+      <method name="get_destroy_with_parent"
+              c:identifier="gtk_window_get_destroy_with_parent">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_attributes" c:identifier="gtk_label_set_attributes">
+      <method name="set_resizable" c:identifier="gtk_window_set_resizable">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="attrs">
-            <type name="PangoAttrList" c:type="PangoAttrList*"/>
+          <parameter name="resizable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_attributes" c:identifier="gtk_label_get_attributes">
+      <method name="get_resizable" c:identifier="gtk_window_get_resizable">
         <return-value>
-          <type name="PangoAttrList" c:type="PangoAttrList*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_label" c:identifier="gtk_label_set_label">
+      <method name="set_gravity" c:identifier="gtk_window_set_gravity">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="str">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="gravity">
+            <type name="Gdk.Gravity" c:type="GdkGravity"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_label" c:identifier="gtk_label_get_label">
+      <method name="get_gravity" c:identifier="gtk_window_get_gravity">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="Gdk.Gravity" c:type="GdkGravity"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_markup" c:identifier="gtk_label_set_markup">
+      <method name="set_geometry_hints"
+              c:identifier="gtk_window_set_geometry_hints">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="str">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="geometry_widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="geometry">
+            <type name="Gdk.Geometry" c:type="GdkGeometry*"/>
+          </parameter>
+          <parameter name="geom_mask">
+            <type name="Gdk.WindowHints" c:type="GdkWindowHints"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_use_markup" c:identifier="gtk_label_set_use_markup">
+      <method name="set_screen" c:identifier="gtk_window_set_screen">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_use_markup" c:identifier="gtk_label_get_use_markup">
+      <method name="get_screen" c:identifier="gtk_window_get_screen">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Gdk.Screen" c:type="GdkScreen*"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_use_underline"
-              c:identifier="gtk_label_set_use_underline">
+      <method name="is_active" c:identifier="gtk_window_is_active">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_use_underline"
-              c:identifier="gtk_label_get_use_underline">
+      <method name="has_toplevel_focus"
+              c:identifier="gtk_window_has_toplevel_focus">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_markup_with_mnemonic"
-              c:identifier="gtk_label_set_markup_with_mnemonic">
+      <method name="set_has_frame" c:identifier="gtk_window_set_has_frame">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="str">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_mnemonic_keyval"
-              c:identifier="gtk_label_get_mnemonic_keyval">
+      <method name="get_has_frame" c:identifier="gtk_window_get_has_frame">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_mnemonic_widget"
-              c:identifier="gtk_label_set_mnemonic_widget">
+      <method name="set_frame_dimensions"
+              c:identifier="gtk_window_set_frame_dimensions">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="widget" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="left">
+            <type name="int" c:type="gint"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_mnemonic_widget"
-              c:identifier="gtk_label_get_mnemonic_widget">
-        <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="top">
+            <type name="int" c:type="gint"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="set_text_with_mnemonic"
-              c:identifier="gtk_label_set_text_with_mnemonic">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="right">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="str">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="bottom">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_justify" c:identifier="gtk_label_set_justify">
+      <method name="get_frame_dimensions"
+              c:identifier="gtk_window_get_frame_dimensions">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="jtype">
-            <type name="Justification" c:type="GtkJustification"/>
+          <parameter name="left">
+            <type name="int" c:type="gint*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_justify" c:identifier="gtk_label_get_justify">
-        <return-value>
-          <type name="Justification" c:type="GtkJustification"/>
-        </return-value>
-        <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="top">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="right">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="bottom">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_ellipsize" c:identifier="gtk_label_set_ellipsize">
+      <method name="set_decorated" c:identifier="gtk_window_set_decorated">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="mode">
-            <type name="PangoEllipsizeMode" c:type="PangoEllipsizeMode"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_ellipsize" c:identifier="gtk_label_get_ellipsize">
+      <method name="get_decorated" c:identifier="gtk_window_get_decorated">
         <return-value>
-          <type name="PangoEllipsizeMode" c:type="PangoEllipsizeMode"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_width_chars" c:identifier="gtk_label_set_width_chars">
+      <method name="set_deletable" c:identifier="gtk_window_set_deletable">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="n_chars">
-            <type name="int32" c:type="gint"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_width_chars" c:identifier="gtk_label_get_width_chars">
+      <method name="get_deletable" c:identifier="gtk_window_get_deletable">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_max_width_chars"
-              c:identifier="gtk_label_set_max_width_chars">
+      <method name="set_icon_list" c:identifier="gtk_window_set_icon_list">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="n_chars">
-            <type name="int32" c:type="gint"/>
+          <parameter name="list">
+            <type name="GLib.List" c:type="GList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_max_width_chars"
-              c:identifier="gtk_label_get_max_width_chars">
+      <method name="get_icon_list" c:identifier="gtk_window_get_icon_list">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_pattern" c:identifier="gtk_label_set_pattern">
+      <method name="set_icon" c:identifier="gtk_window_set_icon">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="pattern">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="icon" allow-none="1">
+            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_line_wrap" c:identifier="gtk_label_set_line_wrap">
+      <method name="set_icon_name" c:identifier="gtk_window_set_icon_name">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="wrap">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="name" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_line_wrap" c:identifier="gtk_label_get_line_wrap">
+      <method name="set_icon_from_file"
+              c:identifier="gtk_window_set_icon_from_file">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+          <parameter name="filename">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="err">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_line_wrap_mode"
-              c:identifier="gtk_label_set_line_wrap_mode">
+      <method name="get_icon" c:identifier="gtk_window_get_icon">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
-          </parameter>
-          <parameter name="wrap_mode">
-            <type name="PangoWrapMode" c:type="PangoWrapMode"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_line_wrap_mode"
-              c:identifier="gtk_label_get_line_wrap_mode">
+      <method name="get_icon_name" c:identifier="gtk_window_get_icon_name">
         <return-value>
-          <type name="PangoWrapMode" c:type="PangoWrapMode"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_selectable" c:identifier="gtk_label_set_selectable">
+      <method name="set_modal" c:identifier="gtk_window_set_modal">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="setting">
+          <parameter name="modal">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_selectable" c:identifier="gtk_label_get_selectable">
+      <method name="get_modal" c:identifier="gtk_window_get_modal">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_angle" c:identifier="gtk_label_set_angle">
+      <method name="add_mnemonic" c:identifier="gtk_window_add_mnemonic">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="angle">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="keyval">
+            <type name="uint" c:type="guint"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_angle" c:identifier="gtk_label_get_angle">
-        <return-value>
-          <type name="double" c:type="gdouble"/>
-        </return-value>
-        <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="target">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="select_region" c:identifier="gtk_label_select_region">
+      <method name="remove_mnemonic" c:identifier="gtk_window_remove_mnemonic">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="start_offset">
-            <type name="int32" c:type="gint"/>
+          <parameter name="keyval">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="end_offset">
-            <type name="int32" c:type="gint"/>
+          <parameter name="target">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_selection_bounds"
-              c:identifier="gtk_label_get_selection_bounds">
+      <method name="mnemonic_activate"
+              c:identifier="gtk_window_mnemonic_activate">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="start">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="keyval">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="end">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="modifier">
+            <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_layout" c:identifier="gtk_label_get_layout">
+      <method name="set_mnemonic_modifier"
+              c:identifier="gtk_window_set_mnemonic_modifier">
         <return-value>
-          <type name="Pango.Layout" c:type="PangoLayout*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+          <parameter name="modifier">
+            <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_layout_offsets"
-              c:identifier="gtk_label_get_layout_offsets">
+      <method name="get_mnemonic_modifier"
+              c:identifier="gtk_window_get_mnemonic_modifier">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_single_line_mode"
-              c:identifier="gtk_label_set_single_line_mode">
+      <method name="activate_key" c:identifier="gtk_window_activate_key">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="single_line_mode">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="event">
+            <type name="Gdk.EventKey" c:type="GdkEventKey*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_single_line_mode"
-              c:identifier="gtk_label_get_single_line_mode">
+      <method name="propagate_key_event"
+              c:identifier="gtk_window_propagate_key_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventKey" c:type="GdkEventKey*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get" c:identifier="gtk_label_get">
+      <method name="present" c:identifier="gtk_window_present">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
-          </parameter>
-          <parameter name="str">
-            <type name="GLib.gchar" c:type="gchar**"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="parse_uline" c:identifier="gtk_label_parse_uline">
+      <method name="present_with_time"
+              c:identifier="gtk_window_present_with_time">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="string">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="timestamp">
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
       </method>
-      <property name="label">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="attributes">
-        <type name="PangoAttrList" c:type="PangoAttrList"/>
-      </property>
-      <property name="use-markup">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="use-underline">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="justify">
-        <type name="Justification" c:type="GtkJustification"/>
-      </property>
-      <property name="pattern">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="wrap">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="wrap-mode">
-        <type name="PangoWrapMode" c:type="PangoWrapMode"/>
-      </property>
-      <property name="selectable">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="mnemonic-keyval">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <property name="mnemonic-widget">
-        <type name="Widget" c:type="GtkWidget"/>
-      </property>
-      <property name="cursor-position">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="selection-bound">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="ellipsize">
-        <type name="PangoEllipsizeMode" c:type="PangoEllipsizeMode"/>
-      </property>
-      <property name="width-chars">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="single-line-mode">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="angle">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <property name="max-width-chars">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <callback name="move_cursor">
+      <method name="iconify" c:identifier="gtk_window_iconify">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
-          </parameter>
-          <parameter name="step">
-            <type name="MovementStep" c:type="GtkMovementStep"/>
-          </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="extend_selection">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="copy_clipboard">
+      </method>
+      <method name="deiconify" c:identifier="gtk_window_deiconify">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="populate_popup">
+      </method>
+      <method name="stick" c:identifier="gtk_window_stick">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="label">
-            <type name="Label" c:type="GtkLabel*"/>
-          </parameter>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </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-cursor">
+      </method>
+      <method name="unstick" c:identifier="gtk_window_unstick">
         <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 name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="copy-clipboard">
+      </method>
+      <method name="maximize" c:identifier="gtk_window_maximize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="populate-popup">
+        <parameters>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unmaximize" c:identifier="gtk_window_unmaximize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Menu" c:type="GtkMenu"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <function name="label_new" c:identifier="gtk_label_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="str">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="label_new_with_mnemonic"
-              c:identifier="gtk_label_new_with_mnemonic">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="str">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="AccelLabel"
-           c:type="GtkAccelLabel"
-           parent="Label"
-           glib:type-name="GtkAccelLabel"
-           glib:get-type="gtk_accel_label_get_type">
-      <method name="get_accel_widget"
-              c:identifier="gtk_accel_label_get_accel_widget">
+      </method>
+      <method name="fullscreen" c:identifier="gtk_window_fullscreen">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="accel_label">
-            <type name="AccelLabel" c:type="GtkAccelLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_accel_width"
-              c:identifier="gtk_accel_label_get_accel_width">
+      <method name="unfullscreen" c:identifier="gtk_window_unfullscreen">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="accel_label">
-            <type name="AccelLabel" c:type="GtkAccelLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_accel_widget"
-              c:identifier="gtk_accel_label_set_accel_widget">
+      <method name="set_keep_above" c:identifier="gtk_window_set_keep_above">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="accel_label">
-            <type name="AccelLabel" c:type="GtkAccelLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="accel_widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_accel_closure"
-              c:identifier="gtk_accel_label_set_accel_closure">
+      <method name="set_keep_below" c:identifier="gtk_window_set_keep_below">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="accel_label">
-            <type name="AccelLabel" c:type="GtkAccelLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="accel_closure">
-            <type name="GObject.GClosure" c:type="GClosure*"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="refetch" c:identifier="gtk_accel_label_refetch">
+      <method name="begin_resize_drag"
+              c:identifier="gtk_window_begin_resize_drag">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="accel_label">
-            <type name="AccelLabel" c:type="GtkAccelLabel*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+          <parameter name="edge">
+            <type name="Gdk.WindowEdge" c:type="GdkWindowEdge"/>
+          </parameter>
+          <parameter name="button">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="root_x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="root_y">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="timestamp">
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
       </method>
-      <property name="accel-closure">
-        <type name="GObject.GClosure" c:type="GClosure"/>
-      </property>
-      <property name="accel-widget">
-        <type name="Widget" c:type="GtkWidget"/>
-      </property>
-      <field name="signal_quote1">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="signal_quote2">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="mod_name_shift">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="mod_name_control">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="mod_name_alt">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="mod_separator">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="accel_seperator">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="latin1_to_char">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <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="accel_label_new" c:identifier="gtk_accel_label_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="string">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="accel_label_class_get_accelerator_label"
-              c:identifier="_gtk_accel_label_class_get_accelerator_label">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="klass">
-          <type name="GtkAccelLabelClass" c:type="GtkAccelLabelClass*"/>
-        </parameter>
-        <parameter name="accelerator_key">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="accelerator_mods">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <callback name="GtkAccelMapForeach">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="accel_path">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="accel_key">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="accel_mods">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
-        </parameter>
-        <parameter name="changed">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <function name="accel_map_add_entry"
-              c:identifier="gtk_accel_map_add_entry">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="accel_path">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="accel_key">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="accel_mods">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="accel_map_lookup_entry"
-              c:identifier="gtk_accel_map_lookup_entry">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="accel_path">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="key">
-          <type name="GtkAccelKey" c:type="GtkAccelKey*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="accel_map_change_entry"
-              c:identifier="gtk_accel_map_change_entry">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="accel_path">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="accel_key">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="accel_mods">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
-        </parameter>
-        <parameter name="replace">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="accel_map_load" c:identifier="gtk_accel_map_load">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="accel_map_save" c:identifier="gtk_accel_map_save">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="file_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="accel_map_foreach" c:identifier="gtk_accel_map_foreach">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="foreach_func">
-          <type name="GtkAccelMapForeach" c:type="GtkAccelMapForeach"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="accel_map_load_fd" c:identifier="gtk_accel_map_load_fd">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="fd">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="accel_map_load_scanner"
-              c:identifier="gtk_accel_map_load_scanner">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="scanner">
-          <type name="GLib.GScanner" c:type="GScanner*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="accel_map_save_fd" c:identifier="gtk_accel_map_save_fd">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="fd">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="accel_map_lock_path"
-              c:identifier="gtk_accel_map_lock_path">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="accel_path">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="accel_map_unlock_path"
-              c:identifier="gtk_accel_map_unlock_path">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="accel_path">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="accel_map_add_filter"
-              c:identifier="gtk_accel_map_add_filter">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="filter_pattern">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="accel_map_foreach_unfiltered"
-              c:identifier="gtk_accel_map_foreach_unfiltered">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="foreach_func">
-          <type name="GtkAccelMapForeach" c:type="GtkAccelMapForeach"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="AccelMap"
-           c:type="GtkAccelMap"
-           parent="GObject.Object"
-           glib:type-name="GtkAccelMap"
-           glib:get-type="gtk_accel_map_get_type">
-      <constructor name="get" c:identifier="gtk_accel_map_get">
-        <return-value>
-          <type name="AccelMap" c:type="GtkAccelMap*"/>
-        </return-value>
-      </constructor>
-      <glib:signal name="changed">
+      <method name="begin_move_drag" c:identifier="gtk_window_begin_move_drag">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="string" c:type="gchararray"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="button">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="p1">
-            <type name="GdkModifierType" c:type="GdkModifierType"/>
+          <parameter name="root_x">
+            <type name="int" c:type="gint"/>
           </parameter>
-        </parameters>
-      </glib:signal>
-    </class>
-    <function name="accel_map_init" c:identifier="_gtk_accel_map_init">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="accel_map_add_group"
-              c:identifier="_gtk_accel_map_add_group">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="accel_path">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="accel_group">
-          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="accel_map_remove_group"
-              c:identifier="_gtk_accel_map_remove_group">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="accel_path">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="accel_group">
-          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="accel_path_is_valid"
-              c:identifier="_gtk_accel_path_is_valid">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="accel_path">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="Accessible"
-           c:type="GtkAccessible"
-           parent="Atk.Object"
-           glib:type-name="GtkAccessible"
-           glib:get-type="gtk_accessible_get_type">
-      <method name="connect_widget_destroyed"
-              c:identifier="gtk_accessible_connect_widget_destroyed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="accessible">
-            <type name="Accessible" c:type="GtkAccessible*"/>
+          <parameter name="root_y">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="timestamp">
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
       </method>
-      <callback name="connect_widget_destroyed">
+      <method name="set_policy" c:identifier="gtk_window_set_policy">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="accessible">
-            <type name="Accessible" c:type="GtkAccessible*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+          <parameter name="allow_shrink">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="allow_grow">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="auto_shrink">
+            <type name="int" c:type="gint"/>
           </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">
+      </method>
+      <method name="set_default_size"
+              c:identifier="gtk_window_set_default_size">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-    </class>
-    <record name="GtkActionPrivate" c:type="GtkActionPrivate"/>
-    <class name="Action"
-           c:type="GtkAction"
-           parent="GObject.Object"
-           glib:type-name="GtkAction"
-           glib:get-type="gtk_action_get_type">
-      <constructor name="new" c:identifier="gtk_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 name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="tooltip">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="width">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="stock_id">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="height">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="group_get_action"
-                   c:identifier="gtk_action_group_get_action">
+      </method>
+      <method name="get_default_size"
+              c:identifier="gtk_window_get_default_size">
         <return-value>
-          <type name="Action" c:type="GtkAction*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="action_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="width">
+            <type name="int" c:type="gint*"/>
           </parameter>
-        </parameters>
-      </constructor>
-      <method name="get_name" c:identifier="gtk_action_get_name">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
+          <parameter name="height">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="is_sensitive" c:identifier="gtk_action_is_sensitive">
+      <method name="resize" c:identifier="gtk_window_resize">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+          <parameter name="width">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="height">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_sensitive" c:identifier="gtk_action_get_sensitive">
+      <method name="get_size" c:identifier="gtk_window_get_size">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+          <parameter name="width" direction="out">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="height" direction="out">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_sensitive" c:identifier="gtk_action_set_sensitive">
+      <method name="move" c:identifier="gtk_window_move">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="sensitive">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="is_visible" c:identifier="gtk_action_is_visible">
+      <method name="get_position" c:identifier="gtk_window_get_position">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+          <parameter name="root_x">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="root_y">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_visible" c:identifier="gtk_action_get_visible">
+      <method name="parse_geometry" c:identifier="gtk_window_parse_geometry">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+          <parameter name="geometry">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_visible" c:identifier="gtk_action_set_visible">
+      <method name="get_group" c:identifier="gtk_window_get_group">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="WindowGroup" c:type="GtkWindowGroup*"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
-          </parameter>
-          <parameter name="visible">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="activate" c:identifier="gtk_action_activate">
+      <method name="reshow_with_initial_size"
+              c:identifier="gtk_window_reshow_with_initial_size">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="create_icon" c:identifier="gtk_action_create_icon">
+      <method name="remove_embedded_xid"
+              c:identifier="gtk_window_remove_embedded_xid">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="icon_size">
-            <type name="IconSize" c:type="GtkIconSize"/>
+          <parameter name="xid">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="create_menu_item"
-              c:identifier="gtk_action_create_menu_item">
+      <method name="add_embedded_xid"
+              c:identifier="gtk_window_add_embedded_xid">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+          <parameter name="xid">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="create_tool_item"
-              c:identifier="gtk_action_create_tool_item">
-        <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="create_menu" c:identifier="gtk_action_create_menu">
-        <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="connect_proxy" c:identifier="gtk_action_connect_proxy">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
-          </parameter>
-          <parameter name="proxy">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="disconnect_proxy"
-              c:identifier="gtk_action_disconnect_proxy">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
-          </parameter>
-          <parameter name="proxy">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_proxies" c:identifier="gtk_action_get_proxies">
-        <return-value>
-          <type name="GLib.GSList" c:type="GSList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="connect_accelerator"
-              c:identifier="gtk_action_connect_accelerator">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="disconnect_accelerator"
-              c:identifier="gtk_action_disconnect_accelerator">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_accel_path" c:identifier="gtk_action_get_accel_path">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_accel_closure"
-              c:identifier="gtk_action_get_accel_closure">
-        <return-value>
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="block_activate_from"
-              c:identifier="gtk_action_block_activate_from">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
-          </parameter>
-          <parameter name="proxy">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="unblock_activate_from"
-              c:identifier="gtk_action_unblock_activate_from">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
-          </parameter>
-          <parameter name="proxy">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_accel_path" c:identifier="gtk_action_set_accel_path">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
-          </parameter>
-          <parameter name="accel_path">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_accel_group" c:identifier="gtk_action_set_accel_group">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
-          </parameter>
-          <parameter name="accel_group" allow-none="1">
-            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="name">
-        <type name="string" c:type="gchararray"/>
+      <property name="type">
+        <type name="WindowType" c:type="GtkWindowType"/>
       </property>
-      <property name="label">
+      <property name="title">
         <type name="string" c:type="gchararray"/>
       </property>
-      <property name="short-label">
+      <property name="startup-id">
         <type name="string" c:type="gchararray"/>
       </property>
-      <property name="tooltip">
+      <property name="role">
         <type name="string" c:type="gchararray"/>
       </property>
-      <property name="stock-id">
-        <type name="string" c:type="gchararray"/>
+      <property name="allow-shrink">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="allow-grow">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="resizable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="modal">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="window-position">
+        <type name="WindowPosition" c:type="GtkWindowPosition"/>
+      </property>
+      <property name="default-width">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="default-height">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="destroy-with-parent">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="icon">
+        <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf"/>
       </property>
       <property name="icon-name">
         <type name="string" c:type="gchararray"/>
       </property>
-      <property name="visible-horizontal">
+      <property name="screen">
+        <type name="Gdk.Screen" c:type="GdkScreen"/>
+      </property>
+      <property name="type-hint">
+        <type name="Gdk.WindowTypeHint" c:type="GdkWindowTypeHint"/>
+      </property>
+      <property name="skip-taskbar-hint">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="visible-vertical">
+      <property name="skip-pager-hint">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="visible-overflown">
+      <property name="urgency-hint">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="is-important">
+      <property name="accept-focus">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="hide-if-empty">
+      <property name="focus-on-map">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="sensitive">
+      <property name="decorated">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="visible">
+      <property name="deletable">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="action-group">
-        <type name="ActionGroup" c:type="GtkActionGroup"/>
+      <property name="gravity">
+        <type name="Gdk.Gravity" c:type="GdkGravity"/>
+      </property>
+      <property name="transient-for">
+        <type name="Window" c:type="GtkWindow"/>
+      </property>
+      <property name="opacity">
+        <type name="double" c:type="gdouble"/>
       </property>
-      <callback name="activate">
+      <property name="is-active">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="has-toplevel-focus">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="set_focus" c:type="set_focus">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+          <parameter name="focus">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
-      <field name="menu_item_type">
-        <type name="GObject.GType" c:type="GType"/>
-      </field>
-      <field name="toolbar_item_type">
-        <type name="GObject.GType" c:type="GType"/>
-      </field>
-      <callback name="create_menu_item">
+      <callback name="frame_event" c:type="frame_event">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.Event" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="create_tool_item">
+      <callback name="activate_focus" c:type="activate_focus">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="connect_proxy">
+      <callback name="activate_default" c:type="activate_default">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
-          </parameter>
-          <parameter name="proxy">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="disconnect_proxy">
+      <callback name="move_focus" c:type="move_focus">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
-          <parameter name="proxy">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="direction">
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="create_menu">
+      <callback name="keys_changed" c:type="keys_changed">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="activate">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="set-focus">
+        <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="frame-event">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="activate-focus">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="activate-default">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="keys-changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
     </class>
-    <function name="action_emit_activate"
-              c:identifier="_gtk_action_emit_activate">
+    <callback name="Callback" c:type="GtkCallback">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="action">
-          <type name="Action" c:type="GtkAction*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <function name="widget_get_accel_path"
+              c:identifier="_gtk_widget_get_accel_path">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="locked">
+          <type name="boolean" c:type="gboolean*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="action_sync_sensitive"
-              c:identifier="_gtk_action_sync_sensitive">
+    <function name="widget_push_colormap"
+              c:identifier="gtk_widget_push_colormap">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="action">
-          <type name="Action" c:type="GtkAction*"/>
+        <parameter name="cmap">
+          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="action_sync_visible"
-              c:identifier="_gtk_action_sync_visible">
+    <function name="widget_push_composite_child"
+              c:identifier="gtk_widget_push_composite_child">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="widget_pop_composite_child"
+              c:identifier="gtk_widget_pop_composite_child">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="widget_pop_colormap"
+              c:identifier="gtk_widget_pop_colormap">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="widget_class_install_style_property"
+              c:identifier="gtk_widget_class_install_style_property">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="action">
-          <type name="Action" c:type="GtkAction*"/>
+        <parameter name="klass">
+          <type name="WidgetClass" c:type="GtkWidgetClass*"/>
+        </parameter>
+        <parameter name="pspec">
+          <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="action_sync_menu_visible"
-              c:identifier="_gtk_action_sync_menu_visible">
+    <function name="widget_class_install_style_property_parser"
+              c:identifier="gtk_widget_class_install_style_property_parser">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="action">
-          <type name="Action" c:type="GtkAction*"/>
+        <parameter name="klass">
+          <type name="WidgetClass" c:type="GtkWidgetClass*"/>
         </parameter>
-        <parameter name="proxy">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="pspec">
+          <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
         </parameter>
-        <parameter name="empty">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="parser">
+          <type name="RcPropertyParser" c:type="GtkRcPropertyParser"/>
         </parameter>
       </parameters>
     </function>
-    <callback name="GtkTranslateFunc">
+    <function name="widget_class_find_style_property"
+              c:identifier="gtk_widget_class_find_style_property">
       <return-value>
-        <type name="string" c:type="gchar*"/>
+        <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="path">
+        <parameter name="klass">
+          <type name="WidgetClass" c:type="GtkWidgetClass*"/>
+        </parameter>
+        <parameter name="property_name">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="func_data">
-          <type name="any" c:type="gpointer"/>
+      </parameters>
+    </function>
+    <function name="widget_class_list_style_properties"
+              c:identifier="gtk_widget_class_list_style_properties">
+      <return-value>
+        <type name="GObject.ParamSpec" c:type="GParamSpec**"/>
+      </return-value>
+      <parameters>
+        <parameter name="klass">
+          <type name="WidgetClass" c:type="GtkWidgetClass*"/>
+        </parameter>
+        <parameter name="n_properties">
+          <type name="uint" c:type="guint*"/>
         </parameter>
       </parameters>
-    </callback>
-    <callback name="GtkPrintFunc">
+    </function>
+    <function name="widget_set_default_colormap"
+              c:identifier="gtk_widget_set_default_colormap">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="func_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="colormap">
+          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
         </parameter>
-        <parameter name="str">
-          <type name="string" c:type="gchar*"/>
+      </parameters>
+    </function>
+    <function name="widget_get_default_style"
+              c:identifier="gtk_widget_get_default_style">
+      <return-value>
+        <type name="Style" c:type="GtkStyle*"/>
+      </return-value>
+    </function>
+    <function name="widget_get_default_colormap"
+              c:identifier="gtk_widget_get_default_colormap">
+      <return-value>
+        <type name="Gdk.Colormap" c:type="GdkColormap*"/>
+      </return-value>
+    </function>
+    <function name="widget_get_default_visual"
+              c:identifier="gtk_widget_get_default_visual">
+      <return-value>
+        <type name="Gdk.Visual" c:type="GdkVisual*"/>
+      </return-value>
+    </function>
+    <function name="widget_set_default_direction"
+              c:identifier="gtk_widget_set_default_direction">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="dir">
+          <type name="TextDirection" c:type="GtkTextDirection"/>
         </parameter>
       </parameters>
-    </callback>
-    <callback name="GtkItemFactoryCallback">
+    </function>
+    <function name="widget_get_default_direction"
+              c:identifier="gtk_widget_get_default_direction">
+      <return-value>
+        <type name="TextDirection" c:type="GtkTextDirection"/>
+      </return-value>
+    </function>
+    <function name="widget_grab_notify" c:identifier="_gtk_widget_grab_notify">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
-    </callback>
-    <callback name="GtkItemFactoryCallback1">
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="was_grabbed">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="widget_get_aux_info"
+              c:identifier="_gtk_widget_get_aux_info">
+      <return-value>
+        <type name="WidgetAuxInfo" c:type="GtkWidgetAuxInfo*"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="create">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="widget_propagate_hierarchy_changed"
+              c:identifier="_gtk_widget_propagate_hierarchy_changed">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="callback_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="callback_action">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="previous_toplevel">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
+      </parameters>
+    </function>
+    <function name="widget_propagate_screen_changed"
+              c:identifier="_gtk_widget_propagate_screen_changed">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
         <parameter name="widget">
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
+        <parameter name="previous_screen">
+          <type name="Gdk.Screen" c:type="GdkScreen*"/>
+        </parameter>
       </parameters>
-    </callback>
-    <record name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry">
-      <field name="path">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="accelerator">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="callback">
-        <type name="GtkItemFactoryCallback" c:type="GtkItemFactoryCallback"/>
-      </field>
-      <field name="callback_action">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="item_type">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="extra_data">
-        <type name="any" c:type="gconstpointer"/>
-      </field>
-    </record>
-    <record name="GtkItemFactoryItem" c:type="GtkItemFactoryItem">
-      <field name="path">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="widgets">
-        <type name="GLib.GSList" c:type="GSList*"/>
-      </field>
-    </record>
-    <class name="ItemFactory"
-           c:type="GtkItemFactory"
-           parent="GtkObject"
-           glib:type-name="GtkItemFactory"
-           glib:get-type="gtk_item_factory_get_type">
-      <constructor name="new" c:identifier="gtk_item_factory_new">
-        <return-value>
-          <type name="ItemFactory" c:type="GtkItemFactory*"/>
+    </function>
+    <function name="widget_propagate_composited_changed"
+              c:identifier="_gtk_widget_propagate_composited_changed">
+      <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="widget_peek_colormap"
+              c:identifier="_gtk_widget_peek_colormap">
+      <return-value>
+        <type name="Gdk.Colormap" c:type="GdkColormap*"/>
+      </return-value>
+    </function>
+    <class name="Container"
+           c:type="GtkContainer"
+           parent="Widget"
+           glib:type-name="GtkContainer"
+           glib:get-type="gtk_container_get_type">
+      <method name="set_border_width"
+              c:identifier="gtk_container_set_border_width">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="container_type">
-            <type name="GObject.GType" c:type="GType"/>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
-          <parameter name="path">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="border_width">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="accel_group" allow-none="1">
-            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+        </parameters>
+      </method>
+      <method name="get_border_width"
+              c:identifier="gtk_container_get_border_width">
+        <return-value>
+          <type name="uint" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="from_widget"
-                   c:identifier="gtk_item_factory_from_widget">
+      </method>
+      <method name="add" c:identifier="gtk_container_add">
         <return-value>
-          <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
+          </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="from_path" c:identifier="gtk_item_factory_from_path">
+      </method>
+      <method name="remove" c:identifier="gtk_container_remove">
         <return-value>
-          <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="path">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="construct" c:identifier="gtk_item_factory_construct">
+      </method>
+      <method name="set_resize_mode"
+              c:identifier="gtk_container_set_resize_mode">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
-          <parameter name="container_type">
-            <type name="GObject.GType" c:type="GType"/>
+          <parameter name="resize_mode">
+            <type name="ResizeMode" c:type="GtkResizeMode"/>
           </parameter>
-          <parameter name="path">
-            <type name="string" c:type="gchar*"/>
+        </parameters>
+      </method>
+      <method name="get_resize_mode"
+              c:identifier="gtk_container_get_resize_mode">
+        <return-value>
+          <type name="ResizeMode" c:type="GtkResizeMode"/>
+        </return-value>
+        <parameters>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
-          <parameter name="accel_group">
-            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+        </parameters>
+      </method>
+      <method name="check_resize" c:identifier="gtk_container_check_resize">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_item" c:identifier="gtk_item_factory_get_item">
+      <method name="foreach" c:identifier="gtk_container_foreach">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
-          <parameter name="path">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="callback">
+            <type name="Callback" c:type="GtkCallback"/>
+          </parameter>
+          <parameter name="callback_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_widget" c:identifier="gtk_item_factory_get_widget">
+      <method name="foreach_full" c:identifier="gtk_container_foreach_full">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
-          <parameter name="path">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="callback">
+            <type name="Callback" c:type="GtkCallback"/>
+          </parameter>
+          <parameter name="marshal">
+            <type name="CallbackMarshal" c:type="GtkCallbackMarshal"/>
+          </parameter>
+          <parameter name="callback_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="notify">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_widget_by_action"
-              c:identifier="gtk_item_factory_get_widget_by_action">
+      <method name="get_children" c:identifier="gtk_container_get_children">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
-          </parameter>
-          <parameter name="action">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_item_by_action"
-              c:identifier="gtk_item_factory_get_item_by_action">
+      <method name="propagate_expose"
+              c:identifier="gtk_container_propagate_expose">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
-          <parameter name="action">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventExpose" c:type="GdkEventExpose*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="create_item" c:identifier="gtk_item_factory_create_item">
+      <method name="set_focus_chain"
+              c:identifier="gtk_container_set_focus_chain">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
-          <parameter name="entry">
-            <type name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
+          <parameter name="focusable_widgets">
+            <type name="GLib.List" c:type="GList*"/>
           </parameter>
-          <parameter name="callback_data">
-            <type name="any" c:type="gpointer"/>
+        </parameters>
+      </method>
+      <method name="get_focus_chain"
+              c:identifier="gtk_container_get_focus_chain">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
-          <parameter name="callback_type">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="focusable_widgets">
+            <type name="GLib.List" c:type="GList**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="create_items" c:identifier="gtk_item_factory_create_items">
+      <method name="unset_focus_chain"
+              c:identifier="gtk_container_unset_focus_chain">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
-          </parameter>
-          <parameter name="n_entries">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
-          <parameter name="entries">
-            <type name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
+        </parameters>
+      </method>
+      <method name="set_reallocate_redraws"
+              c:identifier="gtk_container_set_reallocate_redraws">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
-          <parameter name="callback_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="needs_redraws">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="delete_item" c:identifier="gtk_item_factory_delete_item">
+      <method name="set_focus_child"
+              c:identifier="gtk_container_set_focus_child">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
-          <parameter name="path">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="child" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="delete_entry" c:identifier="gtk_item_factory_delete_entry">
+      <method name="set_focus_vadjustment"
+              c:identifier="gtk_container_set_focus_vadjustment">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
-          <parameter name="entry">
-            <type name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="delete_entries"
-              c:identifier="gtk_item_factory_delete_entries">
+      <method name="get_focus_vadjustment"
+              c:identifier="gtk_container_get_focus_vadjustment">
+        <return-value>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </return-value>
+        <parameters>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_focus_hadjustment"
+              c:identifier="gtk_container_set_focus_hadjustment">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
-          <parameter name="n_entries">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
-          <parameter name="entries">
-            <type name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
+        </parameters>
+      </method>
+      <method name="get_focus_hadjustment"
+              c:identifier="gtk_container_get_focus_hadjustment">
+        <return-value>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </return-value>
+        <parameters>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="popup" c:identifier="gtk_item_factory_popup">
+      <method name="resize_children"
+              c:identifier="gtk_container_resize_children">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
-          <parameter name="x">
-            <type name="uint32" c:type="guint"/>
+        </parameters>
+      </method>
+      <method name="child_type" c:identifier="gtk_container_child_type">
+        <return-value>
+          <type name="GObject.Type" c:type="GType"/>
+        </return-value>
+        <parameters>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
-          <parameter name="y">
-            <type name="uint32" c:type="guint"/>
+        </parameters>
+      </method>
+      <method name="add_with_properties"
+              c:identifier="gtk_container_add_with_properties">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
-          <parameter name="mouse_button">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="time_">
-            <type name="uint32" c:type="guint32"/>
+          <parameter name="first_prop_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="popup_with_data"
-              c:identifier="gtk_item_factory_popup_with_data">
+      <method name="child_set" c:identifier="gtk_container_child_set">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
-          <parameter name="popup_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+          <parameter name="first_prop_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="x">
-            <type name="uint32" c:type="guint"/>
+        </parameters>
+      </method>
+      <method name="child_get" c:identifier="gtk_container_child_get">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
-          <parameter name="y">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="mouse_button">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="first_prop_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="time_">
-            <type name="uint32" c:type="guint32"/>
+        </parameters>
+      </method>
+      <method name="child_set_property"
+              c:identifier="gtk_container_child_set_property">
+        <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="property_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="GObject.Value" c:type="GValue*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="popup_data" c:identifier="gtk_item_factory_popup_data">
+      <method name="child_get_property"
+              c:identifier="gtk_container_child_get_property">
         <return-value>
-          <type name="any" c:type="gpointer"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="property_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="GObject.Value" c:type="GValue*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_translate_func"
-              c:identifier="gtk_item_factory_set_translate_func">
+      <method name="forall" c:identifier="gtk_container_forall">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
-          <parameter name="func">
-            <type name="GtkTranslateFunc" c:type="GtkTranslateFunc"/>
+          <parameter name="callback">
+            <type name="Callback" c:type="GtkCallback"/>
           </parameter>
-          <parameter name="data">
+          <parameter name="callback_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
-          <parameter name="notify">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="create_items_ac"
-              c:identifier="gtk_item_factory_create_items_ac">
+      <property name="border-width">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="resize-mode">
+        <type name="ResizeMode" c:type="GtkResizeMode"/>
+      </property>
+      <property name="child">
+        <type name="Widget" c:type="GtkWidget"/>
+      </property>
+      <callback name="add" c:type="add">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ifactory">
-            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
           </parameter>
-          <parameter name="n_entries">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="entries">
-            <type name="GtkItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
+        </parameters>
+      </callback>
+      <callback name="remove" c:type="remove">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="check_resize" c:type="check_resize">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="forall" c:type="forall">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
+          </parameter>
+          <parameter name="include_internals">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="callback">
+            <type name="Callback" c:type="GtkCallback"/>
           </parameter>
           <parameter name="callback_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
-          <parameter name="callback_type">
-            <type name="uint32" c:type="guint"/>
+        </parameters>
+      </callback>
+      <callback name="set_focus_child" c:type="set_focus_child">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </method>
-      <field name="item_ht">
-        <type name="GHashTable" c:type="GHashTable*"/>
-      </field>
-      <callback name="_gtk_reserved1">
+      </callback>
+      <callback name="child_type" c:type="child_type">
+        <return-value>
+          <type name="GObject.Type" c:type="GType"/>
+        </return-value>
+        <parameters>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="composite_name" c:type="composite_name">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="container">
+            <type name="Container" c:type="GtkContainer*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_child_property" c:type="set_child_property">
         <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="property_id">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="value">
+            <type name="GObject.Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="pspec">
+            <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="get_child_property" c:type="get_child_property">
         <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="property_id">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="value">
+            <type name="GObject.Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="pspec">
+            <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-    </class>
-    <function name="item_factory_add_foreign"
-              c:identifier="gtk_item_factory_add_foreign">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="accel_widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="full_path">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="accel_group">
-          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
-        </parameter>
-        <parameter name="keyval">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="modifiers">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
-        </parameter>
-      </parameters>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="add">
+        <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="remove">
+        <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="check-resize">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="set-focus-child">
+        <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="container_class_install_child_property"
+              c:identifier="gtk_container_class_install_child_property">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="cclass">
+          <type name="ContainerClass" c:type="GtkContainerClass*"/>
+        </parameter>
+        <parameter name="property_id">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="pspec">
+          <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="item_factory_path_from_widget"
-              c:identifier="gtk_item_factory_path_from_widget">
+    <function name="container_class_find_child_property"
+              c:identifier="gtk_container_class_find_child_property">
       <return-value>
-        <type name="string" c:type="gchar*"/>
+        <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="cclass">
+          <type name="GObjectClass" c:type="GObjectClass*"/>
+        </parameter>
+        <parameter name="property_name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="item_factory_popup_data_from_widget"
-              c:identifier="gtk_item_factory_popup_data_from_widget">
+    <function name="container_class_list_child_properties"
+              c:identifier="gtk_container_class_list_child_properties">
       <return-value>
-        <type name="any" c:type="gpointer"/>
+        <type name="GObject.ParamSpec" c:type="GParamSpec**"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="cclass">
+          <type name="GObjectClass" c:type="GObjectClass*"/>
+        </parameter>
+        <parameter name="n_properties">
+          <type name="uint" c:type="guint*"/>
         </parameter>
       </parameters>
     </function>
-    <callback name="GtkMenuCallback">
+    <function name="container_queue_resize"
+              c:identifier="_gtk_container_queue_resize">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="container">
+          <type name="Container" c:type="GtkContainer*"/>
         </parameter>
       </parameters>
-    </callback>
-    <record name="GtkMenuEntry" c:type="GtkMenuEntry"/>
-    <callback name="GtkItemFactoryCallback2">
+    </function>
+    <function name="container_clear_resize_widgets"
+              c:identifier="_gtk_container_clear_resize_widgets">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="container">
+          <type name="Container" c:type="GtkContainer*"/>
         </parameter>
-        <parameter name="callback_data">
-          <type name="any" c:type="gpointer"/>
+      </parameters>
+    </function>
+    <function name="container_child_composite_name"
+              c:identifier="_gtk_container_child_composite_name">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="container">
+          <type name="Container" c:type="GtkContainer*"/>
         </parameter>
-        <parameter name="callback_action">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="child">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
-    </callback>
-    <function name="item_factory_create_menu_entries"
-              c:identifier="gtk_item_factory_create_menu_entries">
+    </function>
+    <function name="container_dequeue_resize_handler"
+              c:identifier="_gtk_container_dequeue_resize_handler">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="n_entries">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="entries">
-          <type name="GtkMenuEntry" c:type="GtkMenuEntry*"/>
+        <parameter name="container">
+          <type name="Container" c:type="GtkContainer*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="item_factories_path_delete"
-              c:identifier="gtk_item_factories_path_delete">
+    <function name="container_focus_sort"
+              c:identifier="_gtk_container_focus_sort">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="GLib.List" c:type="GList*"/>
       </return-value>
       <parameters>
-        <parameter name="ifactory_path">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="container">
+          <type name="Container" c:type="GtkContainer*"/>
         </parameter>
-        <parameter name="path">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="children">
+          <type name="GLib.List" c:type="GList*"/>
+        </parameter>
+        <parameter name="direction">
+          <type name="DirectionType" c:type="GtkDirectionType"/>
+        </parameter>
+        <parameter name="old_focus">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkActionGroupPrivate" c:type="GtkActionGroupPrivate"/>
-    <record name="GtkActionEntry" c:type="GtkActionEntry">
-      <field name="name">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="stock_id">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="label">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="accelerator">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="tooltip">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="callback">
-        <type name="GObject.GCallback" c:type="GCallback"/>
-      </field>
-    </record>
-    <record name="GtkToggleActionEntry" c:type="GtkToggleActionEntry">
-      <field name="name">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="stock_id">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="label">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="accelerator">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="tooltip">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="callback">
-        <type name="GObject.GCallback" c:type="GCallback"/>
-      </field>
-      <field name="is_active">
-        <type name="boolean" c:type="gboolean"/>
-      </field>
-    </record>
-    <record name="GtkRadioActionEntry" c:type="GtkRadioActionEntry">
-      <field name="name">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="stock_id">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="label">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="accelerator">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="tooltip">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="value">
-        <type name="int32" c:type="gint"/>
-      </field>
-    </record>
-    <class name="ActionGroup"
-           c:type="GtkActionGroup"
-           parent="GObject.Object"
-           glib:type-name="GtkActionGroup"
-           glib:get-type="gtk_action_group_get_type">
-      <constructor name="new" c:identifier="gtk_action_group_new">
-        <return-value>
-          <type name="ActionGroup" c:type="GtkActionGroup*"/>
-        </return-value>
-        <parameters>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="get_name" c:identifier="gtk_action_group_get_name">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_sensitive"
-              c:identifier="gtk_action_group_get_sensitive">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_sensitive"
-              c:identifier="gtk_action_group_set_sensitive">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
-          </parameter>
-          <parameter name="sensitive">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_visible" c:identifier="gtk_action_group_get_visible">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_visible" c:identifier="gtk_action_group_set_visible">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
-          </parameter>
-          <parameter name="visible">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="list_actions" c:identifier="gtk_action_group_list_actions">
-        <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_action" c:identifier="gtk_action_group_add_action">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
-          </parameter>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_action_with_accel"
-              c:identifier="gtk_action_group_add_action_with_accel">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
-          </parameter>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
-          </parameter>
-          <parameter name="accelerator" allow-none="1">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="remove_action"
-              c:identifier="gtk_action_group_remove_action">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
-          </parameter>
-          <parameter name="action">
-            <type name="Action" c:type="GtkAction*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_actions" c:identifier="gtk_action_group_add_actions">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
-          </parameter>
-          <parameter name="entries">
-            <type name="GtkActionEntry" c:type="GtkActionEntry*"/>
-          </parameter>
-          <parameter name="n_entries">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_toggle_actions"
-              c:identifier="gtk_action_group_add_toggle_actions">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
-          </parameter>
-          <parameter name="entries">
-            <type name="GtkToggleActionEntry" c:type="GtkToggleActionEntry*"/>
-          </parameter>
-          <parameter name="n_entries">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_radio_actions"
-              c:identifier="gtk_action_group_add_radio_actions">
+    <class name="Bin"
+           c:type="GtkBin"
+           parent="Container"
+           glib:type-name="GtkBin"
+           glib:get-type="gtk_bin_get_type">
+      <method name="get_child" c:identifier="gtk_bin_get_child">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
-          </parameter>
-          <parameter name="entries">
-            <type name="GtkRadioActionEntry" c:type="GtkRadioActionEntry*"/>
-          </parameter>
-          <parameter name="n_entries">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="value">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="on_change">
-            <type name="GObject.GCallback" c:type="GCallback"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="bin">
+            <type name="Bin" c:type="GtkBin*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_actions_full"
-              c:identifier="gtk_action_group_add_actions_full">
+    </class>
+    <record name="WindowGeometryInfo" c:type="GtkWindowGeometryInfo"/>
+    <class name="WindowGroup"
+           c:type="GtkWindowGroup"
+           parent="GObject.Object"
+           glib:type-name="GtkWindowGroup"
+           glib:get-type="gtk_window_group_get_type">
+      <constructor name="new" c:identifier="gtk_window_group_new">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="WindowGroup" c:type="GtkWindowGroup*"/>
         </return-value>
-        <parameters>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
-          </parameter>
-          <parameter name="entries">
-            <type name="GtkActionEntry" c:type="GtkActionEntry*"/>
-          </parameter>
-          <parameter name="n_entries">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-          <parameter name="destroy">
-            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="add_toggle_actions_full"
-              c:identifier="gtk_action_group_add_toggle_actions_full">
+      </constructor>
+      <method name="add_window" c:identifier="gtk_window_group_add_window">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
-          </parameter>
-          <parameter name="entries">
-            <type name="GtkToggleActionEntry" c:type="GtkToggleActionEntry*"/>
-          </parameter>
-          <parameter name="n_entries">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="window_group">
+            <type name="WindowGroup" c:type="GtkWindowGroup*"/>
           </parameter>
-          <parameter name="destroy">
-            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_radio_actions_full"
-              c:identifier="gtk_action_group_add_radio_actions_full">
+      <method name="remove_window"
+              c:identifier="gtk_window_group_remove_window">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
-          </parameter>
-          <parameter name="entries">
-            <type name="GtkRadioActionEntry" c:type="GtkRadioActionEntry*"/>
-          </parameter>
-          <parameter name="n_entries">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="value">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="on_change">
-            <type name="GObject.GCallback" c:type="GCallback"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="window_group">
+            <type name="WindowGroup" c:type="GtkWindowGroup*"/>
           </parameter>
-          <parameter name="destroy">
-            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+          <parameter name="window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_translate_func"
-              c:identifier="gtk_action_group_set_translate_func">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
-          </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>
-      </method>
-      <method name="set_translation_domain"
-              c:identifier="gtk_action_group_set_translation_domain">
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
-          </parameter>
-          <parameter name="domain">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="translate_string"
-              c:identifier="gtk_action_group_translate_string">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
-          </parameter>
-          <parameter name="string">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="name">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="sensitive">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="visible">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="get_action">
-        <return-value>
-          <type name="Action" c:type="GtkAction*"/>
-        </return-value>
-        <parameters>
-          <parameter name="action_group">
-            <type name="ActionGroup" c:type="GtkActionGroup*"/>
-          </parameter>
-          <parameter name="action_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <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="connect-proxy">
-        <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>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="disconnect-proxy">
-        <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>
-        </parameters>
-      </glib:signal>
-      <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="post-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>
     </class>
-    <function name="action_group_emit_connect_proxy"
-              c:identifier="_gtk_action_group_emit_connect_proxy">
+    <function name="window_new" c:identifier="gtk_window_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="type">
+          <type name="WindowType" c:type="GtkWindowType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="window_set_default_icon_list"
+              c:identifier="gtk_window_set_default_icon_list">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="action_group">
-          <type name="ActionGroup" c:type="GtkActionGroup*"/>
+        <parameter name="list">
+          <type name="GLib.List" c:type="GList*"/>
         </parameter>
-        <parameter name="action">
-          <type name="Action" c:type="GtkAction*"/>
+      </parameters>
+    </function>
+    <function name="window_get_default_icon_list"
+              c:identifier="gtk_window_get_default_icon_list">
+      <return-value>
+        <type name="GLib.List" c:type="GList*"/>
+      </return-value>
+    </function>
+    <function name="window_set_default_icon"
+              c:identifier="gtk_window_set_default_icon">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="icon">
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
-        <parameter name="proxy">
+      </parameters>
+    </function>
+    <function name="window_set_default_icon_name"
+              c:identifier="gtk_window_set_default_icon_name">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="window_set_default_icon_from_file"
+              c:identifier="gtk_window_set_default_icon_from_file">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="filename">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="err">
+          <type name="GLib.Error" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="window_set_auto_startup_notification"
+              c:identifier="gtk_window_set_auto_startup_notification">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="setting">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="window_list_toplevels"
+              c:identifier="gtk_window_list_toplevels">
+      <return-value>
+        <type name="GLib.List" c:type="GList*"/>
+      </return-value>
+    </function>
+    <function name="window_internal_set_focus"
+              c:identifier="_gtk_window_internal_set_focus">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="window">
+          <type name="Window" c:type="GtkWindow*"/>
+        </parameter>
+        <parameter name="focus">
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="action_group_emit_disconnect_proxy"
-              c:identifier="_gtk_action_group_emit_disconnect_proxy">
+    <function name="window_reposition" c:identifier="_gtk_window_reposition">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="action_group">
-          <type name="ActionGroup" c:type="GtkActionGroup*"/>
+        <parameter name="window">
+          <type name="Window" c:type="GtkWindow*"/>
         </parameter>
-        <parameter name="action">
-          <type name="Action" c:type="GtkAction*"/>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="proxy">
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="window_constrain_size"
+              c:identifier="_gtk_window_constrain_size">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="window">
+          <type name="Window" c:type="GtkWindow*"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="new_width">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+        <parameter name="new_height">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="window_group_get_current_grab"
+              c:identifier="_gtk_window_group_get_current_grab">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="window_group">
+          <type name="WindowGroup" c:type="GtkWindowGroup*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="window_set_has_toplevel_focus"
+              c:identifier="_gtk_window_set_has_toplevel_focus">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="window">
+          <type name="Window" c:type="GtkWindow*"/>
+        </parameter>
+        <parameter name="has_toplevel_focus">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="window_unset_focus_and_default"
+              c:identifier="_gtk_window_unset_focus_and_default">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="window">
+          <type name="Window" c:type="GtkWindow*"/>
+        </parameter>
+        <parameter name="widget">
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="action_group_emit_pre_activate"
-              c:identifier="_gtk_action_group_emit_pre_activate">
+    <function name="window_set_is_active"
+              c:identifier="_gtk_window_set_is_active">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="action_group">
-          <type name="ActionGroup" c:type="GtkActionGroup*"/>
+        <parameter name="window">
+          <type name="Window" c:type="GtkWindow*"/>
         </parameter>
-        <parameter name="action">
-          <type name="Action" c:type="GtkAction*"/>
+        <parameter name="is_active">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="action_group_emit_post_activate"
-              c:identifier="_gtk_action_group_emit_post_activate">
+    <callback name="WindowKeysForeachFunc" c:type="GtkWindowKeysForeachFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="action_group">
-          <type name="ActionGroup" c:type="GtkActionGroup*"/>
+        <parameter name="window">
+          <type name="Window" c:type="GtkWindow*"/>
         </parameter>
-        <parameter name="action">
-          <type name="Action" c:type="GtkAction*"/>
+        <parameter name="keyval">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="modifiers">
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+        </parameter>
+        <parameter name="is_mnemonic">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <function name="window_keys_foreach"
+              c:identifier="_gtk_window_keys_foreach">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="window">
+          <type name="Window" c:type="GtkWindow*"/>
+        </parameter>
+        <parameter name="func">
+          <type name="WindowKeysForeachFunc"
+                c:type="GtkWindowKeysForeachFunc"/>
+        </parameter>
+        <parameter name="func_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkAlignmentPrivate" c:type="GtkAlignmentPrivate"/>
-    <class name="Alignment"
-           c:type="GtkAlignment"
-           parent="Bin"
-           glib:type-name="GtkAlignment"
-           glib:get-type="gtk_alignment_get_type">
-      <method name="set" c:identifier="gtk_alignment_set">
+    <function name="window_query_nonaccels"
+              c:identifier="_gtk_window_query_nonaccels">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="window">
+          <type name="Window" c:type="GtkWindow*"/>
+        </parameter>
+        <parameter name="accel_key">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="accel_mods">
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="Dialog"
+           c:type="GtkDialog"
+           parent="Window"
+           glib:type-name="GtkDialog"
+           glib:get-type="gtk_dialog_get_type">
+      <method name="add_action_widget"
+              c:identifier="gtk_dialog_add_action_widget">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="alignment">
-            <type name="Alignment" c:type="GtkAlignment*"/>
-          </parameter>
-          <parameter name="xalign">
-            <type name="float" c:type="gfloat"/>
-          </parameter>
-          <parameter name="yalign">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="dialog">
+            <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
-          <parameter name="xscale">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="yscale">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="response_id">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_padding" c:identifier="gtk_alignment_set_padding">
+      <method name="add_button" c:identifier="gtk_dialog_add_button">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="alignment">
-            <type name="Alignment" c:type="GtkAlignment*"/>
-          </parameter>
-          <parameter name="padding_top">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="padding_bottom">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="dialog">
+            <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
-          <parameter name="padding_left">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="button_text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="padding_right">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="response_id">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_padding" c:identifier="gtk_alignment_get_padding">
+      <method name="add_buttons" c:identifier="gtk_dialog_add_buttons">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="alignment">
-            <type name="Alignment" c:type="GtkAlignment*"/>
-          </parameter>
-          <parameter name="padding_top">
-            <type name="GLib.guint" c:type="guint*"/>
-          </parameter>
-          <parameter name="padding_bottom">
-            <type name="GLib.guint" c:type="guint*"/>
-          </parameter>
-          <parameter name="padding_left">
-            <type name="GLib.guint" c:type="guint*"/>
+          <parameter name="dialog">
+            <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
-          <parameter name="padding_right">
-            <type name="GLib.guint" c:type="guint*"/>
+          <parameter name="first_button_text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="xalign">
-        <type name="float" c:type="gfloat"/>
-      </property>
-      <property name="yalign">
-        <type name="float" c:type="gfloat"/>
-      </property>
-      <property name="xscale">
-        <type name="float" c:type="gfloat"/>
-      </property>
-      <property name="yscale">
-        <type name="float" c:type="gfloat"/>
-      </property>
-      <property name="top-padding">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <property name="bottom-padding">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <property name="left-padding">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <property name="right-padding">
-        <type name="uint32" c:type="guint"/>
-      </property>
-    </class>
-    <function name="alignment_new" c:identifier="gtk_alignment_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="xalign">
-          <type name="float" c:type="gfloat"/>
-        </parameter>
-        <parameter name="yalign">
-          <type name="float" c:type="gfloat"/>
-        </parameter>
-        <parameter name="xscale">
-          <type name="float" c:type="gfloat"/>
-        </parameter>
-        <parameter name="yscale">
-          <type name="float" c:type="gfloat"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="Arrow"
-           c:type="GtkArrow"
-           parent="Misc"
-           glib:type-name="GtkArrow"
-           glib:get-type="gtk_arrow_get_type">
-      <method name="set" c:identifier="gtk_arrow_set">
+      <method name="set_response_sensitive"
+              c:identifier="gtk_dialog_set_response_sensitive">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="arrow">
-            <type name="Arrow" c:type="GtkArrow*"/>
+          <parameter name="dialog">
+            <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
-          <parameter name="arrow_type">
-            <type name="ArrowType" c:type="GtkArrowType"/>
+          <parameter name="response_id">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="shadow_type">
-            <type name="ShadowType" c:type="GtkShadowType"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <property name="arrow-type">
-        <type name="ArrowType" c:type="GtkArrowType"/>
-      </property>
-      <property name="shadow-type">
-        <type name="ShadowType" c:type="GtkShadowType"/>
-      </property>
-    </class>
-    <function name="arrow_new" c:identifier="gtk_arrow_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="arrow_type">
-          <type name="ArrowType" c:type="GtkArrowType"/>
-        </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="Frame"
-           c:type="GtkFrame"
-           parent="Bin"
-           glib:type-name="GtkFrame"
-           glib:get-type="gtk_frame_get_type">
-      <method name="set_label" c:identifier="gtk_frame_set_label">
+      <method name="set_default_response"
+              c:identifier="gtk_dialog_set_default_response">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="frame">
-            <type name="Frame" c:type="GtkFrame*"/>
+          <parameter name="dialog">
+            <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
-          <parameter name="label" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="response_id">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_label" c:identifier="gtk_frame_get_label">
+      <method name="get_response_for_widget"
+              c:identifier="gtk_dialog_get_response_for_widget">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="frame">
-            <type name="Frame" c:type="GtkFrame*"/>
+          <parameter name="dialog">
+            <type name="Dialog" c:type="GtkDialog*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_label_widget"
-              c:identifier="gtk_frame_set_label_widget">
+      <method name="set_has_separator"
+              c:identifier="gtk_dialog_set_has_separator">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="frame">
-            <type name="Frame" c:type="GtkFrame*"/>
+          <parameter name="dialog">
+            <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
-          <parameter name="label_widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_label_widget"
-              c:identifier="gtk_frame_get_label_widget">
+      <method name="get_has_separator"
+              c:identifier="gtk_dialog_get_has_separator">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="frame">
-            <type name="Frame" c:type="GtkFrame*"/>
+          <parameter name="dialog">
+            <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_label_align" c:identifier="gtk_frame_set_label_align">
+      <method name="set_alternative_button_order"
+              c:identifier="gtk_dialog_set_alternative_button_order">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="frame">
-            <type name="Frame" c:type="GtkFrame*"/>
-          </parameter>
-          <parameter name="xalign">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="dialog">
+            <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
-          <parameter name="yalign">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="first_response_id">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_label_align" c:identifier="gtk_frame_get_label_align">
+      <method name="set_alternative_button_order_from_array"
+              c:identifier="gtk_dialog_set_alternative_button_order_from_array">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="frame">
-            <type name="Frame" c:type="GtkFrame*"/>
+          <parameter name="dialog">
+            <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
-          <parameter name="xalign">
-            <type name="GLib.gfloat" c:type="gfloat*"/>
+          <parameter name="n_params">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="yalign">
-            <type name="GLib.gfloat" c:type="gfloat*"/>
+          <parameter name="new_order">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_shadow_type" c:identifier="gtk_frame_set_shadow_type">
+      <method name="response" c:identifier="gtk_dialog_response">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="frame">
-            <type name="Frame" c:type="GtkFrame*"/>
+          <parameter name="dialog">
+            <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
-          <parameter name="type">
-            <type name="ShadowType" c:type="GtkShadowType"/>
+          <parameter name="response_id">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_shadow_type" c:identifier="gtk_frame_get_shadow_type">
+      <method name="run" c:identifier="gtk_dialog_run">
         <return-value>
-          <type name="ShadowType" c:type="GtkShadowType"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="frame">
-            <type name="Frame" c:type="GtkFrame*"/>
+          <parameter name="dialog">
+            <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="label">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="label-xalign">
-        <type name="float" c:type="gfloat"/>
-      </property>
-      <property name="label-yalign">
-        <type name="float" c:type="gfloat"/>
-      </property>
-      <property name="shadow">
-        <type name="ShadowType" c:type="GtkShadowType"/>
+      <property name="has-separator">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="shadow-type">
-        <type name="ShadowType" c:type="GtkShadowType"/>
-      </property>
-      <property name="label-widget">
-        <type name="Widget" c:type="GtkWidget"/>
-      </property>
-      <callback name="compute_child_allocation">
+      <callback name="response" c:type="response">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="frame">
-            <type name="Frame" c:type="GtkFrame*"/>
+          <parameter name="dialog">
+            <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
-          <parameter name="allocation">
-            <type name="GtkAllocation" c:type="GtkAllocation*"/>
+          <parameter name="response_id">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-    </class>
-    <function name="frame_new" c:identifier="gtk_frame_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="label">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="AspectFrame"
-           c:type="GtkAspectFrame"
-           parent="Frame"
-           glib:type-name="GtkAspectFrame"
-           glib:get-type="gtk_aspect_frame_get_type">
-      <method name="set" c:identifier="gtk_aspect_frame_set">
+      <callback name="close" c:type="close">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="aspect_frame">
-            <type name="AspectFrame" c:type="GtkAspectFrame*"/>
-          </parameter>
-          <parameter name="xalign">
-            <type name="float" c:type="gfloat"/>
-          </parameter>
-          <parameter name="yalign">
-            <type name="float" c:type="gfloat"/>
-          </parameter>
-          <parameter name="ratio">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="dialog">
+            <type name="Dialog" c:type="GtkDialog*"/>
           </parameter>
-          <parameter name="obey_child">
-            <type name="boolean" c:type="gboolean"/>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="response">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="xalign">
-        <type name="float" c:type="gfloat"/>
-      </property>
-      <property name="yalign">
-        <type name="float" c:type="gfloat"/>
-      </property>
-      <property name="ratio">
-        <type name="float" c:type="gfloat"/>
-      </property>
-      <property name="obey-child">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
+      </glib:signal>
+      <glib:signal name="close">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
     </class>
-    <function name="aspect_frame_new" c:identifier="gtk_aspect_frame_new">
+    <function name="dialog_new" c:identifier="gtk_dialog_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="dialog_new_with_buttons"
+              c:identifier="gtk_dialog_new_with_buttons">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="label">
+        <parameter name="title" allow-none="1">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="xalign">
-          <type name="float" c:type="gfloat"/>
+        <parameter name="parent" allow-none="1">
+          <type name="Window" c:type="GtkWindow*"/>
         </parameter>
-        <parameter name="yalign">
-          <type name="float" c:type="gfloat"/>
+        <parameter name="flags">
+          <type name="DialogFlags" c:type="GtkDialogFlags"/>
         </parameter>
-        <parameter name="ratio">
-          <type name="float" c:type="gfloat"/>
+        <parameter name="first_button_text" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="obey_child">
-          <type name="boolean" c:type="gboolean"/>
+      </parameters>
+    </function>
+    <function name="alternative_dialog_button_order"
+              c:identifier="gtk_alternative_dialog_button_order">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="screen" allow-none="1">
+          <type name="Gdk.Screen" c:type="GdkScreen*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkAssistantPrivate" c:type="GtkAssistantPrivate"/>
-    <callback name="GtkAssistantPageFunc">
+    <function name="dialog_set_ignore_separator"
+              c:identifier="_gtk_dialog_set_ignore_separator">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="current_page">
-          <type name="int32" c:type="gint"/>
+        <parameter name="dialog">
+          <type name="Dialog" c:type="GtkDialog*"/>
         </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="ignore_separator">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
-    </callback>
-    <class name="Assistant"
-           c:type="GtkAssistant"
-           parent="Window"
-           glib:type-name="GtkAssistant"
-           glib:get-type="gtk_assistant_get_type">
-      <method name="get_current_page"
-              c:identifier="gtk_assistant_get_current_page">
+    </function>
+    <class name="AboutDialog"
+           c:type="GtkAboutDialog"
+           parent="Dialog"
+           glib:type-name="GtkAboutDialog"
+           glib:get-type="gtk_about_dialog_get_type">
+      <method name="get_name" c:identifier="gtk_about_dialog_get_name">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_current_page"
-              c:identifier="gtk_assistant_set_current_page">
+      <method name="set_name" c:identifier="gtk_about_dialog_set_name">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="page_num">
-            <type name="int32" c:type="gint"/>
+          <parameter name="name" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_n_pages" c:identifier="gtk_assistant_get_n_pages">
+      <method name="get_program_name"
+              c:identifier="gtk_about_dialog_get_program_name">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_nth_page" c:identifier="gtk_assistant_get_nth_page">
+      <method name="set_program_name"
+              c:identifier="gtk_about_dialog_set_program_name">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="page_num">
-            <type name="int32" c:type="gint"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="prepend_page" c:identifier="gtk_assistant_prepend_page">
+      <method name="get_version" c:identifier="gtk_about_dialog_get_version">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
-          </parameter>
-          <parameter name="page">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="append_page" c:identifier="gtk_assistant_append_page">
+      <method name="set_version" c:identifier="gtk_about_dialog_set_version">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="page">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="version" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_page" c:identifier="gtk_assistant_insert_page">
+      <method name="get_copyright"
+              c:identifier="gtk_about_dialog_get_copyright">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
-          </parameter>
-          <parameter name="page">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_forward_page_func"
-              c:identifier="gtk_assistant_set_forward_page_func">
+      <method name="set_copyright"
+              c:identifier="gtk_about_dialog_set_copyright">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
-          </parameter>
-          <parameter name="page_func">
-            <type name="GtkAssistantPageFunc" c:type="GtkAssistantPageFunc"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="copyright" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="destroy">
-            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+        </parameters>
+      </method>
+      <method name="get_comments" c:identifier="gtk_about_dialog_get_comments">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_page_type" c:identifier="gtk_assistant_set_page_type">
+      <method name="set_comments" c:identifier="gtk_about_dialog_set_comments">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
-          </parameter>
-          <parameter name="page">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="type">
-            <type name="AssistantPageType" c:type="GtkAssistantPageType"/>
+          <parameter name="comments" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_page_type" c:identifier="gtk_assistant_get_page_type">
+      <method name="get_license" c:identifier="gtk_about_dialog_get_license">
         <return-value>
-          <type name="AssistantPageType" c:type="GtkAssistantPageType"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
-          </parameter>
-          <parameter name="page">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_page_title"
-              c:identifier="gtk_assistant_set_page_title">
+      <method name="set_license" c:identifier="gtk_about_dialog_set_license">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
-          </parameter>
-          <parameter name="page">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="title">
+          <parameter name="license" allow-none="1">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_page_title"
-              c:identifier="gtk_assistant_get_page_title">
+      <method name="get_wrap_license"
+              c:identifier="gtk_about_dialog_get_wrap_license">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
-          </parameter>
-          <parameter name="page">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_page_header_image"
-              c:identifier="gtk_assistant_set_page_header_image">
+      <method name="set_wrap_license"
+              c:identifier="gtk_about_dialog_set_wrap_license">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
-          </parameter>
-          <parameter name="page">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="pixbuf" allow-none="1">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="wrap_license">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_page_header_image"
-              c:identifier="gtk_assistant_get_page_header_image">
+      <method name="get_website" c:identifier="gtk_about_dialog_get_website">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
-          </parameter>
-          <parameter name="page">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_page_side_image"
-              c:identifier="gtk_assistant_set_page_side_image">
+      <method name="set_website" c:identifier="gtk_about_dialog_set_website">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
-          </parameter>
-          <parameter name="page">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="pixbuf" allow-none="1">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="website" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_page_side_image"
-              c:identifier="gtk_assistant_get_page_side_image">
+      <method name="get_website_label"
+              c:identifier="gtk_about_dialog_get_website_label">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
-          </parameter>
-          <parameter name="page">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_page_complete"
-              c:identifier="gtk_assistant_set_page_complete">
+      <method name="set_website_label"
+              c:identifier="gtk_about_dialog_set_website_label">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="page">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="website_label" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="complete">
-            <type name="boolean" c:type="gboolean"/>
+        </parameters>
+      </method>
+      <method name="get_authors" c:identifier="gtk_about_dialog_get_authors">
+        <return-value>
+          <type name="GLib.char" c:type="gchar**"/>
+        </return-value>
+        <parameters>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_page_complete"
-              c:identifier="gtk_assistant_get_page_complete">
+      <method name="set_authors" c:identifier="gtk_about_dialog_set_authors">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="page">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="authors">
+            <type name="GLib.char" c:type="gchar**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_action_widget"
-              c:identifier="gtk_assistant_add_action_widget">
+      <method name="get_documenters"
+              c:identifier="gtk_about_dialog_get_documenters">
+        <return-value>
+          <type name="GLib.char" c:type="gchar**"/>
+        </return-value>
+        <parameters>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_documenters"
+              c:identifier="gtk_about_dialog_set_documenters">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="documenters">
+            <type name="GLib.char" c:type="gchar**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_action_widget"
-              c:identifier="gtk_assistant_remove_action_widget">
+      <method name="get_artists" c:identifier="gtk_about_dialog_get_artists">
+        <return-value>
+          <type name="GLib.char" c:type="gchar**"/>
+        </return-value>
+        <parameters>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_artists" c:identifier="gtk_about_dialog_set_artists">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="artists">
+            <type name="GLib.char" c:type="gchar**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="update_buttons_state"
-              c:identifier="gtk_assistant_update_buttons_state">
+      <method name="get_translator_credits"
+              c:identifier="gtk_about_dialog_get_translator_credits">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
         </parameters>
       </method>
-      <callback name="prepare">
+      <method name="set_translator_credits"
+              c:identifier="gtk_about_dialog_set_translator_credits">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
-          <parameter name="page">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="translator_credits" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="apply">
+      </method>
+      <method name="get_logo" c:identifier="gtk_about_dialog_get_logo">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="close">
+      </method>
+      <method name="set_logo" c:identifier="gtk_about_dialog_set_logo">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
+          </parameter>
+          <parameter name="logo" allow-none="1">
+            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="cancel">
+      </method>
+      <method name="get_logo_icon_name"
+              c:identifier="gtk_about_dialog_get_logo_icon_name">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="assistant">
-            <type name="Assistant" c:type="GtkAssistant*"/>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
+      </method>
+      <method name="set_logo_icon_name"
+              c:identifier="gtk_about_dialog_set_logo_icon_name">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+        <parameters>
+          <parameter name="about">
+            <type name="AboutDialog" c:type="GtkAboutDialog*"/>
+          </parameter>
+          <parameter name="icon_name" allow-none="1">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="program-name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="version">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="copyright">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="comments">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="website">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="website-label">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="license">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="authors">
+        <type name="GObject.Strv" c:type="GStrv"/>
+      </property>
+      <property name="documenters">
+        <type name="GObject.Strv" c:type="GStrv"/>
+      </property>
+      <property name="translator-credits">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="artists">
+        <type name="GObject.Strv" c:type="GStrv"/>
+      </property>
+      <property name="logo">
+        <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf"/>
+      </property>
+      <property name="logo-icon-name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="wrap-license">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved5">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="close">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="cancel">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="prepare">
-        <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="apply">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
     </class>
-    <function name="assistant_new" c:identifier="gtk_assistant_new">
+    <function name="about_dialog_new" c:identifier="gtk_about_dialog_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
-    <record name="GtkBoxChild" c:type="GtkBoxChild">
-      <field name="widget">
-        <type name="Widget" c:type="GtkWidget*"/>
-      </field>
-      <field name="padding">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="expand">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="fill">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="pack">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="is_secondary">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <class name="Box"
-           c:type="GtkBox"
-           parent="Container"
-           glib:type-name="GtkBox"
-           glib:get-type="gtk_box_get_type">
-      <method name="pack_start" c:identifier="gtk_box_pack_start">
+    <function name="show_about_dialog" c:identifier="gtk_show_about_dialog">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="parent">
+          <type name="Window" c:type="GtkWindow*"/>
+        </parameter>
+        <parameter name="first_property_name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <callback name="AboutDialogActivateLinkFunc"
+              c:type="GtkAboutDialogActivateLinkFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="about">
+          <type name="AboutDialog" c:type="GtkAboutDialog*"/>
+        </parameter>
+        <parameter name="link_">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <function name="about_dialog_set_email_hook"
+              c:identifier="gtk_about_dialog_set_email_hook">
+      <return-value>
+        <type name="AboutDialogActivateLinkFunc"
+              c:type="GtkAboutDialogActivateLinkFunc"/>
+      </return-value>
+      <parameters>
+        <parameter name="func">
+          <type name="AboutDialogActivateLinkFunc"
+                c:type="GtkAboutDialogActivateLinkFunc"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy">
+          <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="about_dialog_set_url_hook"
+              c:identifier="gtk_about_dialog_set_url_hook">
+      <return-value>
+        <type name="AboutDialogActivateLinkFunc"
+              c:type="GtkAboutDialogActivateLinkFunc"/>
+      </return-value>
+      <parameters>
+        <parameter name="func">
+          <type name="AboutDialogActivateLinkFunc"
+                c:type="GtkAboutDialogActivateLinkFunc"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy">
+          <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="Misc"
+           c:type="GtkMisc"
+           parent="Widget"
+           glib:type-name="GtkMisc"
+           glib:get-type="gtk_misc_get_type">
+      <method name="set_alignment" c:identifier="gtk_misc_set_alignment">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="box">
-            <type name="Box" c:type="GtkBox*"/>
+          <parameter name="misc">
+            <type name="Misc" c:type="GtkMisc*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="xalign">
+            <type name="float" c:type="gfloat"/>
           </parameter>
-          <parameter name="expand">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="yalign">
+            <type name="float" c:type="gfloat"/>
           </parameter>
-          <parameter name="fill">
-            <type name="boolean" c:type="gboolean"/>
+        </parameters>
+      </method>
+      <method name="get_alignment" c:identifier="gtk_misc_get_alignment">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="misc">
+            <type name="Misc" c:type="GtkMisc*"/>
           </parameter>
-          <parameter name="padding">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="xalign">
+            <type name="float" c:type="gfloat*"/>
+          </parameter>
+          <parameter name="yalign">
+            <type name="float" c:type="gfloat*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="pack_end" c:identifier="gtk_box_pack_end">
+      <method name="set_padding" c:identifier="gtk_misc_set_padding">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="box">
-            <type name="Box" c:type="GtkBox*"/>
+          <parameter name="misc">
+            <type name="Misc" c:type="GtkMisc*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="xpad">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="expand">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="ypad">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="fill">
-            <type name="boolean" c:type="gboolean"/>
+        </parameters>
+      </method>
+      <method name="get_padding" c:identifier="gtk_misc_get_padding">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="misc">
+            <type name="Misc" c:type="GtkMisc*"/>
           </parameter>
-          <parameter name="padding">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="xpad">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="ypad">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="pack_start_defaults"
-              c:identifier="gtk_box_pack_start_defaults">
+      <property name="xalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="yalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="xpad">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="ypad">
+        <type name="int" c:type="gint"/>
+      </property>
+    </class>
+    <class name="MenuShell"
+           c:type="GtkMenuShell"
+           parent="Container"
+           glib:type-name="GtkMenuShell"
+           glib:get-type="gtk_menu_shell_get_type">
+      <method name="append" c:identifier="gtk_menu_shell_append">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="box">
-            <type name="Box" c:type="GtkBox*"/>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
-          <parameter name="widget">
+          <parameter name="child">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="pack_end_defaults"
-              c:identifier="gtk_box_pack_end_defaults">
+      <method name="prepend" c:identifier="gtk_menu_shell_prepend">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="box">
-            <type name="Box" c:type="GtkBox*"/>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
-          <parameter name="widget">
+          <parameter name="child">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_homogeneous" c:identifier="gtk_box_set_homogeneous">
+      <method name="insert" c:identifier="gtk_menu_shell_insert">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="box">
-            <type name="Box" c:type="GtkBox*"/>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
-          <parameter name="homogeneous">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_homogeneous" c:identifier="gtk_box_get_homogeneous">
+      <method name="deactivate" c:identifier="gtk_menu_shell_deactivate">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="box">
-            <type name="Box" c:type="GtkBox*"/>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_spacing" c:identifier="gtk_box_set_spacing">
+      <method name="select_item" c:identifier="gtk_menu_shell_select_item">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="box">
-            <type name="Box" c:type="GtkBox*"/>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
-          <parameter name="spacing">
-            <type name="int32" c:type="gint"/>
+          <parameter name="menu_item">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_spacing" c:identifier="gtk_box_get_spacing">
+      <method name="deselect" c:identifier="gtk_menu_shell_deselect">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="box">
-            <type name="Box" c:type="GtkBox*"/>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="reorder_child" c:identifier="gtk_box_reorder_child">
+      <method name="activate_item" c:identifier="gtk_menu_shell_activate_item">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="box">
-            <type name="Box" c:type="GtkBox*"/>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
-          <parameter name="child">
+          <parameter name="menu_item">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
+          <parameter name="force_deactivate">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="query_child_packing"
-              c:identifier="gtk_box_query_child_packing">
+      <method name="select_first" c:identifier="gtk_menu_shell_select_first">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="box">
-            <type name="Box" c:type="GtkBox*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="expand">
-            <type name="GLib.gboolean" c:type="gboolean*"/>
-          </parameter>
-          <parameter name="fill">
-            <type name="GLib.gboolean" c:type="gboolean*"/>
-          </parameter>
-          <parameter name="padding">
-            <type name="GLib.guint" c:type="guint*"/>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
-          <parameter name="pack_type">
-            <type name="PackType" c:type="GtkPackType*"/>
+          <parameter name="search_sensitive">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_child_packing"
-              c:identifier="gtk_box_set_child_packing">
+      <method name="cancel" c:identifier="gtk_menu_shell_cancel">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="box">
-            <type name="Box" c:type="GtkBox*"/>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+        </parameters>
+      </method>
+      <method name="get_take_focus"
+              c:identifier="gtk_menu_shell_get_take_focus">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
-          <parameter name="expand">
-            <type name="boolean" c:type="gboolean"/>
+        </parameters>
+      </method>
+      <method name="set_take_focus"
+              c:identifier="gtk_menu_shell_set_take_focus">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
-          <parameter name="fill">
+          <parameter name="take_focus">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="padding">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="pack_type">
-            <type name="PackType" c:type="GtkPackType"/>
-          </parameter>
         </parameters>
       </method>
-      <property name="spacing">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="homogeneous">
+      <property name="take-focus">
         <type name="boolean" c:type="gboolean"/>
       </property>
-    </class>
-    <class name="ButtonBox"
-           c:type="GtkButtonBox"
-           parent="Box"
-           glib:type-name="GtkButtonBox"
-           glib:get-type="gtk_button_box_get_type">
-      <method name="get_layout" c:identifier="gtk_button_box_get_layout">
+      <field name="submenu_placement">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <callback name="deactivate" c:type="deactivate">
         <return-value>
-          <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="ButtonBox" c:type="GtkButtonBox*"/>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_layout" c:identifier="gtk_button_box_set_layout">
+      </callback>
+      <callback name="selection_done" c:type="selection_done">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="ButtonBox" c:type="GtkButtonBox*"/>
-          </parameter>
-          <parameter name="layout_style">
-            <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_child_secondary"
-              c:identifier="gtk_button_box_get_child_secondary">
+      </callback>
+      <callback name="move_current" c:type="move_current">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="ButtonBox" c:type="GtkButtonBox*"/>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="direction">
+            <type name="MenuDirectionType" c:type="GtkMenuDirectionType"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_child_secondary"
-              c:identifier="gtk_button_box_set_child_secondary">
+      </callback>
+      <callback name="activate_current" c:type="activate_current">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="ButtonBox" c:type="GtkButtonBox*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
-          <parameter name="is_secondary">
+          <parameter name="force_hide">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_child_size"
-              c:identifier="gtk_button_box_set_child_size">
+      </callback>
+      <callback name="cancel" c:type="cancel">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="ButtonBox" c:type="GtkButtonBox*"/>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
-          <parameter name="min_width">
-            <type name="int32" c:type="gint"/>
+        </parameters>
+      </callback>
+      <callback name="select_item" c:type="select_item">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
-          <parameter name="min_height">
-            <type name="int32" c:type="gint"/>
+          <parameter name="menu_item">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_child_ipadding"
-              c:identifier="gtk_button_box_set_child_ipadding">
+      </callback>
+      <callback name="insert" c:type="insert">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="ButtonBox" c:type="GtkButtonBox*"/>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
-          <parameter name="ipad_x">
-            <type name="int32" c:type="gint"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="ipad_y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_child_size"
-              c:identifier="gtk_button_box_get_child_size">
+      </callback>
+      <callback name="get_popup_delay" c:type="get_popup_delay">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="ButtonBox" c:type="GtkButtonBox*"/>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
-          <parameter name="min_width">
-            <type name="GLib.gint" c:type="gint*"/>
+        </parameters>
+      </callback>
+      <callback name="move_selected" c:type="move_selected">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
-          <parameter name="min_height">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="distance">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_child_ipadding"
-              c:identifier="gtk_button_box_get_child_ipadding">
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="deactivate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="selection-done">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="move-current">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="ButtonBox" c:type="GtkButtonBox*"/>
+          <parameter name="object">
+            <type name="MenuDirectionType" c:type="GtkMenuDirectionType"/>
           </parameter>
-          <parameter name="ipad_x">
-            <type name="GLib.gint" c:type="gint*"/>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="activate-current">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="ipad_y">
-            <type name="GLib.gint" c:type="gint*"/>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="cancel">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="cycle-focus">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="layout-style">
-        <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
-      </property>
+      </glib:signal>
+      <glib:signal name="move-selected">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
     </class>
-    <function name="button_box_child_requisition"
-              c:identifier="_gtk_button_box_child_requisition">
+    <function name="menu_shell_select_last"
+              c:identifier="_gtk_menu_shell_select_last">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="nvis_children">
-          <type name="int" c:type="int*"/>
-        </parameter>
-        <parameter name="nvis_secondaries">
-          <type name="int" c:type="int*"/>
+        <parameter name="menu_shell">
+          <type name="MenuShell" c:type="GtkMenuShell*"/>
         </parameter>
-        <parameter name="width">
-          <type name="int" c:type="int*"/>
+        <parameter name="search_sensitive">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
-        <parameter name="height">
-          <type name="int" c:type="int*"/>
+      </parameters>
+    </function>
+    <function name="menu_shell_activate"
+              c:identifier="_gtk_menu_shell_activate">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="menu_shell">
+          <type name="MenuShell" c:type="GtkMenuShell*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkBindingSet" c:type="GtkBindingSet">
-      <field name="set_name">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="priority">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="widget_path_pspecs">
-        <type name="GLib.GSList" c:type="GSList*"/>
-      </field>
-      <field name="widget_class_pspecs">
-        <type name="GLib.GSList" c:type="GSList*"/>
-      </field>
-      <field name="class_branch_pspecs">
-        <type name="GLib.GSList" c:type="GSList*"/>
-      </field>
-      <field name="entries">
-        <type name="GtkBindingEntry" c:type="GtkBindingEntry*"/>
-      </field>
-      <field name="current">
-        <type name="GtkBindingEntry" c:type="GtkBindingEntry*"/>
-      </field>
-      <field name="parsed">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GtkBindingEntry" c:type="GtkBindingEntry">
-      <field name="keyval">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="modifiers">
-        <type name="GdkModifierType" c:type="GdkModifierType"/>
-      </field>
-      <field name="binding_set">
-        <type name="GtkBindingSet" c:type="GtkBindingSet*"/>
-      </field>
-      <field name="destroyed">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="in_emission">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="marks_unbound">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="set_next">
-        <type name="GtkBindingEntry" c:type="GtkBindingEntry*"/>
-      </field>
-      <field name="hash_next">
-        <type name="GtkBindingEntry" c:type="GtkBindingEntry*"/>
-      </field>
-      <field name="signals">
-        <type name="GtkBindingSignal" c:type="GtkBindingSignal*"/>
-      </field>
-    </record>
-    <record name="GtkBindingSignal" c:type="GtkBindingSignal">
-      <field name="next">
-        <type name="GtkBindingSignal" c:type="GtkBindingSignal*"/>
-      </field>
-      <field name="signal_name">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="n_args">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="args">
-        <type name="GtkBindingArg" c:type="GtkBindingArg*"/>
-      </field>
-    </record>
-    <record name="GtkBindingArg" c:type="GtkBindingArg">
-      <field name="arg_type">
-        <type name="GObject.GType" c:type="GType"/>
-      </field>
-      <field name="d">
-        <type name="???" c:type="???"/>
-      </field>
-    </record>
-    <function name="binding_set_new" c:identifier="gtk_binding_set_new">
-      <return-value>
-        <type name="GtkBindingSet" c:type="GtkBindingSet*"/>
-      </return-value>
-      <parameters>
-        <parameter name="set_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="binding_set_by_class"
-              c:identifier="gtk_binding_set_by_class">
-      <return-value>
-        <type name="GtkBindingSet" c:type="GtkBindingSet*"/>
-      </return-value>
-      <parameters>
-        <parameter name="object_class">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="binding_set_find" c:identifier="gtk_binding_set_find">
-      <return-value>
-        <type name="GtkBindingSet" c:type="GtkBindingSet*"/>
-      </return-value>
-      <parameters>
-        <parameter name="set_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="bindings_activate" c:identifier="gtk_bindings_activate">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="keyval">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="modifiers">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="bindings_activate_event"
-              c:identifier="gtk_bindings_activate_event">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="event">
-          <type name="Gdk.GdkEventKey" c:type="GdkEventKey*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="binding_set_activate"
-              c:identifier="gtk_binding_set_activate">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="binding_set">
-          <type name="GtkBindingSet" c:type="GtkBindingSet*"/>
-        </parameter>
-        <parameter name="keyval">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="modifiers">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
-        </parameter>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="binding_entry_clear"
-              c:identifier="gtk_binding_entry_clear">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="binding_set">
-          <type name="GtkBindingSet" c:type="GtkBindingSet*"/>
-        </parameter>
-        <parameter name="keyval">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="modifiers">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="binding_entry_add_signall"
-              c:identifier="gtk_binding_entry_add_signall">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="binding_set">
-          <type name="GtkBindingSet" c:type="GtkBindingSet*"/>
-        </parameter>
-        <parameter name="keyval">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="modifiers">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
-        </parameter>
-        <parameter name="signal_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="binding_args">
-          <type name="GLib.GSList" c:type="GSList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="binding_parse_binding"
-              c:identifier="gtk_binding_parse_binding">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="scanner">
-          <type name="GLib.GScanner" c:type="GScanner*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="binding_entry_skip" c:identifier="gtk_binding_entry_skip">
+    <function name="menu_shell_get_popup_delay"
+              c:identifier="_gtk_menu_shell_get_popup_delay">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
-        <parameter name="binding_set">
-          <type name="GtkBindingSet" c:type="GtkBindingSet*"/>
-        </parameter>
-        <parameter name="keyval">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="modifiers">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
+        <parameter name="menu_shell">
+          <type name="MenuShell" c:type="GtkMenuShell*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="binding_entry_add_signal"
-              c:identifier="gtk_binding_entry_add_signal">
+    <function name="menu_shell_add_mnemonic"
+              c:identifier="_gtk_menu_shell_add_mnemonic">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="binding_set">
-          <type name="GtkBindingSet" c:type="GtkBindingSet*"/>
+        <parameter name="menu_shell">
+          <type name="MenuShell" c:type="GtkMenuShell*"/>
         </parameter>
         <parameter name="keyval">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="modifiers">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
-        </parameter>
-        <parameter name="signal_name">
-          <type name="string" c:type="gchar*"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="n_args">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="target">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="binding_entry_remove"
-              c:identifier="gtk_binding_entry_remove">
+    <function name="menu_shell_remove_mnemonic"
+              c:identifier="_gtk_menu_shell_remove_mnemonic">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="binding_set">
-          <type name="GtkBindingSet" c:type="GtkBindingSet*"/>
+        <parameter name="menu_shell">
+          <type name="MenuShell" c:type="GtkMenuShell*"/>
         </parameter>
         <parameter name="keyval">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="modifiers">
-          <type name="GdkModifierType" c:type="GdkModifierType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="binding_set_add_path"
-              c:identifier="gtk_binding_set_add_path">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="binding_set">
-          <type name="GtkBindingSet" c:type="GtkBindingSet*"/>
-        </parameter>
-        <parameter name="path_type">
-          <type name="PathType" c:type="GtkPathType"/>
-        </parameter>
-        <parameter name="path_pattern">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="priority">
-          <type name="PathPriorityType" c:type="GtkPathPriorityType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="binding_reset_parsed"
-              c:identifier="_gtk_binding_reset_parsed">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="binding_signal_new" c:identifier="_gtk_binding_signal_new">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="signal_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="itype">
-          <type name="GObject.GType" c:type="GType"/>
-        </parameter>
-        <parameter name="signal_flags">
-          <type name="GSignalFlags" c:type="GSignalFlags"/>
-        </parameter>
-        <parameter name="handler">
-          <type name="GObject.GCallback" c:type="GCallback"/>
-        </parameter>
-        <parameter name="accumulator">
-          <type name="GObject.GSignalAccumulator" c:type="GSignalAccumulator"/>
-        </parameter>
-        <parameter name="accu_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="c_marshaller">
-          <type name="GObject.GSignalCMarshaller" c:type="GSignalCMarshaller"/>
-        </parameter>
-        <parameter name="return_type">
-          <type name="GObject.GType" c:type="GType"/>
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="n_params">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="target">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkBuilderPrivate" c:type="GtkBuilderPrivate"/>
-    <function name="builder_error_quark"
-              c:identifier="gtk_builder_error_quark">
-      <return-value>
-        <type name="GLib.GQuark" c:type="GQuark"/>
-      </return-value>
-    </function>
-    <callback name="GtkBuilderConnectFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="builder">
-          <type name="Builder" c:type="GtkBuilder*"/>
-        </parameter>
-        <parameter name="object">
-          <type name="GObject.Object" c:type="GObject*"/>
-        </parameter>
-        <parameter name="signal_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="handler_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="connect_object">
-          <type name="GObject.Object" c:type="GObject*"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="GConnectFlags" c:type="GConnectFlags"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <class name="Builder"
-           c:type="GtkBuilder"
-           parent="GObject.Object"
-           glib:type-name="GtkBuilder"
-           glib:get-type="gtk_builder_get_type">
-      <constructor name="new" c:identifier="gtk_builder_new">
-        <return-value>
-          <type name="Builder" c:type="GtkBuilder*"/>
-        </return-value>
-      </constructor>
-      <method name="add_from_file" c:identifier="gtk_builder_add_from_file">
+    <class name="Menu"
+           c:type="GtkMenu"
+           parent="MenuShell"
+           glib:type-name="GtkMenu"
+           glib:get-type="gtk_menu_get_type">
+      <method name="popup" c:identifier="gtk_menu_popup">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="builder">
-            <type name="Builder" c:type="GtkBuilder*"/>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
-          <parameter name="filename">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="parent_menu_shell">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="parent_menu_item">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="MenuPositionFunc" c:type="GtkMenuPositionFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="button">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="activate_time">
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_from_string"
-              c:identifier="gtk_builder_add_from_string">
+      <method name="reposition" c:identifier="gtk_menu_reposition">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="builder">
-            <type name="Builder" c:type="GtkBuilder*"/>
-          </parameter>
-          <parameter name="buffer">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="length">
-            <type name="size" c:type="gsize"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_object" c:identifier="gtk_builder_get_object">
+      <method name="popdown" c:identifier="gtk_menu_popdown">
         <return-value>
-          <type name="GObject.Object" c:type="GObject*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="builder">
-            <type name="Builder" c:type="GtkBuilder*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_objects" c:identifier="gtk_builder_get_objects">
+      <method name="get_active" c:identifier="gtk_menu_get_active">
         <return-value>
-          <type name="GLib.GSList" c:type="GSList*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="builder">
-            <type name="Builder" c:type="GtkBuilder*"/>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="connect_signals"
-              c:identifier="gtk_builder_connect_signals">
+      <method name="set_active" c:identifier="gtk_menu_set_active">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="builder">
-            <type name="Builder" c:type="GtkBuilder*"/>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="index_">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="connect_signals_full"
-              c:identifier="gtk_builder_connect_signals_full">
+      <method name="set_accel_group" c:identifier="gtk_menu_set_accel_group">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="builder">
-            <type name="Builder" c:type="GtkBuilder*"/>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
-          <parameter name="func">
-            <type name="GtkBuilderConnectFunc" c:type="GtkBuilderConnectFunc"/>
+          <parameter name="accel_group" allow-none="1">
+            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+        </parameters>
+      </method>
+      <method name="get_accel_group" c:identifier="gtk_menu_get_accel_group">
+        <return-value>
+          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_translation_domain"
-              c:identifier="gtk_builder_set_translation_domain">
+      <method name="set_accel_path" c:identifier="gtk_menu_set_accel_path">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="builder">
-            <type name="Builder" c:type="GtkBuilder*"/>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
-          <parameter name="domain">
+          <parameter name="accel_path" allow-none="1">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_translation_domain"
-              c:identifier="gtk_builder_get_translation_domain">
+      <method name="attach_to_widget" c:identifier="gtk_menu_attach_to_widget">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="builder">
-            <type name="Builder" c:type="GtkBuilder*"/>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
+          </parameter>
+          <parameter name="attach_widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="detacher">
+            <type name="MenuDetachFunc" c:type="GtkMenuDetachFunc"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_type_from_name"
-              c:identifier="gtk_builder_get_type_from_name">
+      <method name="detach" c:identifier="gtk_menu_detach">
         <return-value>
-          <type name="GObject.GType" c:type="GType"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="builder">
-            <type name="Builder" c:type="GtkBuilder*"/>
-          </parameter>
-          <parameter name="type_name">
-            <type name="string" c:type="char*"/>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="value_from_string"
-              c:identifier="gtk_builder_value_from_string">
+      <method name="get_attach_widget"
+              c:identifier="gtk_menu_get_attach_widget">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="builder">
-            <type name="Builder" c:type="GtkBuilder*"/>
-          </parameter>
-          <parameter name="pspec">
-            <type name="GObject.GParamSpec" c:type="GParamSpec*"/>
-          </parameter>
-          <parameter name="string">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
-          <parameter name="value">
-            <type name="GObject.GValue" c:type="GValue*"/>
+        </parameters>
+      </method>
+      <method name="set_tearoff_state"
+              c:identifier="gtk_menu_set_tearoff_state">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="torn_off">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="value_from_string_type"
-              c:identifier="gtk_builder_value_from_string_type">
+      <method name="get_tearoff_state"
+              c:identifier="gtk_menu_get_tearoff_state">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="builder">
-            <type name="Builder" c:type="GtkBuilder*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="GObject.GType" c:type="GType"/>
-          </parameter>
-          <parameter name="string">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="GObject.GValue" c:type="GValue*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="translation-domain">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <callback name="get_type_from_name">
+      <method name="set_title" c:identifier="gtk_menu_set_title">
         <return-value>
-          <type name="GObject.GType" c:type="GType"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="builder">
-            <type name="Builder" c:type="GtkBuilder*"/>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
-          <parameter name="type_name">
-            <type name="string" c:type="char*"/>
+          <parameter name="title">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
+      </method>
+      <method name="get_title" c:identifier="gtk_menu_get_title">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+        <parameters>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="reorder_child" c:identifier="gtk_menu_reorder_child">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_screen" c:identifier="gtk_menu_set_screen">
         <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>
-      <callback name="_gtk_reserved8">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-    </class>
-    <record name="GtkBuildable" c:type="GtkBuildable"/>
-    <interface name="Buildable"
-               c:type="GtkBuildable"
-               glib:type-name="GtkBuildable"
-               glib:get-type="gtk_buildable_get_type">
-      <callback name="set_name">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="buildable">
-            <type name="Buildable" c:type="GtkBuildable*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_name">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="buildable">
-            <type name="Buildable" c:type="GtkBuildable*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="add_child">
+        <parameters>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
+          </parameter>
+          <parameter name="screen" allow-none="1">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="attach" c:identifier="gtk_menu_attach">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buildable">
-            <type name="Buildable" c:type="GtkBuildable*"/>
-          </parameter>
-          <parameter name="builder">
-            <type name="Builder" c:type="GtkBuilder*"/>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
           <parameter name="child">
-            <type name="GObject.Object" c:type="GObject*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="string" c:type="gchar*"/>
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_buildable_property">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="buildable">
-            <type name="Buildable" c:type="GtkBuildable*"/>
+          <parameter name="left_attach">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="builder">
-            <type name="Builder" c:type="GtkBuilder*"/>
+          <parameter name="right_attach">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="top_attach">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="value">
-            <type name="GObject.GValue" c:type="GValue*"/>
+          <parameter name="bottom_attach">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="construct_child">
+      </method>
+      <method name="set_monitor" c:identifier="gtk_menu_set_monitor">
         <return-value>
-          <type name="GObject.Object" c:type="GObject*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buildable">
-            <type name="Buildable" c:type="GtkBuildable*"/>
-          </parameter>
-          <parameter name="builder">
-            <type name="Builder" c:type="GtkBuilder*"/>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="monitor_num">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="custom_tag_start">
+      </method>
+      <property name="tearoff-state">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="tearoff-title">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="buildable">
-            <type name="Buildable" c:type="GtkBuildable*"/>
-          </parameter>
-          <parameter name="builder">
-            <type name="Builder" c:type="GtkBuilder*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="GObject.Object" c:type="GObject*"/>
-          </parameter>
-          <parameter name="tagname">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="parser">
-            <type name="GLib.GMarkupParser" c:type="GMarkupParser*"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="custom_tag_end">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="buildable">
-            <type name="Buildable" c:type="GtkBuildable*"/>
-          </parameter>
-          <parameter name="builder">
-            <type name="Builder" c:type="GtkBuilder*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="GObject.Object" c:type="GObject*"/>
-          </parameter>
-          <parameter name="tagname">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="data">
-            <type name="gpointer" c:type="gpointer*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="custom_finished">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="buildable">
-            <type name="Buildable" c:type="GtkBuildable*"/>
-          </parameter>
-          <parameter name="builder">
-            <type name="Builder" c:type="GtkBuilder*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="GObject.Object" c:type="GObject*"/>
-          </parameter>
-          <parameter name="tagname">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="parser_finished">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="buildable">
-            <type name="Buildable" c:type="GtkBuildable*"/>
-          </parameter>
-          <parameter name="builder">
-            <type name="Builder" c:type="GtkBuilder*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="get_internal_child">
+      <glib:signal name="move-scroll">
         <return-value>
-          <type name="GObject.Object" c:type="GObject*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buildable">
-            <type name="Buildable" c:type="GtkBuildable*"/>
-          </parameter>
-          <parameter name="builder">
-            <type name="Builder" c:type="GtkBuilder*"/>
-          </parameter>
-          <parameter name="childname">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="object">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
         </parameters>
-      </callback>
-    </interface>
-    <function name="buildable_set_name" c:identifier="gtk_buildable_set_name">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="buildable">
-          <type name="Buildable" c:type="GtkBuildable*"/>
-        </parameter>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="buildable_get_name" c:identifier="gtk_buildable_get_name">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="buildable">
-          <type name="Buildable" c:type="GtkBuildable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="buildable_add_child"
-              c:identifier="gtk_buildable_add_child">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="buildable">
-          <type name="Buildable" c:type="GtkBuildable*"/>
-        </parameter>
-        <parameter name="builder">
-          <type name="Builder" c:type="GtkBuilder*"/>
-        </parameter>
-        <parameter name="child">
-          <type name="GObject.Object" c:type="GObject*"/>
-        </parameter>
-        <parameter name="type">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="buildable_set_buildable_property"
-              c:identifier="gtk_buildable_set_buildable_property">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="buildable">
-          <type name="Buildable" c:type="GtkBuildable*"/>
-        </parameter>
-        <parameter name="builder">
-          <type name="Builder" c:type="GtkBuilder*"/>
-        </parameter>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="buildable_construct_child"
-              c:identifier="gtk_buildable_construct_child">
-      <return-value>
-        <type name="GObject.Object" c:type="GObject*"/>
-      </return-value>
-      <parameters>
-        <parameter name="buildable">
-          <type name="Buildable" c:type="GtkBuildable*"/>
-        </parameter>
-        <parameter name="builder">
-          <type name="Builder" c:type="GtkBuilder*"/>
-        </parameter>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="buildable_custom_tag_start"
-              c:identifier="gtk_buildable_custom_tag_start">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="buildable">
-          <type name="Buildable" c:type="GtkBuildable*"/>
-        </parameter>
-        <parameter name="builder">
-          <type name="Builder" c:type="GtkBuilder*"/>
-        </parameter>
-        <parameter name="child">
-          <type name="GObject.Object" c:type="GObject*"/>
-        </parameter>
-        <parameter name="tagname">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="parser">
-          <type name="GLib.GMarkupParser" c:type="GMarkupParser*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="buildable_custom_tag_end"
-              c:identifier="gtk_buildable_custom_tag_end">
+      </glib:signal>
+    </class>
+    <callback name="MenuPositionFunc" c:type="GtkMenuPositionFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="buildable">
-          <type name="Buildable" c:type="GtkBuildable*"/>
+        <parameter name="menu">
+          <type name="Menu" c:type="GtkMenu*"/>
         </parameter>
-        <parameter name="builder">
-          <type name="Builder" c:type="GtkBuilder*"/>
+        <parameter name="x">
+          <type name="int" c:type="gint*"/>
         </parameter>
-        <parameter name="child">
-          <type name="GObject.Object" c:type="GObject*"/>
+        <parameter name="y">
+          <type name="int" c:type="gint*"/>
         </parameter>
-        <parameter name="tagname">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="push_in">
+          <type name="boolean" c:type="gboolean*"/>
         </parameter>
-        <parameter name="data">
-          <type name="gpointer" c:type="gpointer*"/>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="buildable_custom_finished"
-              c:identifier="gtk_buildable_custom_finished">
+    </callback>
+    <callback name="MenuDetachFunc" c:type="GtkMenuDetachFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="buildable">
-          <type name="Buildable" c:type="GtkBuildable*"/>
-        </parameter>
-        <parameter name="builder">
-          <type name="Builder" c:type="GtkBuilder*"/>
-        </parameter>
-        <parameter name="child">
-          <type name="GObject.Object" c:type="GObject*"/>
-        </parameter>
-        <parameter name="tagname">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="attach_widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="menu">
+          <type name="Menu" c:type="GtkMenu*"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="buildable_parser_finished"
-              c:identifier="gtk_buildable_parser_finished">
+    </callback>
+    <function name="menu_new" c:identifier="gtk_menu_new">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="buildable">
-          <type name="Buildable" c:type="GtkBuildable*"/>
-        </parameter>
-        <parameter name="builder">
-          <type name="Builder" c:type="GtkBuilder*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="buildable_get_internal_child"
-              c:identifier="gtk_buildable_get_internal_child">
+    <function name="menu_get_for_attach_widget"
+              c:identifier="gtk_menu_get_for_attach_widget">
       <return-value>
-        <type name="GObject.Object" c:type="GObject*"/>
+        <type name="GLib.List" c:type="GList*"/>
       </return-value>
       <parameters>
-        <parameter name="buildable">
-          <type name="Buildable" c:type="GtkBuildable*"/>
-        </parameter>
-        <parameter name="builder">
-          <type name="Builder" c:type="GtkBuilder*"/>
-        </parameter>
-        <parameter name="childname">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkImagePixmapData" c:type="GtkImagePixmapData">
-      <field name="pixmap">
-        <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-      </field>
-    </record>
-    <record name="GtkImageImageData" c:type="GtkImageImageData">
-      <field name="image">
-        <type name="Gdk.Image" c:type="GdkImage*"/>
-      </field>
-    </record>
-    <record name="GtkImagePixbufData" c:type="GtkImagePixbufData">
-      <field name="pixbuf">
-        <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-      </field>
-    </record>
-    <record name="GtkImageStockData" c:type="GtkImageStockData">
-      <field name="stock_id">
-        <type name="string" c:type="gchar*"/>
-      </field>
-    </record>
-    <record name="GtkImageIconSetData" c:type="GtkImageIconSetData">
-      <field name="icon_set">
-        <type name="IconSet" c:type="GtkIconSet*"/>
-      </field>
-    </record>
-    <record name="GtkImageAnimationData" c:type="GtkImageAnimationData">
-      <field name="anim">
-        <type name="GdkPixbufAnimation" c:type="GdkPixbufAnimation*"/>
-      </field>
-      <field name="iter">
-        <type name="GdkPixbufAnimationIter" c:type="GdkPixbufAnimationIter*"/>
-      </field>
-      <field name="frame_timeout">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GtkImageIconNameData" c:type="GtkImageIconNameData">
-      <field name="icon_name">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="pixbuf">
-        <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-      </field>
-      <field name="theme_change_id">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <class name="Image"
-           c:type="GtkImage"
+    <class name="Label"
+           c:type="GtkLabel"
            parent="Misc"
-           glib:type-name="GtkImage"
-           glib:get-type="gtk_image_get_type">
-      <method name="clear" c:identifier="gtk_image_clear">
+           glib:type-name="GtkLabel"
+           glib:get-type="gtk_label_get_type">
+      <method name="set_text" c:identifier="gtk_label_set_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
+          </parameter>
+          <parameter name="str">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_from_pixmap" c:identifier="gtk_image_set_from_pixmap">
+      <method name="get_text" c:identifier="gtk_label_get_text">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
-          </parameter>
-          <parameter name="pixmap">
-            <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-          </parameter>
-          <parameter name="mask" allow-none="1">
-            <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_from_image" c:identifier="gtk_image_set_from_image">
+      <method name="set_attributes" c:identifier="gtk_label_set_attributes">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
-          </parameter>
-          <parameter name="gdk_image" allow-none="1">
-            <type name="Gdk.Image" c:type="GdkImage*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
-          <parameter name="mask" allow-none="1">
-            <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
+          <parameter name="attrs">
+            <type name="Pango.AttrList" c:type="PangoAttrList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_from_file" c:identifier="gtk_image_set_from_file">
+      <method name="get_attributes" c:identifier="gtk_label_get_attributes">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Pango.AttrList" c:type="PangoAttrList*"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
-          </parameter>
-          <parameter name="filename" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_from_pixbuf" c:identifier="gtk_image_set_from_pixbuf">
+      <method name="set_label" c:identifier="gtk_label_set_label">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
-          <parameter name="pixbuf" allow-none="1">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="str">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_from_stock" c:identifier="gtk_image_set_from_stock">
+      <method name="get_label" c:identifier="gtk_label_get_label">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
-          </parameter>
-          <parameter name="stock_id">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="size">
-            <type name="IconSize" c:type="GtkIconSize"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_from_icon_set"
-              c:identifier="gtk_image_set_from_icon_set">
+      <method name="set_markup" c:identifier="gtk_label_set_markup">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
-          </parameter>
-          <parameter name="icon_set">
-            <type name="IconSet" c:type="GtkIconSet*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
-          <parameter name="size">
-            <type name="IconSize" c:type="GtkIconSize"/>
+          <parameter name="str">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_from_animation"
-              c:identifier="gtk_image_set_from_animation">
+      <method name="set_use_markup" c:identifier="gtk_label_set_use_markup">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
-          <parameter name="animation">
-            <type name="GdkPixbufAnimation" c:type="GdkPixbufAnimation*"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_from_icon_name"
-              c:identifier="gtk_image_set_from_icon_name">
+      <method name="get_use_markup" c:identifier="gtk_label_get_use_markup">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
-          </parameter>
-          <parameter name="icon_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="size">
-            <type name="IconSize" c:type="GtkIconSize"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_pixel_size" c:identifier="gtk_image_set_pixel_size">
+      <method name="set_use_underline"
+              c:identifier="gtk_label_set_use_underline">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
-          <parameter name="pixel_size">
-            <type name="int32" c:type="gint"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_storage_type"
-              c:identifier="gtk_image_get_storage_type">
+      <method name="get_use_underline"
+              c:identifier="gtk_label_get_use_underline">
         <return-value>
-          <type name="ImageType" c:type="GtkImageType"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_pixmap" c:identifier="gtk_image_get_pixmap">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
-          </parameter>
-          <parameter name="pixmap">
-            <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
-          </parameter>
-          <parameter name="mask">
-            <type name="Gdk.GdkBitmap" c:type="GdkBitmap**"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_image" c:identifier="gtk_image_get_image">
+      <method name="set_markup_with_mnemonic"
+              c:identifier="gtk_label_set_markup_with_mnemonic">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
-          </parameter>
-          <parameter name="gdk_image">
-            <type name="Gdk.Image" c:type="GdkImage**"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
-          <parameter name="mask">
-            <type name="Gdk.GdkBitmap" c:type="GdkBitmap**"/>
+          <parameter name="str">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_pixbuf" c:identifier="gtk_image_get_pixbuf">
+      <method name="get_mnemonic_keyval"
+              c:identifier="gtk_label_get_mnemonic_keyval">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_stock" c:identifier="gtk_image_get_stock">
+      <method name="set_mnemonic_widget"
+              c:identifier="gtk_label_set_mnemonic_widget">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
-          </parameter>
-          <parameter name="stock_id">
-            <type name="GLib.gchar" c:type="gchar**"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
-          <parameter name="size">
-            <type name="IconSize" c:type="GtkIconSize*"/>
+          <parameter name="widget" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_icon_set" c:identifier="gtk_image_get_icon_set">
+      <method name="get_mnemonic_widget"
+              c:identifier="gtk_label_get_mnemonic_widget">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
-          </parameter>
-          <parameter name="icon_set">
-            <type name="IconSet" c:type="GtkIconSet**"/>
-          </parameter>
-          <parameter name="size">
-            <type name="IconSize" c:type="GtkIconSize*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_animation" c:identifier="gtk_image_get_animation">
+      <method name="set_text_with_mnemonic"
+              c:identifier="gtk_label_set_text_with_mnemonic">
         <return-value>
-          <type name="GdkPixbufAnimation" c:type="GdkPixbufAnimation*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
+          </parameter>
+          <parameter name="str">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_icon_name" c:identifier="gtk_image_get_icon_name">
+      <method name="set_justify" c:identifier="gtk_label_set_justify">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
-          </parameter>
-          <parameter name="icon_name">
-            <type name="GLib.gchar" c:type="gchar**"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
-          <parameter name="size">
-            <type name="IconSize" c:type="GtkIconSize*"/>
+          <parameter name="jtype">
+            <type name="Justification" c:type="GtkJustification"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_pixel_size" c:identifier="gtk_image_get_pixel_size">
+      <method name="get_justify" c:identifier="gtk_label_get_justify">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="Justification" c:type="GtkJustification"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set" c:identifier="gtk_image_set">
+      <method name="set_ellipsize" c:identifier="gtk_label_set_ellipsize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
-          </parameter>
-          <parameter name="val">
-            <type name="Gdk.Image" c:type="GdkImage*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
-          <parameter name="mask">
-            <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
+          <parameter name="mode">
+            <type name="Pango.EllipsizeMode" c:type="PangoEllipsizeMode"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get" c:identifier="gtk_image_get">
+      <method name="get_ellipsize" c:identifier="gtk_label_get_ellipsize">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Pango.EllipsizeMode" c:type="PangoEllipsizeMode"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="GtkImage*"/>
-          </parameter>
-          <parameter name="val">
-            <type name="Gdk.Image" c:type="GdkImage**"/>
-          </parameter>
-          <parameter name="mask">
-            <type name="Gdk.GdkBitmap" c:type="GdkBitmap**"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="pixbuf">
-        <type name="GdkPixbuf" c:type="GdkPixbuf"/>
-      </property>
-      <property name="pixmap">
-        <type name="Gdk.Pixmap" c:type="GdkPixmap"/>
-      </property>
-      <property name="image">
-        <type name="Gdk.Image" c:type="GdkImage"/>
-      </property>
-      <property name="mask">
-        <type name="Gdk.Pixmap" c:type="GdkPixmap"/>
-      </property>
-      <property name="file">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="stock">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="icon-set">
-        <type name="IconSet" c:type="GtkIconSet"/>
-      </property>
-      <property name="icon-size">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="pixel-size">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="pixbuf-animation">
-        <type name="GdkPixbufAnimation" c:type="GdkPixbufAnimation"/>
-      </property>
-      <property name="icon-name">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="storage-type">
-        <type name="ImageType" c:type="GtkImageType"/>
-      </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="image_new" c:identifier="gtk_image_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="image_new_from_pixmap"
-              c:identifier="gtk_image_new_from_pixmap">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="pixmap" allow-none="1">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask" allow-none="1">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="image_new_from_image"
-              c:identifier="gtk_image_new_from_image">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="image" allow-none="1">
-          <type name="Gdk.Image" c:type="GdkImage*"/>
-        </parameter>
-        <parameter name="mask" allow-none="1">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="image_new_from_file"
-              c:identifier="gtk_image_new_from_file">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="filename">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="image_new_from_pixbuf"
-              c:identifier="gtk_image_new_from_pixbuf">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="pixbuf" allow-none="1">
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="image_new_from_stock"
-              c:identifier="gtk_image_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="size">
-          <type name="IconSize" c:type="GtkIconSize"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="image_new_from_icon_set"
-              c:identifier="gtk_image_new_from_icon_set">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="icon_set">
-          <type name="IconSet" c:type="GtkIconSet*"/>
-        </parameter>
-        <parameter name="size">
-          <type name="IconSize" c:type="GtkIconSize"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="image_new_from_animation"
-              c:identifier="gtk_image_new_from_animation">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="animation">
-          <type name="GdkPixbufAnimation" c:type="GdkPixbufAnimation*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="image_new_from_icon_name"
-              c:identifier="gtk_image_new_from_icon_name">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="icon_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="size">
-          <type name="IconSize" c:type="GtkIconSize"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="Button"
-           c:type="GtkButton"
-           parent="Bin"
-           glib:type-name="GtkButton"
-           glib:get-type="gtk_button_get_type">
-      <method name="pressed" c:identifier="gtk_button_pressed">
+      <method name="set_width_chars" c:identifier="gtk_label_set_width_chars">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
+          </parameter>
+          <parameter name="n_chars">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="released" c:identifier="gtk_button_released">
+      <method name="get_width_chars" c:identifier="gtk_label_get_width_chars">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="clicked" c:identifier="gtk_button_clicked">
+      <method name="set_max_width_chars"
+              c:identifier="gtk_label_set_max_width_chars">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
+          </parameter>
+          <parameter name="n_chars">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="enter" c:identifier="gtk_button_enter">
+      <method name="get_max_width_chars"
+              c:identifier="gtk_label_get_max_width_chars">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="leave" c:identifier="gtk_button_leave">
+      <method name="set_pattern" c:identifier="gtk_label_set_pattern">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
+          </parameter>
+          <parameter name="pattern">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_relief" c:identifier="gtk_button_set_relief">
+      <method name="set_line_wrap" c:identifier="gtk_label_set_line_wrap">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
-          <parameter name="newstyle">
-            <type name="ReliefStyle" c:type="GtkReliefStyle"/>
+          <parameter name="wrap">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_relief" c:identifier="gtk_button_get_relief">
+      <method name="get_line_wrap" c:identifier="gtk_label_get_line_wrap">
         <return-value>
-          <type name="ReliefStyle" c:type="GtkReliefStyle"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_label" c:identifier="gtk_button_set_label">
+      <method name="set_line_wrap_mode"
+              c:identifier="gtk_label_set_line_wrap_mode">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
-          </parameter>
           <parameter name="label">
-            <type name="string" c:type="gchar*"/>
+            <type name="Label" c:type="GtkLabel*"/>
+          </parameter>
+          <parameter name="wrap_mode">
+            <type name="Pango.WrapMode" c:type="PangoWrapMode"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_label" c:identifier="gtk_button_get_label">
+      <method name="get_line_wrap_mode"
+              c:identifier="gtk_label_get_line_wrap_mode">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="Pango.WrapMode" c:type="PangoWrapMode"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_use_underline"
-              c:identifier="gtk_button_set_use_underline">
+      <method name="set_selectable" c:identifier="gtk_label_set_selectable">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
-          <parameter name="use_underline">
+          <parameter name="setting">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_use_underline"
-              c:identifier="gtk_button_get_use_underline">
+      <method name="get_selectable" c:identifier="gtk_label_get_selectable">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_use_stock" c:identifier="gtk_button_set_use_stock">
+      <method name="set_angle" c:identifier="gtk_label_set_angle">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
-          <parameter name="use_stock">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="angle">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_use_stock" c:identifier="gtk_button_get_use_stock">
+      <method name="get_angle" c:identifier="gtk_label_get_angle">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_focus_on_click"
-              c:identifier="gtk_button_set_focus_on_click">
+      <method name="select_region" c:identifier="gtk_label_select_region">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
-          <parameter name="focus_on_click">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="start_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="end_offset">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_focus_on_click"
-              c:identifier="gtk_button_get_focus_on_click">
+      <method name="get_selection_bounds"
+              c:identifier="gtk_label_get_selection_bounds">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
+          </parameter>
+          <parameter name="start">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_alignment" c:identifier="gtk_button_set_alignment">
+      <method name="get_layout" c:identifier="gtk_label_get_layout">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Pango.Layout" c:type="PangoLayout*"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
-          </parameter>
-          <parameter name="xalign">
-            <type name="float" c:type="gfloat"/>
-          </parameter>
-          <parameter name="yalign">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_alignment" c:identifier="gtk_button_get_alignment">
+      <method name="get_layout_offsets"
+              c:identifier="gtk_label_get_layout_offsets">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
-          <parameter name="xalign">
-            <type name="GLib.gfloat" c:type="gfloat*"/>
+          <parameter name="x">
+            <type name="int" c:type="gint*"/>
           </parameter>
-          <parameter name="yalign">
-            <type name="GLib.gfloat" c:type="gfloat*"/>
+          <parameter name="y">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_image" c:identifier="gtk_button_set_image">
+      <method name="set_single_line_mode"
+              c:identifier="gtk_label_set_single_line_mode">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
-          <parameter name="image">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="single_line_mode">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_image" c:identifier="gtk_button_get_image">
+      <method name="get_single_line_mode"
+              c:identifier="gtk_label_get_single_line_mode">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_image_position"
-              c:identifier="gtk_button_set_image_position">
+      <method name="get" c:identifier="gtk_label_get">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
-          <parameter name="position">
-            <type name="PositionType" c:type="GtkPositionType"/>
+          <parameter name="str">
+            <type name="GLib.char" c:type="gchar**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_image_position"
-              c:identifier="gtk_button_get_image_position">
+      <method name="parse_uline" c:identifier="gtk_label_parse_uline">
         <return-value>
-          <type name="PositionType" c:type="GtkPositionType"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
+          </parameter>
+          <parameter name="string">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <property name="label">
         <type name="string" c:type="gchararray"/>
       </property>
-      <property name="image">
-        <type name="Widget" c:type="GtkWidget"/>
+      <property name="attributes">
+        <type name="Pango.AttrList" c:type="PangoAttrList"/>
       </property>
-      <property name="relief">
-        <type name="ReliefStyle" c:type="GtkReliefStyle"/>
+      <property name="use-markup">
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="use-underline">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="use-stock">
+      <property name="justify">
+        <type name="Justification" c:type="GtkJustification"/>
+      </property>
+      <property name="pattern">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="wrap">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="focus-on-click">
+      <property name="wrap-mode">
+        <type name="Pango.WrapMode" c:type="PangoWrapMode"/>
+      </property>
+      <property name="selectable">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="xalign">
-        <type name="float" c:type="gfloat"/>
+      <property name="mnemonic-keyval">
+        <type name="uint" c:type="guint"/>
       </property>
-      <property name="yalign">
-        <type name="float" c:type="gfloat"/>
+      <property name="mnemonic-widget">
+        <type name="Widget" c:type="GtkWidget"/>
       </property>
-      <property name="image-position">
-        <type name="PositionType" c:type="GtkPositionType"/>
+      <property name="cursor-position">
+        <type name="int" c:type="gint"/>
       </property>
-      <callback name="pressed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="released">
+      <property name="selection-bound">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="ellipsize">
+        <type name="Pango.EllipsizeMode" c:type="PangoEllipsizeMode"/>
+      </property>
+      <property name="width-chars">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="single-line-mode">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="angle">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="max-width-chars">
+        <type name="int" c:type="gint"/>
+      </property>
+      <callback name="move_cursor" c:type="move_cursor">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="clicked">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="step">
+            <type name="MovementStep" c:type="GtkMovementStep"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="enter">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="extend_selection">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="leave">
+      <callback name="copy_clipboard" c:type="copy_clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="activate">
+      <callback name="populate_popup" c:type="populate_popup">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="Button" c:type="GtkButton*"/>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
+          </parameter>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="activate">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="pressed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="released">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="clicked">
+      <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="int" c:type="gint"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
       </glib:signal>
-      <glib:signal name="enter">
+      <glib:signal name="copy-clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-      <glib:signal name="leave">
+      <glib:signal name="populate-popup">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Menu" c:type="GtkMenu"/>
+          </parameter>
+        </parameters>
       </glib:signal>
     </class>
-    <function name="button_new" c:identifier="gtk_button_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="button_new_with_label"
-              c:identifier="gtk_button_new_with_label">
+    <record name="LabelSelectionInfo" c:type="GtkLabelSelectionInfo"/>
+    <function name="label_new" c:identifier="gtk_label_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="label">
+        <parameter name="str">
           <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="button_new_from_stock"
-              c:identifier="gtk_button_new_from_stock">
+    <function name="label_new_with_mnemonic"
+              c:identifier="gtk_label_new_with_mnemonic">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="stock_id">
+        <parameter name="str">
           <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="button_new_with_mnemonic"
-              c:identifier="gtk_button_new_with_mnemonic">
+    <class name="AccelLabel"
+           c:type="GtkAccelLabel"
+           parent="Label"
+           glib:type-name="GtkAccelLabel"
+           glib:get-type="gtk_accel_label_get_type">
+      <method name="get_accel_widget"
+              c:identifier="gtk_accel_label_get_accel_widget">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="accel_label">
+            <type name="AccelLabel" c:type="GtkAccelLabel*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_accel_width"
+              c:identifier="gtk_accel_label_get_accel_width">
+        <return-value>
+          <type name="uint" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="accel_label">
+            <type name="AccelLabel" c:type="GtkAccelLabel*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_accel_widget"
+              c:identifier="gtk_accel_label_set_accel_widget">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="accel_label">
+            <type name="AccelLabel" c:type="GtkAccelLabel*"/>
+          </parameter>
+          <parameter name="accel_widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_accel_closure"
+              c:identifier="gtk_accel_label_set_accel_closure">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="accel_label">
+            <type name="AccelLabel" c:type="GtkAccelLabel*"/>
+          </parameter>
+          <parameter name="accel_closure">
+            <type name="GObject.Closure" c:type="GClosure*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="refetch" c:identifier="gtk_accel_label_refetch">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="accel_label">
+            <type name="AccelLabel" c:type="GtkAccelLabel*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="accel-closure">
+        <type name="GObject.Closure" c:type="GClosure"/>
+      </property>
+      <property name="accel-widget">
+        <type name="Widget" c:type="GtkWidget"/>
+      </property>
+      <field name="signal_quote1">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="signal_quote2">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="mod_name_shift">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="mod_name_control">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="mod_name_alt">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="mod_separator">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="accel_seperator">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="latin1_to_char">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="accel_label_new" c:identifier="gtk_accel_label_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="label">
+        <parameter name="string">
           <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="button_set_depressed"
-              c:identifier="_gtk_button_set_depressed">
+    <function name="accel_label_class_get_accelerator_label"
+              c:identifier="_gtk_accel_label_class_get_accelerator_label">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="button">
-          <type name="Button" c:type="GtkButton*"/>
+        <parameter name="klass">
+          <type name="AccelLabelClass" c:type="GtkAccelLabelClass*"/>
         </parameter>
-        <parameter name="depressed">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="accelerator_key">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="accelerator_mods">
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="button_paint" c:identifier="_gtk_button_paint">
+    <class name="AccelMap"
+           c:type="GtkAccelMap"
+           parent="GObject.Object"
+           glib:type-name="GtkAccelMap"
+           glib:get-type="gtk_accel_map_get_type">
+      <constructor name="get" c:identifier="gtk_accel_map_get">
+        <return-value>
+          <type name="AccelMap" c:type="GtkAccelMap*"/>
+        </return-value>
+      </constructor>
+      <glib:signal name="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
+    <callback name="AccelMapForeach" c:type="GtkAccelMapForeach">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="button">
-          <type name="Button" c:type="GtkButton*"/>
-        </parameter>
-        <parameter name="area">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
+        <parameter name="accel_path">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
+        <parameter name="accel_key">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="main_detail">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="accel_mods">
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
         </parameter>
-        <parameter name="default_detail">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="changed">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="marshal_BOOLEAN__VOID"
-              c:identifier="gtk_marshal_BOOLEAN__VOID">
+    </callback>
+    <function name="accel_map_add_entry"
+              c:identifier="gtk_accel_map_add_entry">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
+        <parameter name="accel_path">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="accel_key">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="accel_mods">
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_BOOLEAN__POINTER"
-              c:identifier="gtk_marshal_BOOLEAN__POINTER">
+    <function name="accel_map_lookup_entry"
+              c:identifier="gtk_accel_map_lookup_entry">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
+        <parameter name="accel_path">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
+        <parameter name="key">
+          <type name="AccelKey" c:type="GtkAccelKey*"/>
         </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
+      </parameters>
+    </function>
+    <function name="accel_map_change_entry"
+              c:identifier="gtk_accel_map_change_entry">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="accel_path">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
+        <parameter name="accel_key">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="accel_mods">
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="replace">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_BOOLEAN__POINTER_POINTER_INT_INT"
-              c:identifier="gtk_marshal_BOOLEAN__POINTER_POINTER_INT_INT">
+    <function name="accel_map_load" c:identifier="gtk_accel_map_load">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="file_name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_BOOLEAN__POINTER_INT_INT"
-              c:identifier="gtk_marshal_BOOLEAN__POINTER_INT_INT">
+    <function name="accel_map_save" c:identifier="gtk_accel_map_save">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="file_name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_BOOLEAN__POINTER_INT_INT_UINT"
-              c:identifier="gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT">
+    <function name="accel_map_foreach" c:identifier="gtk_accel_map_foreach">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
+        <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="foreach_func">
+          <type name="AccelMapForeach" c:type="GtkAccelMapForeach"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_BOOLEAN__POINTER_STRING_STRING_POINTER"
-              c:identifier="gtk_marshal_BOOLEAN__POINTER_STRING_STRING_POINTER">
+    <function name="accel_map_load_fd" c:identifier="gtk_accel_map_load_fd">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="fd">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_ENUM__ENUM" c:identifier="gtk_marshal_ENUM__ENUM">
+    <function name="accel_map_load_scanner"
+              c:identifier="gtk_accel_map_load_scanner">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="scanner">
+          <type name="GLib.Scanner" c:type="GScanner*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_INT__POINTER"
-              c:identifier="gtk_marshal_INT__POINTER">
+    <function name="accel_map_save_fd" c:identifier="gtk_accel_map_save_fd">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="fd">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_INT__POINTER_CHAR_CHAR"
-              c:identifier="gtk_marshal_INT__POINTER_CHAR_CHAR">
+    <function name="accel_map_lock_path"
+              c:identifier="gtk_accel_map_lock_path">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="accel_path">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__ENUM_FLOAT"
-              c:identifier="gtk_marshal_VOID__ENUM_FLOAT">
+    <function name="accel_map_unlock_path"
+              c:identifier="gtk_accel_map_unlock_path">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="accel_path">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__ENUM_FLOAT_BOOLEAN"
-              c:identifier="gtk_marshal_VOID__ENUM_FLOAT_BOOLEAN">
+    <function name="accel_map_add_filter"
+              c:identifier="gtk_accel_map_add_filter">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="filter_pattern">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__INT_INT"
-              c:identifier="gtk_marshal_VOID__INT_INT">
+    <function name="accel_map_foreach_unfiltered"
+              c:identifier="gtk_accel_map_foreach_unfiltered">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
+        <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="foreach_func">
+          <type name="AccelMapForeach" c:type="GtkAccelMapForeach"/>
         </parameter>
       </parameters>
     </function>
-    <function name="marshal_VOID__INT_INT_POINTER"
-              c:identifier="gtk_marshal_VOID__INT_INT_POINTER">
+    <function name="accel_map_init" c:identifier="_gtk_accel_map_init">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__POINTER_INT"
-              c:identifier="gtk_marshal_VOID__POINTER_INT">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__POINTER_POINTER"
-              c:identifier="gtk_marshal_VOID__POINTER_POINTER">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__POINTER_POINTER_POINTER"
-              c:identifier="gtk_marshal_VOID__POINTER_POINTER_POINTER">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__POINTER_STRING_STRING"
-              c:identifier="gtk_marshal_VOID__POINTER_STRING_STRING">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__POINTER_UINT"
-              c:identifier="gtk_marshal_VOID__POINTER_UINT">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__POINTER_UINT_ENUM"
-              c:identifier="gtk_marshal_VOID__POINTER_UINT_ENUM">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__POINTER_POINTER_UINT_UINT"
-              c:identifier="gtk_marshal_VOID__POINTER_POINTER_UINT_UINT">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT"
-              c:identifier="gtk_marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__POINTER_UINT_UINT"
-              c:identifier="gtk_marshal_VOID__POINTER_UINT_UINT">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__STRING_INT_POINTER"
-              c:identifier="gtk_marshal_VOID__STRING_INT_POINTER">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER"
-              c:identifier="gtk_marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__UINT_POINTER_UINT_UINT_ENUM"
-              c:identifier="gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="marshal_VOID__UINT_STRING"
-              c:identifier="gtk_marshal_VOID__UINT_STRING">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="closure">
-          <type name="GObject.GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="return_value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="n_param_values">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="param_values">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="invocation_hint">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="marshal_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="signal_newv" c:identifier="gtk_signal_newv">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="signal_flags">
-          <type name="SignalRunType" c:type="GtkSignalRunType"/>
-        </parameter>
-        <parameter name="object_type">
-          <type name="GtkType" c:type="GtkType"/>
-        </parameter>
-        <parameter name="function_offset">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="marshaller">
-          <type name="GtkSignalMarshaller" c:type="GtkSignalMarshaller"/>
-        </parameter>
-        <parameter name="return_val">
-          <type name="GtkType" c:type="GtkType"/>
-        </parameter>
-        <parameter name="n_args">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="args">
-          <type name="GtkType" c:type="GtkType*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="signal_new" c:identifier="gtk_signal_new">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="signal_flags">
-          <type name="SignalRunType" c:type="GtkSignalRunType"/>
-        </parameter>
-        <parameter name="object_type">
-          <type name="GtkType" c:type="GtkType"/>
-        </parameter>
-        <parameter name="function_offset">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="marshaller">
-          <type name="GtkSignalMarshaller" c:type="GtkSignalMarshaller"/>
-        </parameter>
-        <parameter name="return_val">
-          <type name="GtkType" c:type="GtkType"/>
-        </parameter>
-        <parameter name="n_args">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="signal_emit_stop_by_name"
-              c:identifier="gtk_signal_emit_stop_by_name">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="signal_connect_object_while_alive"
-              c:identifier="gtk_signal_connect_object_while_alive">
+    <function name="accel_map_add_group"
+              c:identifier="_gtk_accel_map_add_group">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="name">
+        <parameter name="accel_path">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="func">
-          <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
-        </parameter>
-        <parameter name="alive_object">
-          <type name="GtkObject" c:type="GtkObject*"/>
+        <parameter name="accel_group">
+          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_connect_while_alive"
-              c:identifier="gtk_signal_connect_while_alive">
+    <function name="accel_map_remove_group"
+              c:identifier="_gtk_accel_map_remove_group">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
-        </parameter>
-        <parameter name="func_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="alive_object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="signal_connect_full"
-              c:identifier="gtk_signal_connect_full">
-      <return-value>
-        <type name="ulong" c:type="gulong"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="name">
+        <parameter name="accel_path">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="func">
-          <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
-        </parameter>
-        <parameter name="unsupported">
-          <type name="GtkCallbackMarshal" c:type="GtkCallbackMarshal"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="destroy_func">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-        </parameter>
-        <parameter name="object_signal">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="after">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="signal_emitv" c:identifier="gtk_signal_emitv">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="signal_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="args">
-          <type name="GtkArg" c:type="GtkArg*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="signal_emit" c:identifier="gtk_signal_emit">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="signal_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="signal_emit_by_name"
-              c:identifier="gtk_signal_emit_by_name">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="accel_group">
+          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="signal_emitv_by_name"
-              c:identifier="gtk_signal_emitv_by_name">
+    <function name="accel_path_is_valid"
+              c:identifier="_gtk_accel_path_is_valid">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="name">
+        <parameter name="accel_path">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="args">
-          <type name="GtkArg" c:type="GtkArg*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="signal_compat_matched"
-              c:identifier="gtk_signal_compat_matched">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="match">
-          <type name="GSignalMatchType" c:type="GSignalMatchType"/>
-        </parameter>
-        <parameter name="action">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
       </parameters>
     </function>
-    <record name="GtkCalendarPrivate" c:type="GtkCalendarPrivate"/>
-    <class name="Calendar"
-           c:type="GtkCalendar"
-           parent="Widget"
-           glib:type-name="GtkCalendar"
-           glib:get-type="gtk_calendar_get_type">
-      <method name="select_month" c:identifier="gtk_calendar_select_month">
+    <class name="Accessible"
+           c:type="GtkAccessible"
+           parent="Atk.Object"
+           glib:type-name="GtkAccessible"
+           glib:get-type="gtk_accessible_get_type">
+      <method name="connect_widget_destroyed"
+              c:identifier="gtk_accessible_connect_widget_destroyed">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
-          </parameter>
-          <parameter name="month">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="year">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="accessible">
+            <type name="Accessible" c:type="GtkAccessible*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="select_day" c:identifier="gtk_calendar_select_day">
+      <callback name="connect_widget_destroyed"
+                c:type="connect_widget_destroyed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="accessible">
+            <type name="Accessible" c:type="GtkAccessible*"/>
           </parameter>
-          <parameter name="day">
-            <type name="uint32" c:type="guint"/>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <class name="Action"
+           c:type="GtkAction"
+           parent="GObject.Object"
+           glib:type-name="GtkAction"
+           glib:get-type="gtk_action_get_type">
+      <constructor name="new" c:identifier="gtk_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>
-      </method>
-      <method name="mark_day" c:identifier="gtk_calendar_mark_day">
+      </constructor>
+      <constructor name="group_get_action"
+                   c:identifier="gtk_action_group_get_action">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Action" c:type="GtkAction*"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
-          <parameter name="day">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="action_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="get_name" c:identifier="gtk_action_get_name">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unmark_day" c:identifier="gtk_calendar_unmark_day">
+      <method name="is_sensitive" c:identifier="gtk_action_is_sensitive">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
-          </parameter>
-          <parameter name="day">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="clear_marks" c:identifier="gtk_calendar_clear_marks">
+      <method name="get_sensitive" c:identifier="gtk_action_get_sensitive">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_display_options"
-              c:identifier="gtk_calendar_set_display_options">
+      <method name="set_sensitive" c:identifier="gtk_action_set_sensitive">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
-          <parameter name="flags">
-            <type name="CalendarDisplayOptions"
-                  c:type="GtkCalendarDisplayOptions"/>
+          <parameter name="sensitive">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_display_options"
-              c:identifier="gtk_calendar_get_display_options">
+      <method name="is_visible" c:identifier="gtk_action_is_visible">
         <return-value>
-          <type name="CalendarDisplayOptions"
-                c:type="GtkCalendarDisplayOptions"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="display_options"
-              c:identifier="gtk_calendar_display_options">
+      <method name="get_visible" c:identifier="gtk_action_get_visible">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_visible" c:identifier="gtk_action_set_visible">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
-          <parameter name="flags">
-            <type name="CalendarDisplayOptions"
-                  c:type="GtkCalendarDisplayOptions"/>
+          <parameter name="visible">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_date" c:identifier="gtk_calendar_get_date">
+      <method name="activate" c:identifier="gtk_action_activate">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
-          </parameter>
-          <parameter name="year">
-            <type name="GLib.guint" c:type="guint*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
-          <parameter name="month">
-            <type name="GLib.guint" c:type="guint*"/>
+        </parameters>
+      </method>
+      <method name="create_icon" c:identifier="gtk_action_create_icon">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
-          <parameter name="day">
-            <type name="GLib.guint" c:type="guint*"/>
+          <parameter name="icon_size">
+            <type name="IconSize" c:type="GtkIconSize"/>
           </parameter>
         </parameters>
       </method>
-      <method name="freeze" c:identifier="gtk_calendar_freeze">
+      <method name="create_menu_item"
+              c:identifier="gtk_action_create_menu_item">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="thaw" c:identifier="gtk_calendar_thaw">
+      <method name="create_tool_item"
+              c:identifier="gtk_action_create_tool_item">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="year">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="month">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="day">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="show-heading">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="show-day-names">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="no-month-change">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="show-week-numbers">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="month_changed">
+      <method name="create_menu" c:identifier="gtk_action_create_menu">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="day_selected">
+      </method>
+      <method name="connect_proxy" c:identifier="gtk_action_connect_proxy">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
+          </parameter>
+          <parameter name="proxy">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="day_selected_double_click">
+      </method>
+      <method name="disconnect_proxy"
+              c:identifier="gtk_action_disconnect_proxy">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
+          </parameter>
+          <parameter name="proxy">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="prev_month">
+      </method>
+      <method name="get_proxies" c:identifier="gtk_action_get_proxies">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.SList" c:type="GSList*"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="next_month">
+      </method>
+      <method name="connect_accelerator"
+              c:identifier="gtk_action_connect_accelerator">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="prev_year">
+      </method>
+      <method name="disconnect_accelerator"
+              c:identifier="gtk_action_disconnect_accelerator">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="next_year">
+      </method>
+      <method name="get_accel_path" c:identifier="gtk_action_get_accel_path">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="calendar">
-            <type name="Calendar" c:type="GtkCalendar*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
         </parameters>
-      </callback>
-      <glib:signal name="month-changed">
+      </method>
+      <method name="get_accel_closure"
+              c:identifier="gtk_action_get_accel_closure">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GObject.Closure" c:type="GClosure*"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="day-selected">
+        <parameters>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="block_activate_from"
+              c:identifier="gtk_action_block_activate_from">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="day-selected-double-click">
+        <parameters>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
+          </parameter>
+          <parameter name="proxy">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unblock_activate_from"
+              c:identifier="gtk_action_unblock_activate_from">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="prev-month">
+        <parameters>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
+          </parameter>
+          <parameter name="proxy">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_accel_path" c:identifier="gtk_action_set_accel_path">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="next-month">
+        <parameters>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
+          </parameter>
+          <parameter name="accel_path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_accel_group" c:identifier="gtk_action_set_accel_group">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="prev-year">
+        <parameters>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
+          </parameter>
+          <parameter name="accel_group" allow-none="1">
+            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="label">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="short-label">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="tooltip">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="stock-id">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="icon-name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="visible-horizontal">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="visible-vertical">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="visible-overflown">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="is-important">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="hide-if-empty">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="sensitive">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="visible">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="action-group">
+        <type name="ActionGroup" c:type="GtkActionGroup"/>
+      </property>
+      <callback name="activate" c:type="activate">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="next-year">
+        <parameters>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <field name="menu_item_type">
+        <type name="GObject.Type" c:type="GType"/>
+      </field>
+      <field name="toolbar_item_type">
+        <type name="GObject.Type" c:type="GType"/>
+      </field>
+      <callback name="create_menu_item" c:type="create_menu_item">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
-      </glib:signal>
-    </class>
-    <function name="calendar_new" c:identifier="gtk_calendar_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <record name="GtkCellEditable" c:type="GtkCellEditable"/>
-    <interface name="CellEditable"
-               c:type="GtkCellEditable"
-               glib:type-name="GtkCellEditable"
-               glib:get-type="gtk_cell_editable_get_type">
-      <callback name="editing_done">
+        <parameters>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="create_tool_item" c:type="create_tool_item">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="cell_editable">
-            <type name="CellEditable" c:type="GtkCellEditable*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="remove_widget">
+      <callback name="connect_proxy" c:type="connect_proxy">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_editable">
-            <type name="CellEditable" c:type="GtkCellEditable*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
+          </parameter>
+          <parameter name="proxy">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="start_editing">
+      <callback name="disconnect_proxy" c:type="disconnect_proxy">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_editable">
-            <type name="CellEditable" c:type="GtkCellEditable*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
+          <parameter name="proxy">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
-      <glib:signal name="editing-done">
+      <callback name="create_menu" c:type="create_menu">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="remove-widget">
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="activate">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-    </interface>
-    <function name="cell_editable_start_editing"
-              c:identifier="gtk_cell_editable_start_editing">
+    </class>
+    <record name="ActionPrivate" c:type="GtkActionPrivate"/>
+    <function name="action_emit_activate"
+              c:identifier="_gtk_action_emit_activate">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="cell_editable">
-          <type name="CellEditable" c:type="GtkCellEditable*"/>
+        <parameter name="action">
+          <type name="Action" c:type="GtkAction*"/>
         </parameter>
-        <parameter name="event">
-          <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
+      </parameters>
+    </function>
+    <function name="action_sync_sensitive"
+              c:identifier="_gtk_action_sync_sensitive">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="action">
+          <type name="Action" c:type="GtkAction*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_editable_editing_done"
-              c:identifier="gtk_cell_editable_editing_done">
+    <function name="action_sync_visible"
+              c:identifier="_gtk_action_sync_visible">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="cell_editable">
-          <type name="CellEditable" c:type="GtkCellEditable*"/>
+        <parameter name="action">
+          <type name="Action" c:type="GtkAction*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_editable_remove_widget"
-              c:identifier="gtk_cell_editable_remove_widget">
+    <function name="action_sync_menu_visible"
+              c:identifier="_gtk_action_sync_menu_visible">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="cell_editable">
-          <type name="CellEditable" c:type="GtkCellEditable*"/>
+        <parameter name="action">
+          <type name="Action" c:type="GtkAction*"/>
+        </parameter>
+        <parameter name="proxy">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="empty">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <class name="CellRenderer"
-           c:type="GtkCellRenderer"
-           parent="GtkObject"
-           glib:type-name="GtkCellRenderer"
-           glib:get-type="gtk_cell_renderer_get_type">
-      <constructor name="text_new" c:identifier="gtk_cell_renderer_text_new">
-        <return-value>
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-        </return-value>
-      </constructor>
-      <constructor name="accel_new" c:identifier="gtk_cell_renderer_accel_new">
-        <return-value>
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-        </return-value>
-      </constructor>
-      <constructor name="combo_new" c:identifier="gtk_cell_renderer_combo_new">
-        <return-value>
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-        </return-value>
-      </constructor>
-      <constructor name="pixbuf_new"
-                   c:identifier="gtk_cell_renderer_pixbuf_new">
-        <return-value>
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-        </return-value>
-      </constructor>
-      <constructor name="progress_new"
-                   c:identifier="gtk_cell_renderer_progress_new">
-        <return-value>
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-        </return-value>
-      </constructor>
-      <constructor name="spin_new" c:identifier="gtk_cell_renderer_spin_new">
-        <return-value>
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-        </return-value>
-      </constructor>
-      <constructor name="toggle_new"
-                   c:identifier="gtk_cell_renderer_toggle_new">
-        <return-value>
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-        </return-value>
-      </constructor>
-      <method name="get_size" c:identifier="gtk_cell_renderer_get_size">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="cell_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="x_offset">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="y_offset">
-            <type name="GLib.gint" c:type="gint*"/>
+    <callback name="TranslateFunc" c:type="GtkTranslateFunc">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="path">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="func_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="PrintFunc" c:type="GtkPrintFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="func_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="str">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="ItemFactoryCallback" c:type="GtkItemFactoryCallback">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </callback>
+    <callback name="ItemFactoryCallback1" c:type="GtkItemFactoryCallback1">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="callback_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="callback_action">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <class name="ItemFactory"
+           c:type="GtkItemFactory"
+           parent="Object"
+           glib:type-name="GtkItemFactory"
+           glib:get-type="gtk_item_factory_get_type">
+      <constructor name="new" c:identifier="gtk_item_factory_new">
+        <return-value>
+          <type name="ItemFactory" c:type="GtkItemFactory*"/>
+        </return-value>
+        <parameters>
+          <parameter name="container_type">
+            <type name="GObject.Type" c:type="GType"/>
           </parameter>
-          <parameter name="width">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="height">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="accel_group" allow-none="1">
+            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="render" c:identifier="gtk_cell_renderer_render">
+      </constructor>
+      <constructor name="from_widget"
+                   c:identifier="gtk_item_factory_from_widget">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="ItemFactory" c:type="GtkItemFactory*"/>
         </return-value>
         <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="window">
-            <type name="Gdk.Window" c:type="GdkWindow*"/>
-          </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="background_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="cell_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="expose_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="CellRendererState" c:type="GtkCellRendererState"/>
-          </parameter>
         </parameters>
-      </method>
-      <method name="activate" c:identifier="gtk_cell_renderer_activate">
+      </constructor>
+      <constructor name="from_path" c:identifier="gtk_item_factory_from_path">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="ItemFactory" c:type="GtkItemFactory*"/>
         </return-value>
         <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
+        </parameters>
+      </constructor>
+      <method name="construct" c:identifier="gtk_item_factory_construct">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
           </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="container_type">
+            <type name="GObject.Type" c:type="GType"/>
           </parameter>
           <parameter name="path">
             <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="background_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="cell_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="CellRendererState" c:type="GtkCellRendererState"/>
+          <parameter name="accel_group">
+            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="start_editing"
-              c:identifier="gtk_cell_renderer_start_editing">
+      <method name="get_item" c:identifier="gtk_item_factory_get_item">
         <return-value>
-          <type name="CellEditable" c:type="GtkCellEditable*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
           </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+        </parameters>
+      </method>
+      <method name="get_widget" c:identifier="gtk_item_factory_get_widget">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
           </parameter>
           <parameter name="path">
             <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="background_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+        </parameters>
+      </method>
+      <method name="get_widget_by_action"
+              c:identifier="gtk_item_factory_get_widget_by_action">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
           </parameter>
-          <parameter name="cell_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="action">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="flags">
-            <type name="CellRendererState" c:type="GtkCellRendererState"/>
+        </parameters>
+      </method>
+      <method name="get_item_by_action"
+              c:identifier="gtk_item_factory_get_item_by_action">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          </parameter>
+          <parameter name="action">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_fixed_size"
-              c:identifier="gtk_cell_renderer_set_fixed_size">
+      <method name="create_item" c:identifier="gtk_item_factory_create_item">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
           </parameter>
-          <parameter name="width">
-            <type name="int32" c:type="gint"/>
+          <parameter name="entry">
+            <type name="ItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
           </parameter>
-          <parameter name="height">
-            <type name="int32" c:type="gint"/>
+          <parameter name="callback_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="callback_type">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_fixed_size"
-              c:identifier="gtk_cell_renderer_get_fixed_size">
+      <method name="create_items" c:identifier="gtk_item_factory_create_items">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
           </parameter>
-          <parameter name="width">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="n_entries">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="height">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="entries">
+            <type name="ItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
+          </parameter>
+          <parameter name="callback_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="editing_canceled"
-              c:identifier="gtk_cell_renderer_editing_canceled">
+      <method name="delete_item" c:identifier="gtk_item_factory_delete_item">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="stop_editing"
-              c:identifier="gtk_cell_renderer_stop_editing">
+      <method name="delete_entry" c:identifier="gtk_item_factory_delete_entry">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
           </parameter>
-          <parameter name="canceled">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="entry">
+            <type name="ItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="mode">
-        <type name="CellRendererMode" c:type="GtkCellRendererMode"/>
-      </property>
-      <property name="visible">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="sensitive">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="xalign">
-        <type name="float" c:type="gfloat"/>
-      </property>
-      <property name="yalign">
-        <type name="float" c:type="gfloat"/>
-      </property>
-      <property name="xpad">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <property name="ypad">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <property name="width">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="height">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="is-expander">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="is-expanded">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="cell-background">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="cell-background-gdk">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </property>
-      <property name="cell-background-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="get_size">
+      <method name="delete_entries"
+              c:identifier="gtk_item_factory_delete_entries">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="cell_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="x_offset">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="y_offset">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
           </parameter>
-          <parameter name="width">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="n_entries">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="height">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="entries">
+            <type name="ItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="render">
+      </method>
+      <method name="popup" c:identifier="gtk_item_factory_popup">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="window">
-            <type name="Gdk.Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
           </parameter>
-          <parameter name="background_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="x">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="cell_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="y">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="expose_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="mouse_button">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="flags">
-            <type name="CellRendererState" c:type="GtkCellRendererState"/>
+          <parameter name="time_">
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="activate">
+      </method>
+      <method name="popup_with_data"
+              c:identifier="gtk_item_factory_popup_with_data">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
           </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
+          <parameter name="popup_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="destroy">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
           </parameter>
-          <parameter name="path">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="x">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="background_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="y">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="cell_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="mouse_button">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="flags">
-            <type name="CellRendererState" c:type="GtkCellRendererState"/>
+          <parameter name="time_">
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="start_editing">
+      </method>
+      <method name="popup_data" c:identifier="gtk_item_factory_popup_data">
         <return-value>
-          <type name="CellEditable" c:type="GtkCellEditable*"/>
+          <type name="any" c:type="gpointer"/>
         </return-value>
         <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="background_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="cell_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="CellRendererState" c:type="GtkCellRendererState"/>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="editing_canceled">
+      </method>
+      <method name="set_translate_func"
+              c:identifier="gtk_item_factory_set_translate_func">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="TranslateFunc" c:type="GtkTranslateFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="notify">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="editing_started">
+      </method>
+      <method name="create_items_ac"
+              c:identifier="gtk_item_factory_create_items_ac">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="ifactory">
+            <type name="ItemFactory" c:type="GtkItemFactory*"/>
           </parameter>
-          <parameter name="editable">
-            <type name="CellEditable" c:type="GtkCellEditable*"/>
+          <parameter name="n_entries">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="path">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="entries">
+            <type name="ItemFactoryEntry" c:type="GtkItemFactoryEntry*"/>
+          </parameter>
+          <parameter name="callback_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="callback_type">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
+      </method>
+      <field name="item_ht">
+        <type name="GObject.HashTable" c:type="GHashTable*"/>
+      </field>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="editing-canceled">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="editing-started">
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="CellEditable" c:type="GtkCellEditable"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="string" c:type="gchararray"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
+      </callback>
     </class>
-    <record name="GtkTreeModel" c:type="GtkTreeModel"/>
-    <callback name="GtkTreeModelForeachFunc">
+    <record name="ItemFactoryEntry" c:type="GtkItemFactoryEntry">
+      <field name="path">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="accelerator">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="callback">
+        <type name="ItemFactoryCallback" c:type="GtkItemFactoryCallback"/>
+      </field>
+      <field name="callback_action">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="item_type">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="extra_data">
+        <type name="any" c:type="gconstpointer"/>
+      </field>
+    </record>
+    <record name="ItemFactoryItem" c:type="GtkItemFactoryItem">
+      <field name="path">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="widgets">
+        <type name="GLib.SList" c:type="GSList*"/>
+      </field>
+    </record>
+    <function name="item_factory_add_foreign"
+              c:identifier="gtk_item_factory_add_foreign">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="accel_widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
+        <parameter name="full_path">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="accel_group">
+          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
         </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="keyval">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="modifiers">
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
         </parameter>
       </parameters>
-    </callback>
-    <function name="tree_path_new" c:identifier="gtk_tree_path_new">
-      <return-value>
-        <type name="TreePath" c:type="GtkTreePath*"/>
-      </return-value>
     </function>
-    <function name="tree_path_new_from_string"
-              c:identifier="gtk_tree_path_new_from_string">
+    <function name="item_factory_path_from_widget"
+              c:identifier="gtk_item_factory_path_from_widget">
       <return-value>
-        <type name="TreePath" c:type="GtkTreePath*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="path">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_path_new_from_indices"
-              c:identifier="gtk_tree_path_new_from_indices">
+    <function name="item_factory_popup_data_from_widget"
+              c:identifier="gtk_item_factory_popup_data_from_widget">
       <return-value>
-        <type name="TreePath" c:type="GtkTreePath*"/>
+        <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
-        <parameter name="first_index">
-          <type name="int32" c:type="gint"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_path_to_string"
-              c:identifier="gtk_tree_path_to_string">
+    <callback name="MenuCallback" c:type="GtkMenuCallback">
       <return-value>
-        <type name="string" c:type="gchar*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="tree_path_new_first"
-              c:identifier="gtk_tree_path_new_first">
-      <return-value>
-        <type name="TreePath" c:type="GtkTreePath*"/>
-      </return-value>
-    </function>
-    <function name="tree_path_append_index"
-              c:identifier="gtk_tree_path_append_index">
+    </callback>
+    <record name="MenuEntry" c:type="GtkMenuEntry"/>
+    <callback name="ItemFactoryCallback2" c:type="GtkItemFactoryCallback2">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="index_">
-          <type name="int32" c:type="gint"/>
+        <parameter name="callback_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="callback_action">
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="tree_path_prepend_index"
-              c:identifier="gtk_tree_path_prepend_index">
+    </callback>
+    <function name="item_factory_create_menu_entries"
+              c:identifier="gtk_item_factory_create_menu_entries">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
+        <parameter name="n_entries">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="index_">
-          <type name="int32" c:type="gint"/>
+        <parameter name="entries">
+          <type name="MenuEntry" c:type="GtkMenuEntry*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_path_get_depth"
-              c:identifier="gtk_tree_path_get_depth">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_path_get_indices"
-              c:identifier="gtk_tree_path_get_indices">
-      <return-value>
-        <type name="GLib.gint" c:type="gint*"/>
-      </return-value>
-      <parameters>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_path_free" c:identifier="gtk_tree_path_free">
+    <function name="item_factories_path_delete"
+              c:identifier="gtk_item_factories_path_delete">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
+        <parameter name="ifactory_path">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="tree_path_copy" c:identifier="gtk_tree_path_copy">
-      <return-value>
-        <type name="TreePath" c:type="GtkTreePath*"/>
-      </return-value>
-      <parameters>
         <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <glib:boxed c:type="TreePath"
-                glib:name="TreePath"
-                glib:type-name="GtkTreePath"
-                glib:get-type="gtk_tree_path_get_type">
-      <method name="compare" c:identifier="gtk_tree_path_compare">
+    <class name="ActionGroup"
+           c:type="GtkActionGroup"
+           parent="GObject.Object"
+           glib:type-name="GtkActionGroup"
+           glib:get-type="gtk_action_group_get_type">
+      <constructor name="new" c:identifier="gtk_action_group_new">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="ActionGroup" c:type="GtkActionGroup*"/>
         </return-value>
         <parameters>
-          <parameter name="a">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="b">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="next" c:identifier="gtk_tree_path_next">
+      </constructor>
+      <method name="get_name" c:identifier="gtk_action_group_get_name">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="prev" c:identifier="gtk_tree_path_prev">
+      <method name="get_sensitive"
+              c:identifier="gtk_action_group_get_sensitive">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="up" c:identifier="gtk_tree_path_up">
+      <method name="set_sensitive"
+              c:identifier="gtk_action_group_set_sensitive">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
+          </parameter>
+          <parameter name="sensitive">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="down" c:identifier="gtk_tree_path_down">
+      <method name="get_visible" c:identifier="gtk_action_group_get_visible">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="is_ancestor" c:identifier="gtk_tree_path_is_ancestor">
+      <method name="set_visible" c:identifier="gtk_action_group_set_visible">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
-          <parameter name="descendant">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="visible">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="is_descendant" c:identifier="gtk_tree_path_is_descendant">
+      <method name="list_actions" c:identifier="gtk_action_group_list_actions">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="ancestor">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
         </parameters>
       </method>
-    </glib:boxed>
-    <glib:boxed c:type="TreeRowReference"
-                glib:name="TreeRowReference"
-                glib:type-name="GtkTreeRowReference"
-                glib:get-type="gtk_tree_row_reference_get_type">
-      <constructor name="new" c:identifier="gtk_tree_row_reference_new">
+      <method name="add_action" c:identifier="gtk_action_group_add_action">
         <return-value>
-          <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="new_proxy"
-                   c:identifier="gtk_tree_row_reference_new_proxy">
+      </method>
+      <method name="add_action_with_accel"
+              c:identifier="gtk_action_group_add_action_with_accel">
         <return-value>
-          <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="proxy">
-            <type name="GObject.Object" c:type="GObject*"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
-          <parameter name="model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="accelerator" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="copy" c:identifier="gtk_tree_row_reference_copy">
+      </method>
+      <method name="remove_action"
+              c:identifier="gtk_action_group_remove_action">
         <return-value>
-          <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="reference">
-            <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
-        </parameters>
-      </constructor>
-      <method name="get_path" c:identifier="gtk_tree_row_reference_get_path">
-        <return-value>
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </return-value>
-        <parameters>
-          <parameter name="reference">
-            <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_model" c:identifier="gtk_tree_row_reference_get_model">
+      <method name="add_actions" c:identifier="gtk_action_group_add_actions">
         <return-value>
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="reference">
-            <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="valid" c:identifier="gtk_tree_row_reference_valid">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="reference">
-            <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
+          <parameter name="entries">
+            <type name="ActionEntry" c:type="GtkActionEntry*"/>
+          </parameter>
+          <parameter name="n_entries">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="free" c:identifier="gtk_tree_row_reference_free">
+      <method name="add_toggle_actions"
+              c:identifier="gtk_action_group_add_toggle_actions">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="reference">
-            <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
+          </parameter>
+          <parameter name="entries">
+            <type name="ToggleActionEntry" c:type="GtkToggleActionEntry*"/>
+          </parameter>
+          <parameter name="n_entries">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-    </glib:boxed>
-    <function name="tree_row_reference_inserted"
-              c:identifier="gtk_tree_row_reference_inserted">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="proxy">
-          <type name="GObject.Object" c:type="GObject*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_row_reference_deleted"
-              c:identifier="gtk_tree_row_reference_deleted">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="proxy">
-          <type name="GObject.Object" c:type="GObject*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_row_reference_reordered"
-              c:identifier="gtk_tree_row_reference_reordered">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="proxy">
-          <type name="GObject.Object" c:type="GObject*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
-        </parameter>
-        <parameter name="new_order">
-          <type name="GLib.gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_iter_copy" c:identifier="gtk_tree_iter_copy">
-      <return-value>
-        <type name="TreeIter" c:type="GtkTreeIter*"/>
-      </return-value>
-      <parameters>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_iter_free" c:identifier="gtk_tree_iter_free">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <glib:boxed c:type="TreeIter"
-                glib:name="TreeIter"
-                glib:type-name="GtkTreeIter"
-                glib:get-type="gtk_tree_iter_get_type">
-    </glib:boxed>
-    <interface name="TreeModel"
-               c:type="GtkTreeModel"
-               glib:type-name="GtkTreeModel"
-               glib:get-type="gtk_tree_model_get_type">
-      <callback name="row_changed">
+      <method name="add_radio_actions"
+              c:identifier="gtk_action_group_add_radio_actions">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="entries">
+            <type name="RadioActionEntry" c:type="GtkRadioActionEntry*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="n_entries">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="value">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="on_change">
+            <type name="GObject.Callback" c:type="GCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="row_inserted">
+      </method>
+      <method name="add_actions_full"
+              c:identifier="gtk_action_group_add_actions_full">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="entries">
+            <type name="ActionEntry" c:type="GtkActionEntry*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="n_entries">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="row_has_child_toggled">
+      </method>
+      <method name="add_toggle_actions_full"
+              c:identifier="gtk_action_group_add_toggle_actions_full">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="entries">
+            <type name="ToggleActionEntry" c:type="GtkToggleActionEntry*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="n_entries">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="row_deleted">
+      </method>
+      <method name="add_radio_actions_full"
+              c:identifier="gtk_action_group_add_radio_actions_full">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="entries">
+            <type name="RadioActionEntry" c:type="GtkRadioActionEntry*"/>
+          </parameter>
+          <parameter name="n_entries">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="value">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="on_change">
+            <type name="GObject.Callback" c:type="GCallback"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="rows_reordered">
+      </method>
+      <method name="set_translate_func"
+              c:identifier="gtk_action_group_set_translate_func">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="func">
+            <type name="TranslateFunc" c:type="GtkTranslateFunc"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
-          <parameter name="new_order">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="notify">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_flags">
+      </method>
+      <method name="set_translation_domain"
+              c:identifier="gtk_action_group_set_translation_domain">
         <return-value>
-          <type name="TreeModelFlags" c:type="GtkTreeModelFlags"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
+          </parameter>
+          <parameter name="domain">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_n_columns">
+      </method>
+      <method name="translate_string"
+              c:identifier="gtk_action_group_translate_string">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
+          </parameter>
+          <parameter name="string">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_column_type">
+      </method>
+      <property name="name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="sensitive">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="visible">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="get_action" c:type="get_action">
         <return-value>
-          <type name="GObject.GType" c:type="GType"/>
+          <type name="Action" c:type="GtkAction*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="action_group">
+            <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
-          <parameter name="index_">
-            <type name="int32" c:type="gint"/>
+          <parameter name="action_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_iter">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <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="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="get_path">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
-          <type name="TreePath" c:type="GtkTreePath*"/>
+          <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>
-        </parameters>
       </callback>
-      <callback name="get_value">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <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="column">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="value">
-            <type name="GObject.GValue" c:type="GValue*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="iter_next">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <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>
-        </parameters>
       </callback>
-      <callback name="iter_children">
+      <glib:signal name="connect-proxy">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <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 name="object">
+            <type name="Action" c:type="GtkAction"/>
           </parameter>
-          <parameter name="parent">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="p0">
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="iter_has_child">
+      </glib:signal>
+      <glib:signal name="disconnect-proxy">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="object">
+            <type name="Action" c:type="GtkAction"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="p0">
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="iter_n_children">
+      </glib:signal>
+      <glib:signal name="pre-activate">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <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 name="object">
+            <type name="Action" c:type="GtkAction"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="iter_nth_child">
+      </glib:signal>
+      <glib:signal name="post-activate">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="object">
+            <type name="Action" c:type="GtkAction"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameters>
+      </glib:signal>
+    </class>
+    <record name="ActionGroupPrivate" c:type="GtkActionGroupPrivate"/>
+    <record name="ActionEntry" c:type="GtkActionEntry">
+      <field name="name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="stock_id">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="label">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="accelerator">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="tooltip">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="callback">
+        <type name="GObject.Callback" c:type="GCallback"/>
+      </field>
+    </record>
+    <record name="ToggleActionEntry" c:type="GtkToggleActionEntry">
+      <field name="name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="stock_id">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="label">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="accelerator">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="tooltip">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="callback">
+        <type name="GObject.Callback" c:type="GCallback"/>
+      </field>
+      <field name="is_active">
+        <type name="boolean" c:type="gboolean"/>
+      </field>
+    </record>
+    <record name="RadioActionEntry" c:type="GtkRadioActionEntry">
+      <field name="name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="stock_id">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="label">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="accelerator">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="tooltip">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="value">
+        <type name="int" c:type="gint"/>
+      </field>
+    </record>
+    <function name="action_group_emit_connect_proxy"
+              c:identifier="_gtk_action_group_emit_connect_proxy">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="action_group">
+          <type name="ActionGroup" c:type="GtkActionGroup*"/>
+        </parameter>
+        <parameter name="action">
+          <type name="Action" c:type="GtkAction*"/>
+        </parameter>
+        <parameter name="proxy">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="action_group_emit_disconnect_proxy"
+              c:identifier="_gtk_action_group_emit_disconnect_proxy">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="action_group">
+          <type name="ActionGroup" c:type="GtkActionGroup*"/>
+        </parameter>
+        <parameter name="action">
+          <type name="Action" c:type="GtkAction*"/>
+        </parameter>
+        <parameter name="proxy">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="action_group_emit_pre_activate"
+              c:identifier="_gtk_action_group_emit_pre_activate">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="action_group">
+          <type name="ActionGroup" c:type="GtkActionGroup*"/>
+        </parameter>
+        <parameter name="action">
+          <type name="Action" c:type="GtkAction*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="action_group_emit_post_activate"
+              c:identifier="_gtk_action_group_emit_post_activate">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="action_group">
+          <type name="ActionGroup" c:type="GtkActionGroup*"/>
+        </parameter>
+        <parameter name="action">
+          <type name="Action" c:type="GtkAction*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="Alignment"
+           c:type="GtkAlignment"
+           parent="Bin"
+           glib:type-name="GtkAlignment"
+           glib:get-type="gtk_alignment_get_type">
+      <method name="set" c:identifier="gtk_alignment_set">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="alignment">
+            <type name="Alignment" c:type="GtkAlignment*"/>
           </parameter>
-          <parameter name="parent">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="xalign">
+            <type name="float" c:type="gfloat"/>
           </parameter>
-          <parameter name="n">
-            <type name="int32" c:type="gint"/>
+          <parameter name="yalign">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="xscale">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="yscale">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="iter_parent">
+      </method>
+      <method name="set_padding" c:identifier="gtk_alignment_set_padding">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="alignment">
+            <type name="Alignment" c:type="GtkAlignment*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="padding_top">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="child">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="padding_bottom">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="padding_left">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="padding_right">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="ref_node">
+      </method>
+      <method name="get_padding" c:identifier="gtk_alignment_get_padding">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="alignment">
+            <type name="Alignment" c:type="GtkAlignment*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="padding_top">
+            <type name="uint" c:type="guint*"/>
+          </parameter>
+          <parameter name="padding_bottom">
+            <type name="uint" c:type="guint*"/>
+          </parameter>
+          <parameter name="padding_left">
+            <type name="uint" c:type="guint*"/>
+          </parameter>
+          <parameter name="padding_right">
+            <type name="uint" c:type="guint*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="unref_node">
+      </method>
+      <property name="xalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="yalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="xscale">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="yscale">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="top-padding">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="bottom-padding">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="left-padding">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="right-padding">
+        <type name="uint" c:type="guint"/>
+      </property>
+    </class>
+    <record name="AlignmentPrivate" c:type="GtkAlignmentPrivate"/>
+    <function name="alignment_new" c:identifier="gtk_alignment_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="xalign">
+          <type name="float" c:type="gfloat"/>
+        </parameter>
+        <parameter name="yalign">
+          <type name="float" c:type="gfloat"/>
+        </parameter>
+        <parameter name="xscale">
+          <type name="float" c:type="gfloat"/>
+        </parameter>
+        <parameter name="yscale">
+          <type name="float" c:type="gfloat"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="Arrow"
+           c:type="GtkArrow"
+           parent="Misc"
+           glib:type-name="GtkArrow"
+           glib:get-type="gtk_arrow_get_type">
+      <method name="set" c:identifier="gtk_arrow_set">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="arrow">
+            <type name="Arrow" c:type="GtkArrow*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="arrow_type">
+            <type name="ArrowType" c:type="GtkArrowType"/>
+          </parameter>
+          <parameter name="shadow_type">
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
         </parameters>
-      </callback>
-      <glib:signal name="row-changed">
+      </method>
+      <property name="arrow-type">
+        <type name="ArrowType" c:type="GtkArrowType"/>
+      </property>
+      <property name="shadow-type">
+        <type name="ShadowType" c:type="GtkShadowType"/>
+      </property>
+    </class>
+    <function name="arrow_new" c:identifier="gtk_arrow_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="arrow_type">
+          <type name="ArrowType" c:type="GtkArrowType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="Frame"
+           c:type="GtkFrame"
+           parent="Bin"
+           glib:type-name="GtkFrame"
+           glib:get-type="gtk_frame_get_type">
+      <method name="set_label" c:identifier="gtk_frame_set_label">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="TreePath" c:type="GtkTreePath"/>
+          <parameter name="frame">
+            <type name="Frame" c:type="GtkFrame*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="TreeIter" c:type="GtkTreeIter"/>
+          <parameter name="label" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="row-inserted">
+      </method>
+      <method name="get_label" c:identifier="gtk_frame_get_label">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="frame">
+            <type name="Frame" c:type="GtkFrame*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_label_widget"
+              c:identifier="gtk_frame_set_label_widget">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="TreePath" c:type="GtkTreePath"/>
+          <parameter name="frame">
+            <type name="Frame" c:type="GtkFrame*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="TreeIter" c:type="GtkTreeIter"/>
+          <parameter name="label_widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="row-has-child-toggled">
+      </method>
+      <method name="get_label_widget"
+              c:identifier="gtk_frame_get_label_widget">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="frame">
+            <type name="Frame" c:type="GtkFrame*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_label_align" c:identifier="gtk_frame_set_label_align">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="TreePath" c:type="GtkTreePath"/>
+          <parameter name="frame">
+            <type name="Frame" c:type="GtkFrame*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="TreeIter" c:type="GtkTreeIter"/>
+          <parameter name="xalign">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="yalign">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="row-deleted">
+      </method>
+      <method name="get_label_align" c:identifier="gtk_frame_get_label_align">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="TreePath" c:type="GtkTreePath"/>
+          <parameter name="frame">
+            <type name="Frame" c:type="GtkFrame*"/>
+          </parameter>
+          <parameter name="xalign">
+            <type name="float" c:type="gfloat*"/>
+          </parameter>
+          <parameter name="yalign">
+            <type name="float" c:type="gfloat*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="rows-reordered">
+      </method>
+      <method name="set_shadow_type" c:identifier="gtk_frame_set_shadow_type">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="TreePath" c:type="GtkTreePath"/>
+          <parameter name="frame">
+            <type name="Frame" c:type="GtkFrame*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="TreeIter" c:type="GtkTreeIter"/>
+          <parameter name="type">
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
-          <parameter name="p1">
-            <type name="any" c:type="gpointer"/>
+        </parameters>
+      </method>
+      <method name="get_shadow_type" c:identifier="gtk_frame_get_shadow_type">
+        <return-value>
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </return-value>
+        <parameters>
+          <parameter name="frame">
+            <type name="Frame" c:type="GtkFrame*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </interface>
-    <function name="tree_model_get_flags"
-              c:identifier="gtk_tree_model_get_flags">
-      <return-value>
-        <type name="TreeModelFlags" c:type="GtkTreeModelFlags"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_model_get_n_columns"
-              c:identifier="gtk_tree_model_get_n_columns">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_model_get_column_type"
-              c:identifier="gtk_tree_model_get_column_type">
+      </method>
+      <property name="label">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="label-xalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="label-yalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="shadow">
+        <type name="ShadowType" c:type="GtkShadowType"/>
+      </property>
+      <property name="shadow-type">
+        <type name="ShadowType" c:type="GtkShadowType"/>
+      </property>
+      <property name="label-widget">
+        <type name="Widget" c:type="GtkWidget"/>
+      </property>
+      <callback name="compute_child_allocation"
+                c:type="compute_child_allocation">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="frame">
+            <type name="Frame" c:type="GtkFrame*"/>
+          </parameter>
+          <parameter name="allocation">
+            <type name="Allocation" c:type="GtkAllocation*"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </class>
+    <function name="frame_new" c:identifier="gtk_frame_new">
       <return-value>
-        <type name="GObject.GType" c:type="GType"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="index_">
-          <type name="int32" c:type="gint"/>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_model_get_iter"
-              c:identifier="gtk_tree_model_get_iter">
-      <return-value>
+    <class name="AspectFrame"
+           c:type="GtkAspectFrame"
+           parent="Frame"
+           glib:type-name="GtkAspectFrame"
+           glib:get-type="gtk_aspect_frame_get_type">
+      <method name="set" c:identifier="gtk_aspect_frame_set">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="aspect_frame">
+            <type name="AspectFrame" c:type="GtkAspectFrame*"/>
+          </parameter>
+          <parameter name="xalign">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="yalign">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="ratio">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="obey_child">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="xalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="yalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="ratio">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="obey-child">
         <type name="boolean" c:type="gboolean"/>
+      </property>
+    </class>
+    <function name="aspect_frame_new" c:identifier="gtk_aspect_frame_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
+        <parameter name="xalign">
+          <type name="float" c:type="gfloat"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="tree_model_get_iter_from_string"
-              c:identifier="gtk_tree_model_get_iter_from_string">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="yalign">
+          <type name="float" c:type="gfloat"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="ratio">
+          <type name="float" c:type="gfloat"/>
         </parameter>
-        <parameter name="path_string">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="obey_child">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tree_model_get_string_from_iter"
-              c:identifier="gtk_tree_model_get_string_from_iter">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_model_get_iter_first"
-              c:identifier="gtk_tree_model_get_iter_first">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_model_get_path"
-              c:identifier="gtk_tree_model_get_path">
-      <return-value>
-        <type name="TreePath" c:type="GtkTreePath*"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_model_get_value"
-              c:identifier="gtk_tree_model_get_value">
-      <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="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="value">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_model_iter_next"
-              c:identifier="gtk_tree_model_iter_next">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_model_iter_children"
-              c:identifier="gtk_tree_model_iter_children">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </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="parent" allow-none="1">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_model_iter_has_child"
-              c:identifier="gtk_tree_model_iter_has_child">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_model_iter_n_children"
-              c:identifier="gtk_tree_model_iter_n_children">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="iter" allow-none="1">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_model_iter_nth_child"
-              c:identifier="gtk_tree_model_iter_nth_child">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </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="parent" allow-none="1">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
-        </parameter>
-        <parameter name="n">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_model_iter_parent"
-              c:identifier="gtk_tree_model_iter_parent">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </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="child">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_model_ref_node"
-              c:identifier="gtk_tree_model_ref_node">
-      <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>
-      </parameters>
-    </function>
-    <function name="tree_model_unref_node"
-              c:identifier="gtk_tree_model_unref_node">
-      <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>
-      </parameters>
-    </function>
-    <function name="tree_model_get" c:identifier="gtk_tree_model_get">
-      <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>
-      </parameters>
-    </function>
-    <function name="tree_model_foreach" c:identifier="gtk_tree_model_foreach">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GtkTreeModelForeachFunc"
-                c:type="GtkTreeModelForeachFunc"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_model_row_changed"
-              c:identifier="gtk_tree_model_row_changed">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_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>
-    </function>
-    <function name="tree_model_row_inserted"
-              c:identifier="gtk_tree_model_row_inserted">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_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>
-    </function>
-    <function name="tree_model_row_has_child_toggled"
-              c:identifier="gtk_tree_model_row_has_child_toggled">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_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>
-    </function>
-    <function name="tree_model_row_deleted"
-              c:identifier="gtk_tree_model_row_deleted">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <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_model_rows_reordered"
-              c:identifier="gtk_tree_model_rows_reordered">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_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>
-        <parameter name="new_order">
-          <type name="GLib.gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkTreeSortable" c:type="GtkTreeSortable"/>
-    <callback name="GtkTreeIterCompareFunc">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="a">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
-        </parameter>
-        <parameter name="b">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <interface name="TreeSortable"
-               c:type="GtkTreeSortable"
-               glib:type-name="GtkTreeSortable"
-               glib:get-type="gtk_tree_sortable_get_type">
-      <callback name="sort_column_changed">
+    <class name="Assistant"
+           c:type="GtkAssistant"
+           parent="Window"
+           glib:type-name="GtkAssistant"
+           glib:get-type="gtk_assistant_get_type">
+      <method name="get_current_page"
+              c:identifier="gtk_assistant_get_current_page">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_current_page"
+              c:identifier="gtk_assistant_set_current_page">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="sortable">
-            <type name="TreeSortable" c:type="GtkTreeSortable*"/>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
+          </parameter>
+          <parameter name="page_num">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_sort_column_id">
+      </method>
+      <method name="get_n_pages" c:identifier="gtk_assistant_get_n_pages">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="sortable">
-            <type name="TreeSortable" c:type="GtkTreeSortable*"/>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
-          <parameter name="sort_column_id">
-            <type name="GLib.gint" c:type="gint*"/>
+        </parameters>
+      </method>
+      <method name="get_nth_page" c:identifier="gtk_assistant_get_nth_page">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
-          <parameter name="order">
-            <type name="SortType" c:type="GtkSortType*"/>
+          <parameter name="page_num">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_sort_column_id">
+      </method>
+      <method name="prepend_page" c:identifier="gtk_assistant_prepend_page">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="sortable">
-            <type name="TreeSortable" c:type="GtkTreeSortable*"/>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
-          <parameter name="sort_column_id">
-            <type name="int32" c:type="gint"/>
+          <parameter name="page">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="order">
-            <type name="SortType" c:type="GtkSortType"/>
+        </parameters>
+      </method>
+      <method name="append_page" c:identifier="gtk_assistant_append_page">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
+          </parameter>
+          <parameter name="page">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_sort_func">
+      </method>
+      <method name="insert_page" c:identifier="gtk_assistant_insert_page">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="sortable">
-            <type name="TreeSortable" c:type="GtkTreeSortable*"/>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
-          <parameter name="sort_column_id">
-            <type name="int32" c:type="gint"/>
+          <parameter name="page">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="func">
-            <type name="GtkTreeIterCompareFunc"
-                  c:type="GtkTreeIterCompareFunc"/>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_forward_page_func"
+              c:identifier="gtk_assistant_set_forward_page_func">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
+          </parameter>
+          <parameter name="page_func">
+            <type name="AssistantPageFunc" c:type="GtkAssistantPageFunc"/>
           </parameter>
           <parameter name="data">
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+            <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_default_sort_func">
+      </method>
+      <method name="set_page_type" c:identifier="gtk_assistant_set_page_type">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="sortable">
-            <type name="TreeSortable" c:type="GtkTreeSortable*"/>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
-          <parameter name="func">
-            <type name="GtkTreeIterCompareFunc"
-                  c:type="GtkTreeIterCompareFunc"/>
+          <parameter name="page">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="type">
+            <type name="AssistantPageType" c:type="GtkAssistantPageType"/>
           </parameter>
-          <parameter name="destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+        </parameters>
+      </method>
+      <method name="get_page_type" c:identifier="gtk_assistant_get_page_type">
+        <return-value>
+          <type name="AssistantPageType" c:type="GtkAssistantPageType"/>
+        </return-value>
+        <parameters>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
+          </parameter>
+          <parameter name="page">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="has_default_sort_func">
+      </method>
+      <method name="set_page_title"
+              c:identifier="gtk_assistant_set_page_title">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="sortable">
-            <type name="TreeSortable" c:type="GtkTreeSortable*"/>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
+          </parameter>
+          <parameter name="page">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="title">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <glib:signal name="sort-column-changed">
+      </method>
+      <method name="get_page_title"
+              c:identifier="gtk_assistant_get_page_title">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
+          </parameter>
+          <parameter name="page">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_page_header_image"
+              c:identifier="gtk_assistant_set_page_header_image">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-    </interface>
-    <function name="tree_sortable_sort_column_changed"
-              c:identifier="gtk_tree_sortable_sort_column_changed">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="sortable">
-          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_sortable_get_sort_column_id"
-              c:identifier="gtk_tree_sortable_get_sort_column_id">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="sortable">
-          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
-        </parameter>
-        <parameter name="sort_column_id">
-          <type name="GLib.gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="order">
-          <type name="SortType" c:type="GtkSortType*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_sortable_set_sort_column_id"
-              c:identifier="gtk_tree_sortable_set_sort_column_id">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="sortable">
-          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
-        </parameter>
-        <parameter name="sort_column_id">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="order">
-          <type name="SortType" c:type="GtkSortType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_sortable_set_sort_func"
-              c:identifier="gtk_tree_sortable_set_sort_func">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="sortable">
-          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
-        </parameter>
-        <parameter name="sort_column_id">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="sort_func">
-          <type name="GtkTreeIterCompareFunc" c:type="GtkTreeIterCompareFunc"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="destroy">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_sortable_set_default_sort_func"
-              c:identifier="gtk_tree_sortable_set_default_sort_func">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="sortable">
-          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
-        </parameter>
-        <parameter name="sort_func">
-          <type name="GtkTreeIterCompareFunc" c:type="GtkTreeIterCompareFunc"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="destroy">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tree_sortable_has_default_sort_func"
-              c:identifier="gtk_tree_sortable_has_default_sort_func">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="sortable">
-          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <callback name="GtkTreeCellDataFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_column">
-          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-        </parameter>
-        <parameter name="cell">
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-        </parameter>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <class name="TreeViewColumn"
-           c:type="GtkTreeViewColumn"
-           parent="GtkObject"
-           glib:type-name="GtkTreeViewColumn"
-           glib:get-type="gtk_tree_view_column_get_type">
-      <constructor name="new" c:identifier="gtk_tree_view_column_new">
-        <return-value>
-          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-        </return-value>
-      </constructor>
-      <constructor name="new_with_attributes"
-                   c:identifier="gtk_tree_view_column_new_with_attributes">
-        <return-value>
-          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-        </return-value>
         <parameters>
-          <parameter name="title">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="page">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="pixbuf" allow-none="1">
+            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="pack_start" c:identifier="gtk_tree_view_column_pack_start">
+      </method>
+      <method name="get_page_header_image"
+              c:identifier="gtk_assistant_get_page_header_image">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
-          <parameter name="expand">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="page">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="pack_end" c:identifier="gtk_tree_view_column_pack_end">
+      <method name="set_page_side_image"
+              c:identifier="gtk_assistant_set_page_side_image">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="page">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="expand">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="pixbuf" allow-none="1">
+            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="clear" c:identifier="gtk_tree_view_column_clear">
+      <method name="get_page_side_image"
+              c:identifier="gtk_assistant_get_page_side_image">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_cell_renderers"
-              c:identifier="gtk_tree_view_column_get_cell_renderers">
-        <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="page">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_attribute"
-              c:identifier="gtk_tree_view_column_add_attribute">
+      <method name="set_page_complete"
+              c:identifier="gtk_assistant_set_page_complete">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="cell_renderer">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
-          <parameter name="attribute">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="page">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="column">
-            <type name="int32" c:type="gint"/>
+          <parameter name="complete">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_attributes"
-              c:identifier="gtk_tree_view_column_set_attributes">
+      <method name="get_page_complete"
+              c:identifier="gtk_assistant_get_page_complete">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
-          <parameter name="cell_renderer">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="page">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_cell_data_func"
-              c:identifier="gtk_tree_view_column_set_cell_data_func">
+      <method name="add_action_widget"
+              c:identifier="gtk_assistant_add_action_widget">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="cell_renderer">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTreeCellDataFunc" c:type="GtkTreeCellDataFunc"/>
-          </parameter>
-          <parameter name="func_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
-          <parameter name="destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="clear_attributes"
-              c:identifier="gtk_tree_view_column_clear_attributes">
+      <method name="remove_action_widget"
+              c:identifier="gtk_assistant_remove_action_widget">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
-          <parameter name="cell_renderer">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_spacing"
-              c:identifier="gtk_tree_view_column_set_spacing">
+      <method name="update_buttons_state"
+              c:identifier="gtk_assistant_update_buttons_state">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="spacing">
-            <type name="int32" c:type="gint"/>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_spacing"
-              c:identifier="gtk_tree_view_column_get_spacing">
+      <callback name="prepare" c:type="prepare">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
+          </parameter>
+          <parameter name="page">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_visible"
-              c:identifier="gtk_tree_view_column_set_visible">
+      </callback>
+      <callback name="apply" c:type="apply">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="visible">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_visible"
-              c:identifier="gtk_tree_view_column_get_visible">
+      </callback>
+      <callback name="close" c:type="close">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_resizable"
-              c:identifier="gtk_tree_view_column_set_resizable">
+      </callback>
+      <callback name="cancel" c:type="cancel">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="resizable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_resizable"
-              c:identifier="gtk_tree_view_column_get_resizable">
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_sizing" c:identifier="gtk_tree_view_column_set_sizing">
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="TreeViewColumnSizing"
-                  c:type="GtkTreeViewColumnSizing"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_sizing" c:identifier="gtk_tree_view_column_get_sizing">
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
-          <type name="TreeViewColumnSizing" c:type="GtkTreeViewColumnSizing"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_width" c:identifier="gtk_tree_view_column_get_width">
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_fixed_width"
-              c:identifier="gtk_tree_view_column_get_fixed_width">
+      </callback>
+      <callback name="gtk_reserved5" c:type="_gtk_reserved5">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_fixed_width"
-              c:identifier="gtk_tree_view_column_set_fixed_width">
+      </callback>
+      <glib:signal name="close">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="fixed_width">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_min_width"
-              c:identifier="gtk_tree_view_column_set_min_width">
+      </glib:signal>
+      <glib:signal name="cancel">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="min_width">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_min_width"
-              c:identifier="gtk_tree_view_column_get_min_width">
+      </glib:signal>
+      <glib:signal name="prepare">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="object">
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_max_width"
-              c:identifier="gtk_tree_view_column_set_max_width">
+      </glib:signal>
+      <glib:signal name="apply">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="max_width">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_max_width"
-              c:identifier="gtk_tree_view_column_get_max_width">
+      </glib:signal>
+    </class>
+    <record name="AssistantPrivate" c:type="GtkAssistantPrivate"/>
+    <callback name="AssistantPageFunc" c:type="GtkAssistantPageFunc">
+      <return-value>
+        <type name="int" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="current_page">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <function name="assistant_new" c:identifier="gtk_assistant_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="Box"
+           c:type="GtkBox"
+           parent="Container"
+           glib:type-name="GtkBox"
+           glib:get-type="gtk_box_get_type">
+      <method name="pack_start" c:identifier="gtk_box_pack_start">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="box">
+            <type name="Box" c:type="GtkBox*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="fill">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="padding">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="clicked" c:identifier="gtk_tree_view_column_clicked">
+      <method name="pack_end" c:identifier="gtk_box_pack_end">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="box">
+            <type name="Box" c:type="GtkBox*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="fill">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="padding">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_title" c:identifier="gtk_tree_view_column_set_title">
+      <method name="pack_start_defaults"
+              c:identifier="gtk_box_pack_start_defaults">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="box">
+            <type name="Box" c:type="GtkBox*"/>
           </parameter>
-          <parameter name="title">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_title" c:identifier="gtk_tree_view_column_get_title">
+      <method name="pack_end_defaults"
+              c:identifier="gtk_box_pack_end_defaults">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="box">
+            <type name="Box" c:type="GtkBox*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_expand" c:identifier="gtk_tree_view_column_set_expand">
+      <method name="set_homogeneous" c:identifier="gtk_box_set_homogeneous">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="box">
+            <type name="Box" c:type="GtkBox*"/>
           </parameter>
-          <parameter name="expand">
+          <parameter name="homogeneous">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_expand" c:identifier="gtk_tree_view_column_get_expand">
+      <method name="get_homogeneous" c:identifier="gtk_box_get_homogeneous">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="box">
+            <type name="Box" c:type="GtkBox*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_clickable"
-              c:identifier="gtk_tree_view_column_set_clickable">
+      <method name="set_spacing" c:identifier="gtk_box_set_spacing">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="box">
+            <type name="Box" c:type="GtkBox*"/>
           </parameter>
-          <parameter name="clickable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="spacing">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_clickable"
-              c:identifier="gtk_tree_view_column_get_clickable">
+      <method name="get_spacing" c:identifier="gtk_box_get_spacing">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="box">
+            <type name="Box" c:type="GtkBox*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_widget" c:identifier="gtk_tree_view_column_set_widget">
+      <method name="reorder_child" c:identifier="gtk_box_reorder_child">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="box">
+            <type name="Box" c:type="GtkBox*"/>
           </parameter>
-          <parameter name="widget" allow-none="1">
+          <parameter name="child">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="get_widget" c:identifier="gtk_tree_view_column_get_widget">
+      <method name="query_child_packing"
+              c:identifier="gtk_box_query_child_packing">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="box">
+            <type name="Box" c:type="GtkBox*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean*"/>
+          </parameter>
+          <parameter name="fill">
+            <type name="boolean" c:type="gboolean*"/>
+          </parameter>
+          <parameter name="padding">
+            <type name="uint" c:type="guint*"/>
+          </parameter>
+          <parameter name="pack_type">
+            <type name="PackType" c:type="GtkPackType*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_alignment"
-              c:identifier="gtk_tree_view_column_set_alignment">
+      <method name="set_child_packing"
+              c:identifier="gtk_box_set_child_packing">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="xalign">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="box">
+            <type name="Box" c:type="GtkBox*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="fill">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="padding">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="pack_type">
+            <type name="PackType" c:type="GtkPackType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_alignment"
-              c:identifier="gtk_tree_view_column_get_alignment">
+      <property name="spacing">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="homogeneous">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+    </class>
+    <record name="BoxChild" c:type="GtkBoxChild">
+      <field name="widget">
+        <type name="Widget" c:type="GtkWidget*"/>
+      </field>
+      <field name="padding">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="expand">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="fill">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="pack">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="is_secondary">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </record>
+    <class name="ButtonBox"
+           c:type="GtkButtonBox"
+           parent="Box"
+           glib:type-name="GtkButtonBox"
+           glib:get-type="gtk_button_box_get_type">
+      <method name="get_layout" c:identifier="gtk_button_box_get_layout">
         <return-value>
-          <type name="float" c:type="gfloat"/>
+          <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="widget">
+            <type name="ButtonBox" c:type="GtkButtonBox*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_reorderable"
-              c:identifier="gtk_tree_view_column_set_reorderable">
+      <method name="set_layout" c:identifier="gtk_button_box_set_layout">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="widget">
+            <type name="ButtonBox" c:type="GtkButtonBox*"/>
           </parameter>
-          <parameter name="reorderable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="layout_style">
+            <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_reorderable"
-              c:identifier="gtk_tree_view_column_get_reorderable">
+      <method name="get_child_secondary"
+              c:identifier="gtk_button_box_get_child_secondary">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="widget">
+            <type name="ButtonBox" c:type="GtkButtonBox*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_sort_column_id"
-              c:identifier="gtk_tree_view_column_set_sort_column_id">
+      <method name="set_child_secondary"
+              c:identifier="gtk_button_box_set_child_secondary">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="widget">
+            <type name="ButtonBox" c:type="GtkButtonBox*"/>
           </parameter>
-          <parameter name="sort_column_id">
-            <type name="int32" c:type="gint"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="is_secondary">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_sort_column_id"
-              c:identifier="gtk_tree_view_column_get_sort_column_id">
+      <method name="set_child_size"
+              c:identifier="gtk_button_box_set_child_size">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="widget">
+            <type name="ButtonBox" c:type="GtkButtonBox*"/>
+          </parameter>
+          <parameter name="min_width">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="min_height">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_sort_indicator"
-              c:identifier="gtk_tree_view_column_set_sort_indicator">
+      <method name="set_child_ipadding"
+              c:identifier="gtk_button_box_set_child_ipadding">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="widget">
+            <type name="ButtonBox" c:type="GtkButtonBox*"/>
           </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="ipad_x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="ipad_y">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_sort_indicator"
-              c:identifier="gtk_tree_view_column_get_sort_indicator">
+      <method name="get_child_size"
+              c:identifier="gtk_button_box_get_child_size">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="widget">
+            <type name="ButtonBox" c:type="GtkButtonBox*"/>
+          </parameter>
+          <parameter name="min_width">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="min_height">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_sort_order"
-              c:identifier="gtk_tree_view_column_set_sort_order">
+      <method name="get_child_ipadding"
+              c:identifier="gtk_button_box_get_child_ipadding">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="widget">
+            <type name="ButtonBox" c:type="GtkButtonBox*"/>
           </parameter>
-          <parameter name="order">
-            <type name="SortType" c:type="GtkSortType"/>
+          <parameter name="ipad_x">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="ipad_y">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_sort_order"
-              c:identifier="gtk_tree_view_column_get_sort_order">
+      <property name="layout-style">
+        <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
+      </property>
+    </class>
+    <function name="button_box_child_requisition"
+              c:identifier="_gtk_button_box_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="nvis_children">
+          <type name="int" c:type="int*"/>
+        </parameter>
+        <parameter name="nvis_secondaries">
+          <type name="int" c:type="int*"/>
+        </parameter>
+        <parameter name="width">
+          <type name="int" c:type="int*"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="int*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="BindingSet" c:type="GtkBindingSet">
+      <field name="set_name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="priority">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="widget_path_pspecs">
+        <type name="GLib.SList" c:type="GSList*"/>
+      </field>
+      <field name="widget_class_pspecs">
+        <type name="GLib.SList" c:type="GSList*"/>
+      </field>
+      <field name="class_branch_pspecs">
+        <type name="GLib.SList" c:type="GSList*"/>
+      </field>
+      <field name="entries">
+        <type name="BindingEntry" c:type="GtkBindingEntry*"/>
+      </field>
+      <field name="current">
+        <type name="BindingEntry" c:type="GtkBindingEntry*"/>
+      </field>
+      <field name="parsed">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </record>
+    <record name="BindingEntry" c:type="GtkBindingEntry">
+      <field name="keyval">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="modifiers">
+        <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+      </field>
+      <field name="binding_set">
+        <type name="BindingSet" c:type="GtkBindingSet*"/>
+      </field>
+      <field name="destroyed">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="in_emission">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="marks_unbound">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="set_next">
+        <type name="BindingEntry" c:type="GtkBindingEntry*"/>
+      </field>
+      <field name="hash_next">
+        <type name="BindingEntry" c:type="GtkBindingEntry*"/>
+      </field>
+      <field name="signals">
+        <type name="BindingSignal" c:type="GtkBindingSignal*"/>
+      </field>
+    </record>
+    <record name="BindingSignal" c:type="GtkBindingSignal">
+      <field name="next">
+        <type name="BindingSignal" c:type="GtkBindingSignal*"/>
+      </field>
+      <field name="signal_name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="n_args">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="args">
+        <type name="BindingArg" c:type="GtkBindingArg*"/>
+      </field>
+    </record>
+    <record name="BindingArg" c:type="GtkBindingArg">
+      <field name="arg_type">
+        <type name="GObject.Type" c:type="GType"/>
+      </field>
+      <field name="d">
+        <type name="any" c:type="any"/>
+      </field>
+    </record>
+    <function name="binding_set_new" c:identifier="gtk_binding_set_new">
+      <return-value>
+        <type name="BindingSet" c:type="GtkBindingSet*"/>
+      </return-value>
+      <parameters>
+        <parameter name="set_name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="binding_set_by_class"
+              c:identifier="gtk_binding_set_by_class">
+      <return-value>
+        <type name="BindingSet" c:type="GtkBindingSet*"/>
+      </return-value>
+      <parameters>
+        <parameter name="object_class">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="binding_set_find" c:identifier="gtk_binding_set_find">
+      <return-value>
+        <type name="BindingSet" c:type="GtkBindingSet*"/>
+      </return-value>
+      <parameters>
+        <parameter name="set_name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="bindings_activate" c:identifier="gtk_bindings_activate">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="Object" c:type="GtkObject*"/>
+        </parameter>
+        <parameter name="keyval">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="modifiers">
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="bindings_activate_event"
+              c:identifier="gtk_bindings_activate_event">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="Object" c:type="GtkObject*"/>
+        </parameter>
+        <parameter name="event">
+          <type name="Gdk.EventKey" c:type="GdkEventKey*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="binding_set_activate"
+              c:identifier="gtk_binding_set_activate">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="binding_set">
+          <type name="BindingSet" c:type="GtkBindingSet*"/>
+        </parameter>
+        <parameter name="keyval">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="modifiers">
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+        </parameter>
+        <parameter name="object">
+          <type name="Object" c:type="GtkObject*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="binding_entry_clear"
+              c:identifier="gtk_binding_entry_clear">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="binding_set">
+          <type name="BindingSet" c:type="GtkBindingSet*"/>
+        </parameter>
+        <parameter name="keyval">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="modifiers">
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="binding_entry_add_signall"
+              c:identifier="gtk_binding_entry_add_signall">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="binding_set">
+          <type name="BindingSet" c:type="GtkBindingSet*"/>
+        </parameter>
+        <parameter name="keyval">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="modifiers">
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+        </parameter>
+        <parameter name="signal_name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="binding_args">
+          <type name="GLib.SList" c:type="GSList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="binding_parse_binding"
+              c:identifier="gtk_binding_parse_binding">
+      <return-value>
+        <type name="uint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="scanner">
+          <type name="GLib.Scanner" c:type="GScanner*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="binding_entry_skip" c:identifier="gtk_binding_entry_skip">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="binding_set">
+          <type name="BindingSet" c:type="GtkBindingSet*"/>
+        </parameter>
+        <parameter name="keyval">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="modifiers">
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="binding_entry_add_signal"
+              c:identifier="gtk_binding_entry_add_signal">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="binding_set">
+          <type name="BindingSet" c:type="GtkBindingSet*"/>
+        </parameter>
+        <parameter name="keyval">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="modifiers">
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+        </parameter>
+        <parameter name="signal_name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="n_args">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="binding_entry_remove"
+              c:identifier="gtk_binding_entry_remove">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="binding_set">
+          <type name="BindingSet" c:type="GtkBindingSet*"/>
+        </parameter>
+        <parameter name="keyval">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="modifiers">
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="binding_set_add_path"
+              c:identifier="gtk_binding_set_add_path">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="binding_set">
+          <type name="BindingSet" c:type="GtkBindingSet*"/>
+        </parameter>
+        <parameter name="path_type">
+          <type name="PathType" c:type="GtkPathType"/>
+        </parameter>
+        <parameter name="path_pattern">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="priority">
+          <type name="PathPriorityType" c:type="GtkPathPriorityType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="binding_reset_parsed"
+              c:identifier="_gtk_binding_reset_parsed">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="binding_signal_new" c:identifier="_gtk_binding_signal_new">
+      <return-value>
+        <type name="uint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="signal_name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="itype">
+          <type name="GObject.Type" c:type="GType"/>
+        </parameter>
+        <parameter name="signal_flags">
+          <type name="GObject.SignalFlags" c:type="GSignalFlags"/>
+        </parameter>
+        <parameter name="handler">
+          <type name="GObject.Callback" c:type="GCallback"/>
+        </parameter>
+        <parameter name="accumulator">
+          <type name="GObject.SignalAccumulator" c:type="GSignalAccumulator"/>
+        </parameter>
+        <parameter name="accu_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="c_marshaller">
+          <type name="GObject.SignalCMarshaller" c:type="GSignalCMarshaller"/>
+        </parameter>
+        <parameter name="return_type">
+          <type name="GObject.Type" c:type="GType"/>
+        </parameter>
+        <parameter name="n_params">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="Builder"
+           c:type="GtkBuilder"
+           parent="GObject.Object"
+           glib:type-name="GtkBuilder"
+           glib:get-type="gtk_builder_get_type">
+      <constructor name="new" c:identifier="gtk_builder_new">
         <return-value>
-          <type name="SortType" c:type="GtkSortType"/>
+          <type name="Builder" c:type="GtkBuilder*"/>
+        </return-value>
+      </constructor>
+      <method name="add_from_file" c:identifier="gtk_builder_add_from_file">
+        <return-value>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="builder">
+            <type name="Builder" c:type="GtkBuilder*"/>
+          </parameter>
+          <parameter name="filename">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="cell_set_cell_data"
-              c:identifier="gtk_tree_view_column_cell_set_cell_data">
+      <method name="add_from_string"
+              c:identifier="gtk_builder_add_from_string">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="tree_model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="builder">
+            <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="buffer">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="is_expander">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="length">
+            <type name="size_t" c:type="gsize"/>
           </parameter>
-          <parameter name="is_expanded">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="cell_get_size"
-              c:identifier="gtk_tree_view_column_cell_get_size">
+      <method name="get_object" c:identifier="gtk_builder_get_object">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="cell_area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="x_offset">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="y_offset">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="builder">
+            <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
-          <parameter name="height">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="cell_is_visible"
-              c:identifier="gtk_tree_view_column_cell_is_visible">
+      <method name="get_objects" c:identifier="gtk_builder_get_objects">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="GLib.SList" c:type="GSList*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="builder">
+            <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="focus_cell" c:identifier="gtk_tree_view_column_focus_cell">
+      <method name="connect_signals"
+              c:identifier="gtk_builder_connect_signals">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="builder">
+            <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="cell_get_position"
-              c:identifier="gtk_tree_view_column_cell_get_position">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
+      <method name="connect_signals_full"
+              c:identifier="gtk_builder_connect_signals_full">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="cell_renderer">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="builder">
+            <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
-          <parameter name="start_pos">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="func">
+            <type name="BuilderConnectFunc" c:type="GtkBuilderConnectFunc"/>
           </parameter>
-          <parameter name="width">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="queue_resize"
-              c:identifier="gtk_tree_view_column_queue_resize">
+      <method name="set_translation_domain"
+              c:identifier="gtk_builder_set_translation_domain">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="builder">
+            <type name="Builder" c:type="GtkBuilder*"/>
+          </parameter>
+          <parameter name="domain">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_tree_view"
-              c:identifier="gtk_tree_view_column_get_tree_view">
+      <method name="get_translation_domain"
+              c:identifier="gtk_builder_get_translation_domain">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="builder">
+            <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="visible">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="resizable">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="width">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="spacing">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="sizing">
-        <type name="TreeViewColumnSizing" c:type="GtkTreeViewColumnSizing"/>
-      </property>
-      <property name="fixed-width">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="min-width">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="max-width">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="title">
+      <method name="get_type_from_name"
+              c:identifier="gtk_builder_get_type_from_name">
+        <return-value>
+          <type name="GObject.Type" c:type="GType"/>
+        </return-value>
+        <parameters>
+          <parameter name="builder">
+            <type name="Builder" c:type="GtkBuilder*"/>
+          </parameter>
+          <parameter name="type_name">
+            <type name="string" c:type="char*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="value_from_string"
+              c:identifier="gtk_builder_value_from_string">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="builder">
+            <type name="Builder" c:type="GtkBuilder*"/>
+          </parameter>
+          <parameter name="pspec">
+            <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
+          </parameter>
+          <parameter name="string">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="GObject.Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="value_from_string_type"
+              c:identifier="gtk_builder_value_from_string_type">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="builder">
+            <type name="Builder" c:type="GtkBuilder*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="GObject.Type" c:type="GType"/>
+          </parameter>
+          <parameter name="string">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="GObject.Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="translation-domain">
         <type name="string" c:type="gchararray"/>
       </property>
-      <property name="expand">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="clickable">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="widget">
-        <type name="Widget" c:type="GtkWidget"/>
-      </property>
-      <property name="alignment">
-        <type name="float" c:type="gfloat"/>
-      </property>
-      <property name="reorderable">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="sort-indicator">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="sort-order">
-        <type name="SortType" c:type="GtkSortType"/>
-      </property>
-      <callback name="clicked">
+      <callback name="get_type_from_name" c:type="get_type_from_name">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GObject.Type" c:type="GType"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="builder">
+            <type name="Builder" c:type="GtkBuilder*"/>
+          </parameter>
+          <parameter name="type_name">
+            <type name="string" c:type="char*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="clicked">
+      <callback name="gtk_reserved5" c:type="_gtk_reserved5">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
+      </callback>
+      <callback name="gtk_reserved6" c:type="_gtk_reserved6">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved7" c:type="_gtk_reserved7">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved8" c:type="_gtk_reserved8">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
     </class>
-    <record name="GtkCellLayout" c:type="GtkCellLayout"/>
-    <callback name="GtkCellLayoutDataFunc">
+    <record name="BuilderPrivate" c:type="GtkBuilderPrivate"/>
+    <function name="builder_error_quark"
+              c:identifier="gtk_builder_error_quark">
+      <return-value>
+        <type name="GLib.Quark" c:type="GQuark"/>
+      </return-value>
+    </function>
+    <callback name="BuilderConnectFunc" c:type="GtkBuilderConnectFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="cell_layout">
-          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        <parameter name="builder">
+          <type name="Builder" c:type="GtkBuilder*"/>
         </parameter>
-        <parameter name="cell">
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        <parameter name="object">
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
-        <parameter name="tree_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="signal_name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="handler_name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="data">
+        <parameter name="connect_object">
+          <type name="GObject.Object" c:type="GObject*"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="GObject.ConnectFlags" c:type="GConnectFlags"/>
+        </parameter>
+        <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
-    <interface name="CellLayout"
-               c:type="GtkCellLayout"
-               glib:type-name="GtkCellLayout"
-               glib:get-type="gtk_cell_layout_get_type">
-      <callback name="pack_start">
+    <interface name="Buildable"
+               c:type="GtkBuildable"
+               glib:type-name="GtkBuildable"
+               glib:get-type="gtk_buildable_get_type">
+      <callback name="set_name" c:type="set_name">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_layout">
-            <type name="CellLayout" c:type="GtkCellLayout*"/>
+          <parameter name="buildable">
+            <type name="Buildable" c:type="GtkBuildable*"/>
           </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="expand">
-            <type name="boolean" c:type="gboolean"/>
+        </parameters>
+      </callback>
+      <callback name="get_name" c:type="get_name">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buildable">
+            <type name="Buildable" c:type="GtkBuildable*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="pack_end">
+      <callback name="add_child" c:type="add_child">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_layout">
-            <type name="CellLayout" c:type="GtkCellLayout*"/>
+          <parameter name="buildable">
+            <type name="Buildable" c:type="GtkBuildable*"/>
           </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="builder">
+            <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
-          <parameter name="expand">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="child">
+            <type name="GObject.Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="clear">
+      <callback name="set_buildable_property" c:type="set_buildable_property">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_layout">
-            <type name="CellLayout" c:type="GtkCellLayout*"/>
+          <parameter name="buildable">
+            <type name="Buildable" c:type="GtkBuildable*"/>
+          </parameter>
+          <parameter name="builder">
+            <type name="Builder" c:type="GtkBuilder*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="GObject.Value" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="add_attribute">
+      <callback name="construct_child" c:type="construct_child">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </return-value>
         <parameters>
-          <parameter name="cell_layout">
-            <type name="CellLayout" c:type="GtkCellLayout*"/>
+          <parameter name="buildable">
+            <type name="Buildable" c:type="GtkBuildable*"/>
           </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="builder">
+            <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
-          <parameter name="attribute">
+          <parameter name="name">
             <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="column">
-            <type name="int32" c:type="gint"/>
+        </parameters>
+      </callback>
+      <callback name="custom_tag_start" c:type="custom_tag_start">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="buildable">
+            <type name="Buildable" c:type="GtkBuildable*"/>
+          </parameter>
+          <parameter name="builder">
+            <type name="Builder" c:type="GtkBuilder*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="GObject.Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="tagname">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="parser">
+            <type name="GLib.MarkupParser" c:type="GMarkupParser*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_cell_data_func">
+      <callback name="custom_tag_end" c:type="custom_tag_end">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_layout">
-            <type name="CellLayout" c:type="GtkCellLayout*"/>
+          <parameter name="buildable">
+            <type name="Buildable" c:type="GtkBuildable*"/>
           </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="builder">
+            <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
-          <parameter name="func">
-            <type name="GtkCellLayoutDataFunc" c:type="GtkCellLayoutDataFunc"/>
+          <parameter name="child">
+            <type name="GObject.Object" c:type="GObject*"/>
           </parameter>
-          <parameter name="func_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="tagname">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="destroy">
-            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+          <parameter name="data">
+            <type name="any" c:type="gpointer*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="clear_attributes">
+      <callback name="custom_finished" c:type="custom_finished">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_layout">
-            <type name="CellLayout" c:type="GtkCellLayout*"/>
+          <parameter name="buildable">
+            <type name="Buildable" c:type="GtkBuildable*"/>
           </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="builder">
+            <type name="Builder" c:type="GtkBuilder*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="GObject.Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="tagname">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="reorder">
+      <callback name="parser_finished" c:type="parser_finished">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_layout">
-            <type name="CellLayout" c:type="GtkCellLayout*"/>
-          </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="buildable">
+            <type name="Buildable" c:type="GtkBuildable*"/>
           </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
+          <parameter name="builder">
+            <type name="Builder" c:type="GtkBuilder*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_cells">
+      <callback name="get_internal_child" c:type="get_internal_child">
         <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
+          <type name="GObject.Object" c:type="GObject*"/>
         </return-value>
         <parameters>
-          <parameter name="cell_layout">
-            <type name="CellLayout" c:type="GtkCellLayout*"/>
+          <parameter name="buildable">
+            <type name="Buildable" c:type="GtkBuildable*"/>
+          </parameter>
+          <parameter name="builder">
+            <type name="Builder" c:type="GtkBuilder*"/>
+          </parameter>
+          <parameter name="childname">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
     </interface>
-    <function name="cell_layout_pack_start"
-              c:identifier="gtk_cell_layout_pack_start">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="cell_layout">
-          <type name="CellLayout" c:type="GtkCellLayout*"/>
-        </parameter>
-        <parameter name="cell">
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-        </parameter>
-        <parameter name="expand">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="cell_layout_pack_end"
-              c:identifier="gtk_cell_layout_pack_end">
+    <function name="buildable_set_name" c:identifier="gtk_buildable_set_name">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="cell_layout">
-          <type name="CellLayout" c:type="GtkCellLayout*"/>
-        </parameter>
-        <parameter name="cell">
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        <parameter name="buildable">
+          <type name="Buildable" c:type="GtkBuildable*"/>
         </parameter>
-        <parameter name="expand">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_layout_get_cells"
-              c:identifier="gtk_cell_layout_get_cells">
+    <function name="buildable_get_name" c:identifier="gtk_buildable_get_name">
       <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="cell_layout">
-          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        <parameter name="buildable">
+          <type name="Buildable" c:type="GtkBuildable*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_layout_clear" c:identifier="gtk_cell_layout_clear">
+    <function name="buildable_add_child"
+              c:identifier="gtk_buildable_add_child">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="cell_layout">
-          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        <parameter name="buildable">
+          <type name="Buildable" c:type="GtkBuildable*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="cell_layout_set_attributes"
-              c:identifier="gtk_cell_layout_set_attributes">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="cell_layout">
-          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        <parameter name="builder">
+          <type name="Builder" c:type="GtkBuilder*"/>
         </parameter>
-        <parameter name="cell">
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        <parameter name="child">
+          <type name="GObject.Object" c:type="GObject*"/>
+        </parameter>
+        <parameter name="type">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_layout_add_attribute"
-              c:identifier="gtk_cell_layout_add_attribute">
+    <function name="buildable_set_buildable_property"
+              c:identifier="gtk_buildable_set_buildable_property">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="cell_layout">
-          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        <parameter name="buildable">
+          <type name="Buildable" c:type="GtkBuildable*"/>
         </parameter>
-        <parameter name="cell">
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        <parameter name="builder">
+          <type name="Builder" c:type="GtkBuilder*"/>
         </parameter>
-        <parameter name="attribute">
+        <parameter name="name">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
+        <parameter name="value">
+          <type name="GObject.Value" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_layout_set_cell_data_func"
-              c:identifier="gtk_cell_layout_set_cell_data_func">
+    <function name="buildable_construct_child"
+              c:identifier="gtk_buildable_construct_child">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="GObject.Object" c:type="GObject*"/>
       </return-value>
       <parameters>
-        <parameter name="cell_layout">
-          <type name="CellLayout" c:type="GtkCellLayout*"/>
-        </parameter>
-        <parameter name="cell">
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GtkCellLayoutDataFunc" c:type="GtkCellLayoutDataFunc"/>
+        <parameter name="buildable">
+          <type name="Buildable" c:type="GtkBuildable*"/>
         </parameter>
-        <parameter name="func_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="builder">
+          <type name="Builder" c:type="GtkBuilder*"/>
         </parameter>
-        <parameter name="destroy">
-          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_layout_clear_attributes"
-              c:identifier="gtk_cell_layout_clear_attributes">
+    <function name="buildable_custom_tag_start"
+              c:identifier="gtk_buildable_custom_tag_start">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="cell_layout">
-          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        <parameter name="buildable">
+          <type name="Buildable" c:type="GtkBuildable*"/>
         </parameter>
-        <parameter name="cell">
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        <parameter name="builder">
+          <type name="Builder" c:type="GtkBuilder*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="cell_layout_reorder"
-              c:identifier="gtk_cell_layout_reorder">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="cell_layout">
-          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        <parameter name="child">
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
-        <parameter name="cell">
-          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        <parameter name="tagname">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="position">
-          <type name="int32" c:type="gint"/>
+        <parameter name="parser">
+          <type name="GLib.MarkupParser" c:type="GMarkupParser*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_layout_buildable_custom_tag_start"
-              c:identifier="_gtk_cell_layout_buildable_custom_tag_start">
+    <function name="buildable_custom_tag_end"
+              c:identifier="gtk_buildable_custom_tag_end">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
         <parameter name="buildable">
@@ -25233,16 +21022,13 @@
         <parameter name="tagname">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="parser">
-          <type name="GLib.GMarkupParser" c:type="GMarkupParser*"/>
-        </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer*"/>
+          <type name="any" c:type="gpointer*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_layout_buildable_custom_tag_end"
-              c:identifier="_gtk_cell_layout_buildable_custom_tag_end">
+    <function name="buildable_custom_finished"
+              c:identifier="gtk_buildable_custom_finished">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -25260,12 +21046,12 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer*"/>
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="cell_layout_buildable_add_child"
-              c:identifier="_gtk_cell_layout_buildable_add_child">
+    <function name="buildable_parser_finished"
+              c:identifier="gtk_buildable_parser_finished">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -25276,906 +21062,939 @@
         <parameter name="builder">
           <type name="Builder" c:type="GtkBuilder*"/>
         </parameter>
-        <parameter name="child">
-          <type name="GObject.Object" c:type="GObject*"/>
+      </parameters>
+    </function>
+    <function name="buildable_get_internal_child"
+              c:identifier="gtk_buildable_get_internal_child">
+      <return-value>
+        <type name="GObject.Object" c:type="GObject*"/>
+      </return-value>
+      <parameters>
+        <parameter name="buildable">
+          <type name="Buildable" c:type="GtkBuildable*"/>
         </parameter>
-        <parameter name="type">
+        <parameter name="builder">
+          <type name="Builder" c:type="GtkBuilder*"/>
+        </parameter>
+        <parameter name="childname">
           <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <class name="CellRendererText"
-           c:type="GtkCellRendererText"
-           parent="CellRenderer"
-           glib:type-name="GtkCellRendererText"
-           glib:get-type="gtk_cell_renderer_text_get_type">
-      <method name="set_fixed_height_from_font"
-              c:identifier="gtk_cell_renderer_text_set_fixed_height_from_font">
+    <class name="Image"
+           c:type="GtkImage"
+           parent="Misc"
+           glib:type-name="GtkImage"
+           glib:get-type="gtk_image_get_type">
+      <method name="clear" c:identifier="gtk_image_clear">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="renderer">
-            <type name="CellRendererText" c:type="GtkCellRendererText*"/>
+          <parameter name="image">
+            <type name="Image" c:type="GtkImage*"/>
           </parameter>
-          <parameter name="number_of_rows">
-            <type name="int32" c:type="gint"/>
+        </parameters>
+      </method>
+      <method name="set_from_pixmap" c:identifier="gtk_image_set_from_pixmap">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="GtkImage*"/>
+          </parameter>
+          <parameter name="pixmap">
+            <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+          </parameter>
+          <parameter name="mask" allow-none="1">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="text">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="markup">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="attributes">
-        <type name="PangoAttrList" c:type="PangoAttrList"/>
-      </property>
-      <property name="single-paragraph-mode">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="width-chars">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="wrap-width">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="alignment">
-        <type name="PangoAlignment" c:type="PangoAlignment"/>
-      </property>
-      <property name="background">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="foreground">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="background-gdk">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </property>
-      <property name="foreground-gdk">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </property>
-      <property name="font">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="font-desc">
-        <type name="PangoFontDescription" c:type="PangoFontDescription"/>
-      </property>
-      <property name="family">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="style">
-        <type name="PangoStyle" c:type="PangoStyle"/>
-      </property>
-      <property name="variant">
-        <type name="PangoVariant" c:type="PangoVariant"/>
-      </property>
-      <property name="weight">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="stretch">
-        <type name="PangoStretch" c:type="PangoStretch"/>
-      </property>
-      <property name="size">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="size-points">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <property name="scale">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <property name="editable">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="strikethrough">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="underline">
-        <type name="PangoUnderline" c:type="PangoUnderline"/>
-      </property>
-      <property name="rise">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="language">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="ellipsize">
-        <type name="PangoEllipsizeMode" c:type="PangoEllipsizeMode"/>
-      </property>
-      <property name="wrap-mode">
-        <type name="PangoWrapMode" c:type="PangoWrapMode"/>
-      </property>
-      <property name="background-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="foreground-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="family-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="style-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="variant-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="weight-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="stretch-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="size-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="scale-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="editable-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="strikethrough-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="underline-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="rise-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="language-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="ellipsize-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="align-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="edited">
+      <method name="set_from_image" c:identifier="gtk_image_set_from_image">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_renderer_text">
-            <type name="CellRendererText" c:type="GtkCellRendererText*"/>
+          <parameter name="image">
+            <type name="Image" c:type="GtkImage*"/>
           </parameter>
-          <parameter name="path">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="gdk_image" allow-none="1">
+            <type name="Gdk.Image" c:type="GdkImage*"/>
           </parameter>
-          <parameter name="new_text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="mask" allow-none="1">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
+      </method>
+      <method name="set_from_file" c:identifier="gtk_image_set_from_file">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="GtkImage*"/>
+          </parameter>
+          <parameter name="filename" allow-none="1">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_from_pixbuf" c:identifier="gtk_image_set_from_pixbuf">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="GtkImage*"/>
+          </parameter>
+          <parameter name="pixbuf" allow-none="1">
+            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_from_stock" c:identifier="gtk_image_set_from_stock">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="GtkImage*"/>
+          </parameter>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="size">
+            <type name="IconSize" c:type="GtkIconSize"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_from_icon_set"
+              c:identifier="gtk_image_set_from_icon_set">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <glib:signal name="edited">
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="GtkImage*"/>
+          </parameter>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
+          </parameter>
+          <parameter name="size">
+            <type name="IconSize" c:type="GtkIconSize"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_from_animation"
+              c:identifier="gtk_image_set_from_animation">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="string" c:type="gchararray"/>
+          <parameter name="image">
+            <type name="Image" c:type="GtkImage*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="string" c:type="gchararray"/>
+          <parameter name="animation">
+            <type name="Pixbuf.Animation" c:type="GdkPixbufAnimation*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <class name="CellRendererAccel"
-           c:type="GtkCellRendererAccel"
-           parent="CellRendererText"
-           glib:type-name="GtkCellRendererAccel"
-           glib:get-type="gtk_cell_renderer_accel_get_type">
-      <property name="accel-key">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <property name="accel-mods">
-        <type name="GdkModifierType" c:type="GdkModifierType"/>
-      </property>
-      <property name="keycode">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <property name="accel-mode">
-        <type name="CellRendererAccelMode" c:type="GtkCellRendererAccelMode"/>
-      </property>
-      <callback name="accel_edited">
+      </method>
+      <method name="set_from_icon_name"
+              c:identifier="gtk_image_set_from_icon_name">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="accel">
-            <type name="CellRendererAccel" c:type="GtkCellRendererAccel*"/>
+          <parameter name="image">
+            <type name="Image" c:type="GtkImage*"/>
           </parameter>
-          <parameter name="path_string">
+          <parameter name="icon_name">
             <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="accel_key">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="size">
+            <type name="IconSize" c:type="GtkIconSize"/>
           </parameter>
-          <parameter name="accel_mods">
-            <type name="GdkModifierType" c:type="GdkModifierType"/>
+        </parameters>
+      </method>
+      <method name="set_pixel_size" c:identifier="gtk_image_set_pixel_size">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="GtkImage*"/>
           </parameter>
-          <parameter name="hardware_keycode">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="pixel_size">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="accel_cleared">
+      </method>
+      <method name="get_storage_type"
+              c:identifier="gtk_image_get_storage_type">
+        <return-value>
+          <type name="ImageType" c:type="GtkImageType"/>
+        </return-value>
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="GtkImage*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_pixmap" c:identifier="gtk_image_get_pixmap">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="accel">
-            <type name="CellRendererAccel" c:type="GtkCellRendererAccel*"/>
+          <parameter name="image">
+            <type name="Image" c:type="GtkImage*"/>
           </parameter>
-          <parameter name="path_string">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="pixmap">
+            <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
+          </parameter>
+          <parameter name="mask">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap**"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved0">
+      </method>
+      <method name="get_image" c:identifier="gtk_image_get_image">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved1">
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="GtkImage*"/>
+          </parameter>
+          <parameter name="gdk_image">
+            <type name="Gdk.Image" c:type="GdkImage**"/>
+          </parameter>
+          <parameter name="mask">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_pixbuf" c:identifier="gtk_image_get_pixbuf">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="GtkImage*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_stock" c:identifier="gtk_image_get_stock">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="GtkImage*"/>
+          </parameter>
+          <parameter name="stock_id">
+            <type name="GLib.char" c:type="gchar**"/>
+          </parameter>
+          <parameter name="size">
+            <type name="IconSize" c:type="GtkIconSize*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_icon_set" c:identifier="gtk_image_get_icon_set">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="GtkImage*"/>
+          </parameter>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet**"/>
+          </parameter>
+          <parameter name="size">
+            <type name="IconSize" c:type="GtkIconSize*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_animation" c:identifier="gtk_image_get_animation">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Pixbuf.Animation" c:type="GdkPixbufAnimation*"/>
         </return-value>
-      </callback>
-      <glib:signal name="accel-edited">
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="GtkImage*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_icon_name" c:identifier="gtk_image_get_icon_name">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="string" c:type="gchararray"/>
+          <parameter name="image">
+            <type name="Image" c:type="GtkImage*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="icon_name">
+            <type name="GLib.char" c:type="gchar**"/>
           </parameter>
-          <parameter name="p1">
-            <type name="GdkModifierType" c:type="GdkModifierType"/>
+          <parameter name="size">
+            <type name="IconSize" c:type="GtkIconSize*"/>
           </parameter>
-          <parameter name="p2">
-            <type name="uint32" c:type="guint"/>
+        </parameters>
+      </method>
+      <method name="get_pixel_size" c:identifier="gtk_image_get_pixel_size">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="GtkImage*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="accel-cleared">
+      </method>
+      <method name="set" c:identifier="gtk_image_set">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="string" c:type="gchararray"/>
+          <parameter name="image">
+            <type name="Image" c:type="GtkImage*"/>
+          </parameter>
+          <parameter name="val">
+            <type name="Gdk.Image" c:type="GdkImage*"/>
+          </parameter>
+          <parameter name="mask">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <class name="CellRendererCombo"
-           c:type="GtkCellRendererCombo"
-           parent="CellRendererText"
-           glib:type-name="GtkCellRendererCombo"
-           glib:get-type="gtk_cell_renderer_combo_get_type">
-      <property name="model">
-        <type name="TreeModel" c:type="GtkTreeModel"/>
-      </property>
-      <property name="text-column">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="has-entry">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-    </class>
-    <class name="CellRendererPixbuf"
-           c:type="GtkCellRendererPixbuf"
-           parent="CellRenderer"
-           glib:type-name="GtkCellRendererPixbuf"
-           glib:get-type="gtk_cell_renderer_pixbuf_get_type">
+      </method>
+      <method name="get" c:identifier="gtk_image_get">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="GtkImage*"/>
+          </parameter>
+          <parameter name="val">
+            <type name="Gdk.Image" c:type="GdkImage**"/>
+          </parameter>
+          <parameter name="mask">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap**"/>
+          </parameter>
+        </parameters>
+      </method>
       <property name="pixbuf">
-        <type name="GdkPixbuf" c:type="GdkPixbuf"/>
-      </property>
-      <property name="pixbuf-expander-open">
-        <type name="GdkPixbuf" c:type="GdkPixbuf"/>
+        <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf"/>
       </property>
-      <property name="pixbuf-expander-closed">
-        <type name="GdkPixbuf" c:type="GdkPixbuf"/>
+      <property name="pixmap">
+        <type name="Gdk.Pixmap" c:type="GdkPixmap"/>
       </property>
-      <property name="stock-id">
-        <type name="string" c:type="gchararray"/>
+      <property name="image">
+        <type name="Gdk.Image" c:type="GdkImage"/>
       </property>
-      <property name="stock-size">
-        <type name="uint32" c:type="guint"/>
+      <property name="mask">
+        <type name="Gdk.Pixmap" c:type="GdkPixmap"/>
       </property>
-      <property name="stock-detail">
+      <property name="file">
         <type name="string" c:type="gchararray"/>
       </property>
-      <property name="follow-state">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="icon-name">
+      <property name="stock">
         <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>
-    <record name="GtkCellRendererProgressPrivate"
-            c:type="GtkCellRendererProgressPrivate"/>
-    <class name="CellRendererProgress"
-           c:type="GtkCellRendererProgress"
-           parent="CellRenderer"
-           glib:type-name="GtkCellRendererProgress"
-           glib:get-type="gtk_cell_renderer_progress_get_type">
-      <property name="value">
-        <type name="int32" c:type="gint"/>
+      <property name="icon-set">
+        <type name="IconSet" c:type="GtkIconSet"/>
       </property>
-      <property name="text">
-        <type name="string" c:type="gchararray"/>
+      <property name="icon-size">
+        <type name="int" c:type="gint"/>
       </property>
-      <property name="pulse">
-        <type name="int32" c:type="gint"/>
+      <property name="pixel-size">
+        <type name="int" c:type="gint"/>
       </property>
-      <property name="text-xalign">
-        <type name="float" c:type="gfloat"/>
+      <property name="pixbuf-animation">
+        <type name="Pixbuf.Animation" c:type="GdkPixbufAnimation"/>
       </property>
-      <property name="text-yalign">
-        <type name="float" c:type="gfloat"/>
+      <property name="icon-name">
+        <type name="string" c:type="gchararray"/>
       </property>
-      <property name="orientation">
-        <type name="ProgressBarOrientation"
-              c:type="GtkProgressBarOrientation"/>
+      <property name="storage-type">
+        <type name="ImageType" c:type="GtkImageType"/>
       </property>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
-    <record name="GtkCellRendererSpinPrivate"
-            c:type="GtkCellRendererSpinPrivate"/>
-    <class name="CellRendererSpin"
-           c:type="GtkCellRendererSpin"
-           parent="CellRendererText"
-           glib:type-name="GtkCellRendererSpin"
-           glib:get-type="gtk_cell_renderer_spin_get_type">
-      <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>
-    </class>
-    <class name="CellRendererToggle"
-           c:type="GtkCellRendererToggle"
-           parent="CellRenderer"
-           glib:type-name="GtkCellRendererToggle"
-           glib:get-type="gtk_cell_renderer_toggle_get_type">
-      <method name="get_radio"
-              c:identifier="gtk_cell_renderer_toggle_get_radio">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="toggle">
-            <type name="CellRendererToggle" c:type="GtkCellRendererToggle*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_radio"
-              c:identifier="gtk_cell_renderer_toggle_set_radio">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="toggle">
-            <type name="CellRendererToggle" c:type="GtkCellRendererToggle*"/>
-          </parameter>
-          <parameter name="radio">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_active"
-              c:identifier="gtk_cell_renderer_toggle_get_active">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
+    <record name="ImagePixmapData" c:type="GtkImagePixmapData">
+      <field name="pixmap">
+        <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+      </field>
+    </record>
+    <record name="ImageImageData" c:type="GtkImageImageData">
+      <field name="image">
+        <type name="Gdk.Image" c:type="GdkImage*"/>
+      </field>
+    </record>
+    <record name="ImagePixbufData" c:type="GtkImagePixbufData">
+      <field name="pixbuf">
+        <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+      </field>
+    </record>
+    <record name="ImageStockData" c:type="GtkImageStockData">
+      <field name="stock_id">
+        <type name="string" c:type="gchar*"/>
+      </field>
+    </record>
+    <record name="ImageIconSetData" c:type="GtkImageIconSetData">
+      <field name="icon_set">
+        <type name="IconSet" c:type="GtkIconSet*"/>
+      </field>
+    </record>
+    <record name="ImageAnimationData" c:type="GtkImageAnimationData">
+      <field name="anim">
+        <type name="Pixbuf.Animation" c:type="GdkPixbufAnimation*"/>
+      </field>
+      <field name="iter">
+        <type name="Pixbuf.AnimationIter" c:type="GdkPixbufAnimationIter*"/>
+      </field>
+      <field name="frame_timeout">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </record>
+    <record name="ImageIconNameData" c:type="GtkImageIconNameData">
+      <field name="icon_name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="pixbuf">
+        <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+      </field>
+      <field name="theme_change_id">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </record>
+    <function name="image_new" c:identifier="gtk_image_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="image_new_from_pixmap"
+              c:identifier="gtk_image_new_from_pixmap">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="pixmap" allow-none="1">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+        </parameter>
+        <parameter name="mask" allow-none="1">
+          <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="image_new_from_image"
+              c:identifier="gtk_image_new_from_image">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="image" allow-none="1">
+          <type name="Gdk.Image" c:type="GdkImage*"/>
+        </parameter>
+        <parameter name="mask" allow-none="1">
+          <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="image_new_from_file"
+              c:identifier="gtk_image_new_from_file">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="filename">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="image_new_from_pixbuf"
+              c:identifier="gtk_image_new_from_pixbuf">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="pixbuf" allow-none="1">
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="image_new_from_stock"
+              c:identifier="gtk_image_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="size">
+          <type name="IconSize" c:type="GtkIconSize"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="image_new_from_icon_set"
+              c:identifier="gtk_image_new_from_icon_set">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="icon_set">
+          <type name="IconSet" c:type="GtkIconSet*"/>
+        </parameter>
+        <parameter name="size">
+          <type name="IconSize" c:type="GtkIconSize"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="image_new_from_animation"
+              c:identifier="gtk_image_new_from_animation">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="animation">
+          <type name="Pixbuf.Animation" c:type="GdkPixbufAnimation*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="image_new_from_icon_name"
+              c:identifier="gtk_image_new_from_icon_name">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="icon_name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="size">
+          <type name="IconSize" c:type="GtkIconSize"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="Button"
+           c:type="GtkButton"
+           parent="Bin"
+           glib:type-name="GtkButton"
+           glib:get-type="gtk_button_get_type">
+      <method name="pressed" c:identifier="gtk_button_pressed">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toggle">
-            <type name="CellRendererToggle" c:type="GtkCellRendererToggle*"/>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_active"
-              c:identifier="gtk_cell_renderer_toggle_set_active">
+      <method name="released" c:identifier="gtk_button_released">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toggle">
-            <type name="CellRendererToggle" c:type="GtkCellRendererToggle*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="activatable">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="active">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="radio">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="inconsistent">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="indicator-size">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <callback name="toggled">
+      <method name="clicked" c:identifier="gtk_button_clicked">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_renderer_toggle">
-            <type name="CellRendererToggle" c:type="GtkCellRendererToggle*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+      </method>
+      <method name="enter" c:identifier="gtk_button_enter">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="leave" c:identifier="gtk_button_leave">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_relief" c:identifier="gtk_button_set_relief">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <glib:signal name="toggled">
+        <parameters>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
+          </parameter>
+          <parameter name="newstyle">
+            <type name="ReliefStyle" c:type="GtkReliefStyle"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_relief" c:identifier="gtk_button_get_relief">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="ReliefStyle" c:type="GtkReliefStyle"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="string" c:type="gchararray"/>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <record name="GtkCellViewPrivate" c:type="GtkCellViewPrivate"/>
-    <class name="CellView"
-           c:type="GtkCellView"
-           parent="Widget"
-           glib:type-name="GtkCellView"
-           glib:get-type="gtk_cell_view_get_type">
-      <method name="set_model" c:identifier="gtk_cell_view_set_model">
+      </method>
+      <method name="set_label" c:identifier="gtk_button_set_label">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_view">
-            <type name="CellView" c:type="GtkCellView*"/>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
           </parameter>
-          <parameter name="model" allow-none="1">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="label">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_displayed_row"
-              c:identifier="gtk_cell_view_set_displayed_row">
+      <method name="get_label" c:identifier="gtk_button_get_label">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="cell_view">
-            <type name="CellView" c:type="GtkCellView*"/>
-          </parameter>
-          <parameter name="path" allow-none="1">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_displayed_row"
-              c:identifier="gtk_cell_view_get_displayed_row">
+      <method name="set_use_underline"
+              c:identifier="gtk_button_set_use_underline">
         <return-value>
-          <type name="TreePath" c:type="GtkTreePath*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_view">
-            <type name="CellView" c:type="GtkCellView*"/>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
+          </parameter>
+          <parameter name="use_underline">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_size_of_row"
-              c:identifier="gtk_cell_view_get_size_of_row">
+      <method name="get_use_underline"
+              c:identifier="gtk_button_get_use_underline">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="cell_view">
-            <type name="CellView" c:type="GtkCellView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="requisition">
-            <type name="Requisition" c:type="GtkRequisition*"/>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_background_color"
-              c:identifier="gtk_cell_view_set_background_color">
+      <method name="set_use_stock" c:identifier="gtk_button_set_use_stock">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="cell_view">
-            <type name="CellView" c:type="GtkCellView*"/>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
           </parameter>
-          <parameter name="color">
-            <type name="GdkColor" c:type="GdkColor*"/>
+          <parameter name="use_stock">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_cell_renderers"
-              c:identifier="gtk_cell_view_get_cell_renderers">
+      <method name="get_use_stock" c:identifier="gtk_button_get_use_stock">
         <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="cell_view">
-            <type name="CellView" c:type="GtkCellView*"/>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="background">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="background-gdk">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </property>
-      <property name="background-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="model">
-        <type name="TreeModel" c:type="GtkTreeModel"/>
-      </property>
-    </class>
-    <function name="cell_view_new" c:identifier="gtk_cell_view_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="cell_view_new_with_text"
-              c:identifier="gtk_cell_view_new_with_text">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="cell_view_new_with_markup"
-              c:identifier="gtk_cell_view_new_with_markup">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="markup">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="cell_view_new_with_pixbuf"
-              c:identifier="gtk_cell_view_new_with_pixbuf">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="pixbuf">
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="ToggleButton"
-           c:type="GtkToggleButton"
-           parent="Button"
-           glib:type-name="GtkToggleButton"
-           glib:get-type="gtk_toggle_button_get_type">
-      <method name="set_mode" c:identifier="gtk_toggle_button_set_mode">
+      <method name="set_focus_on_click"
+              c:identifier="gtk_button_set_focus_on_click">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toggle_button">
-            <type name="ToggleButton" c:type="GtkToggleButton*"/>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
           </parameter>
-          <parameter name="draw_indicator">
+          <parameter name="focus_on_click">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_mode" c:identifier="gtk_toggle_button_get_mode">
+      <method name="get_focus_on_click"
+              c:identifier="gtk_button_get_focus_on_click">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="toggle_button">
-            <type name="ToggleButton" c:type="GtkToggleButton*"/>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_active" c:identifier="gtk_toggle_button_set_active">
+      <method name="set_alignment" c:identifier="gtk_button_set_alignment">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toggle_button">
-            <type name="ToggleButton" c:type="GtkToggleButton*"/>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
           </parameter>
-          <parameter name="is_active">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="xalign">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="yalign">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_active" c:identifier="gtk_toggle_button_get_active">
+      <method name="get_alignment" c:identifier="gtk_button_get_alignment">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toggle_button">
-            <type name="ToggleButton" c:type="GtkToggleButton*"/>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
+          </parameter>
+          <parameter name="xalign">
+            <type name="float" c:type="gfloat*"/>
+          </parameter>
+          <parameter name="yalign">
+            <type name="float" c:type="gfloat*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="toggled" c:identifier="gtk_toggle_button_toggled">
+      <method name="set_image" c:identifier="gtk_button_set_image">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toggle_button">
-            <type name="ToggleButton" c:type="GtkToggleButton*"/>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
+          </parameter>
+          <parameter name="image">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_inconsistent"
-              c:identifier="gtk_toggle_button_set_inconsistent">
+      <method name="get_image" c:identifier="gtk_button_get_image">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_image_position"
+              c:identifier="gtk_button_set_image_position">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toggle_button">
-            <type name="ToggleButton" c:type="GtkToggleButton*"/>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
           </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="position">
+            <type name="PositionType" c:type="GtkPositionType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_inconsistent"
-              c:identifier="gtk_toggle_button_get_inconsistent">
+      <method name="get_image_position"
+              c:identifier="gtk_button_get_image_position">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="PositionType" c:type="GtkPositionType"/>
         </return-value>
         <parameters>
-          <parameter name="toggle_button">
-            <type name="ToggleButton" c:type="GtkToggleButton*"/>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="active">
+      <property name="label">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="image">
+        <type name="Widget" c:type="GtkWidget"/>
+      </property>
+      <property name="relief">
+        <type name="ReliefStyle" c:type="GtkReliefStyle"/>
+      </property>
+      <property name="use-underline">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="inconsistent">
+      <property name="use-stock">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="draw-indicator">
+      <property name="focus-on-click">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <callback name="toggled">
+      <property name="xalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="yalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="image-position">
+        <type name="PositionType" c:type="GtkPositionType"/>
+      </property>
+      <callback name="pressed" c:type="pressed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="toggle_button">
-            <type name="ToggleButton" c:type="GtkToggleButton*"/>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="released" c:type="released">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="clicked" c:type="clicked">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="enter" c:type="enter">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="leave" c:type="leave">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="activate" c:type="activate">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="button">
+            <type name="Button" c:type="GtkButton*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="toggled">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="activate">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-    </class>
-    <function name="toggle_button_new" c:identifier="gtk_toggle_button_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="toggle_button_new_with_label"
-              c:identifier="gtk_toggle_button_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="toggle_button_new_with_mnemonic"
-              c:identifier="gtk_toggle_button_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>
-    <class name="CheckButton"
-           c:type="GtkCheckButton"
-           parent="ToggleButton"
-           glib:type-name="GtkCheckButton"
-           glib:get-type="gtk_check_button_get_type">
-      <callback name="draw_indicator">
+      <glib:signal name="pressed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="check_button">
-            <type name="CheckButton" c:type="GtkCheckButton*"/>
-          </parameter>
-          <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
+      </glib:signal>
+      <glib:signal name="released">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+      </glib:signal>
+      <glib:signal name="clicked">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+      </glib:signal>
+      <glib:signal name="enter">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+      </glib:signal>
+      <glib:signal name="leave">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
+      </glib:signal>
     </class>
-    <function name="check_button_new" c:identifier="gtk_check_button_new">
+    <function name="button_new" c:identifier="gtk_button_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
-    <function name="check_button_new_with_label"
-              c:identifier="gtk_check_button_new_with_label">
+    <function name="button_new_with_label"
+              c:identifier="gtk_button_new_with_label">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
@@ -26185,9486 +22004,14228 @@
         </parameter>
       </parameters>
     </function>
-    <function name="check_button_new_with_mnemonic"
-              c:identifier="gtk_check_button_new_with_mnemonic">
+    <function name="button_new_from_stock"
+              c:identifier="gtk_button_new_from_stock">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="label">
+        <parameter name="stock_id">
           <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="check_button_get_props"
-              c:identifier="_gtk_check_button_get_props">
+    <function name="button_new_with_mnemonic"
+              c:identifier="gtk_button_new_with_mnemonic">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="check_button">
-          <type name="CheckButton" c:type="GtkCheckButton*"/>
-        </parameter>
-        <parameter name="indicator_size">
-          <type name="GLib.gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="indicator_spacing">
-          <type name="GLib.gint" c:type="gint*"/>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <class name="Item"
-           c:type="GtkItem"
-           parent="Bin"
-           glib:type-name="GtkItem"
-           glib:get-type="gtk_item_get_type">
-      <method name="select" c:identifier="gtk_item_select">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="item">
-            <type name="Item" c:type="GtkItem*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="deselect" c:identifier="gtk_item_deselect">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="item">
-            <type name="Item" c:type="GtkItem*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="toggle" c:identifier="gtk_item_toggle">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="item">
-            <type name="Item" c:type="GtkItem*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <callback name="select">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="item">
-            <type name="Item" c:type="GtkItem*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="deselect">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="item">
-            <type name="Item" c:type="GtkItem*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="toggle">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="item">
-            <type name="Item" c:type="GtkItem*"/>
-          </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="select">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="deselect">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="toggle">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <class name="MenuItem"
-           c:type="GtkMenuItem"
-           parent="Item"
-           glib:type-name="GtkMenuItem"
-           glib:get-type="gtk_menu_item_get_type">
-      <method name="set_submenu" c:identifier="gtk_menu_item_set_submenu">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
-          </parameter>
-          <parameter name="submenu">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_submenu" c:identifier="gtk_menu_item_get_submenu">
-        <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="select" c:identifier="gtk_menu_item_select">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="deselect" c:identifier="gtk_menu_item_deselect">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="activate" c:identifier="gtk_menu_item_activate">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="toggle_size_request"
-              c:identifier="gtk_menu_item_toggle_size_request">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
-          </parameter>
-          <parameter name="requisition">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="toggle_size_allocate"
-              c:identifier="gtk_menu_item_toggle_size_allocate">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
-          </parameter>
-          <parameter name="allocation">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_right_justified"
-              c:identifier="gtk_menu_item_set_right_justified">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
-          </parameter>
-          <parameter name="right_justified">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_right_justified"
-              c:identifier="gtk_menu_item_get_right_justified">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_accel_path"
-              c:identifier="gtk_menu_item_set_accel_path">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
-          </parameter>
-          <parameter name="accel_path" allow-none="1">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="remove_submenu"
-              c:identifier="gtk_menu_item_remove_submenu">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="submenu">
-        <type name="Menu" c:type="GtkMenu"/>
-      </property>
-      <field name="hide_on_activate">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <callback name="activate">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="activate_item">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="toggle_size_request">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
-          </parameter>
-          <parameter name="requisition">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="toggle_size_allocate">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="menu_item">
-            <type name="MenuItem" c:type="GtkMenuItem*"/>
-          </parameter>
-          <parameter name="allocation">
-            <type name="int32" c:type="gint"/>
-          </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="activate">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="activate-item">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="toggle-size-request">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="toggle-size-allocate">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </class>
-    <function name="menu_item_new" c:identifier="gtk_menu_item_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="menu_item_new_with_label"
-              c:identifier="gtk_menu_item_new_with_label">
+    <function name="button_set_depressed"
+              c:identifier="_gtk_button_set_depressed">
       <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="button">
+          <type name="Button" c:type="GtkButton*"/>
+        </parameter>
+        <parameter name="depressed">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="menu_item_new_with_mnemonic"
-              c:identifier="gtk_menu_item_new_with_mnemonic">
+    <function name="button_paint" c:identifier="_gtk_button_paint">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="label">
+        <parameter name="button">
+          <type name="Button" c:type="GtkButton*"/>
+        </parameter>
+        <parameter name="area">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        </parameter>
+        <parameter name="state_type">
+          <type name="StateType" c:type="GtkStateType"/>
+        </parameter>
+        <parameter name="shadow_type">
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </parameter>
+        <parameter name="main_detail">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="default_detail">
           <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="menu_item_refresh_accel_path"
-              c:identifier="_gtk_menu_item_refresh_accel_path">
+    <function name="marshal_BOOLEAN__VOID"
+              c:identifier="gtk_marshal_BOOLEAN__VOID">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="menu_item">
-          <type name="MenuItem" c:type="GtkMenuItem*"/>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="prefix">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="accel_group">
-          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="group_changed">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="menu_item_is_selectable"
-              c:identifier="_gtk_menu_item_is_selectable">
+    <function name="marshal_BOOLEAN__POINTER"
+              c:identifier="gtk_marshal_BOOLEAN__POINTER">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="menu_item">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="menu_item_popup_submenu"
-              c:identifier="_gtk_menu_item_popup_submenu">
+    <function name="marshal_BOOLEAN__POINTER_POINTER_INT_INT"
+              c:identifier="gtk_marshal_BOOLEAN__POINTER_POINTER_INT_INT">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="menu_item">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="with_delay">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="menu_item_popdown_submenu"
-              c:identifier="_gtk_menu_item_popdown_submenu">
+    <function name="marshal_BOOLEAN__POINTER_INT_INT"
+              c:identifier="gtk_marshal_BOOLEAN__POINTER_INT_INT">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="menu_item">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
         </parameter>
-      </parameters>
-    </function>
-    <class name="CheckMenuItem"
-           c:type="GtkCheckMenuItem"
-           parent="MenuItem"
-           glib:type-name="GtkCheckMenuItem"
-           glib:get-type="gtk_check_menu_item_get_type">
-      <method name="set_active" c:identifier="gtk_check_menu_item_set_active">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="check_menu_item">
-            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
-          </parameter>
-          <parameter name="is_active">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_active" c:identifier="gtk_check_menu_item_get_active">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="check_menu_item">
-            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="toggled" c:identifier="gtk_check_menu_item_toggled">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="check_menu_item">
-            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_inconsistent"
-              c:identifier="gtk_check_menu_item_set_inconsistent">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="check_menu_item">
-            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_inconsistent"
-              c:identifier="gtk_check_menu_item_get_inconsistent">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="check_menu_item">
-            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_draw_as_radio"
-              c:identifier="gtk_check_menu_item_set_draw_as_radio">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="check_menu_item">
-            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
-          </parameter>
-          <parameter name="draw_as_radio">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_draw_as_radio"
-              c:identifier="gtk_check_menu_item_get_draw_as_radio">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="check_menu_item">
-            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_show_toggle"
-              c:identifier="gtk_check_menu_item_set_show_toggle">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="menu_item">
-            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
-          </parameter>
-          <parameter name="always">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="active">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="inconsistent">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="draw-as-radio">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="toggled">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="check_menu_item">
-            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="draw_indicator">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="check_menu_item">
-            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
-          </parameter>
-          <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </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="toggled">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="check_menu_item_new"
-              c:identifier="gtk_check_menu_item_new">
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_BOOLEAN__POINTER_INT_INT_UINT"
+              c:identifier="gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="check_menu_item_new_with_label"
-              c:identifier="gtk_check_menu_item_new_with_label">
+    <function name="marshal_BOOLEAN__POINTER_STRING_STRING_POINTER"
+              c:identifier="gtk_marshal_BOOLEAN__POINTER_STRING_STRING_POINTER">
       <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="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="check_menu_item_new_with_mnemonic"
-              c:identifier="gtk_check_menu_item_new_with_mnemonic">
+    <function name="marshal_ENUM__ENUM" c:identifier="gtk_marshal_ENUM__ENUM">
       <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="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <class name="TextTag"
-           c:type="GtkTextTag"
-           parent="GObject.Object"
-           glib:type-name="GtkTextTag"
-           glib:get-type="gtk_text_tag_get_type">
-      <constructor name="new" c:identifier="gtk_text_tag_new">
-        <return-value>
-          <type name="TextTag" c:type="GtkTextTag*"/>
-        </return-value>
-        <parameters>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="table_lookup"
-                   c:identifier="gtk_text_tag_table_lookup">
-        <return-value>
-          <type name="TextTag" c:type="GtkTextTag*"/>
-        </return-value>
-        <parameters>
-          <parameter name="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="get_priority" c:identifier="gtk_text_tag_get_priority">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_priority" c:identifier="gtk_text_tag_set_priority">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
-          </parameter>
-          <parameter name="priority">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="event" c:identifier="gtk_text_tag_event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
-          </parameter>
-          <parameter name="event_object">
-            <type name="GObject.Object" c:type="GObject*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="name">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="background">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="foreground">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="background-gdk">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </property>
-      <property name="foreground-gdk">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </property>
-      <property name="background-stipple">
-        <type name="Gdk.Pixmap" c:type="GdkPixmap"/>
-      </property>
-      <property name="foreground-stipple">
-        <type name="Gdk.Pixmap" c:type="GdkPixmap"/>
-      </property>
-      <property name="font">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="font-desc">
-        <type name="PangoFontDescription" c:type="PangoFontDescription"/>
-      </property>
-      <property name="family">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="style">
-        <type name="PangoStyle" c:type="PangoStyle"/>
-      </property>
-      <property name="variant">
-        <type name="PangoVariant" c:type="PangoVariant"/>
-      </property>
-      <property name="weight">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="stretch">
-        <type name="PangoStretch" c:type="PangoStretch"/>
-      </property>
-      <property name="size">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="size-points">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <property name="scale">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <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="direction">
-        <type name="TextDirection" c:type="GtkTextDirection"/>
-      </property>
-      <property name="left-margin">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="indent">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="strikethrough">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="right-margin">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="underline">
-        <type name="PangoUnderline" c:type="PangoUnderline"/>
-      </property>
-      <property name="rise">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="background-full-height">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="language">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="tabs">
-        <type name="PangoTabArray" c:type="PangoTabArray"/>
-      </property>
-      <property name="invisible">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="paragraph-background">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="paragraph-background-gdk">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </property>
-      <property name="accumulative-margin">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="background-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="foreground-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="background-stipple-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="foreground-stipple-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="family-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="style-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="variant-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="weight-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="stretch-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="size-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="scale-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="pixels-above-lines-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="pixels-below-lines-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="pixels-inside-wrap-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="editable-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="wrap-mode-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="justification-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="left-margin-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="indent-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="strikethrough-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="right-margin-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="underline-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="rise-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="background-full-height-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="language-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="tabs-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="invisible-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="paragraph-background-set">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
-          </parameter>
-          <parameter name="event_object">
-            <type name="GObject.Object" c:type="GObject*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </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="event">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="GObject.Object" c:type="GObject"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="TextIter" c:type="GtkTextIter"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </class>
-    <record name="GtkTextAppearance" c:type="GtkTextAppearance">
-      <field name="bg_color">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </field>
-      <field name="fg_color">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </field>
-      <field name="bg_stipple">
-        <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-      </field>
-      <field name="fg_stipple">
-        <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-      </field>
-      <field name="rise">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="padding1">
-        <type name="any" c:type="gpointer"/>
-      </field>
-      <field name="underline">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="strikethrough">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="draw_bg">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="inside_selection">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="is_text">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="pad1">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="pad2">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="pad3">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="pad4">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <function name="text_attributes_new"
-              c:identifier="gtk_text_attributes_new">
+    <function name="marshal_INT__POINTER"
+              c:identifier="gtk_marshal_INT__POINTER">
       <return-value>
-        <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+        <type name="none" c:type="void"/>
       </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="text_attributes_copy"
-              c:identifier="gtk_text_attributes_copy">
+    <function name="marshal_INT__POINTER_CHAR_CHAR"
+              c:identifier="gtk_marshal_INT__POINTER_CHAR_CHAR">
       <return-value>
-        <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="src">
-          <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_attributes_copy_values"
-              c:identifier="gtk_text_attributes_copy_values">
+    <function name="marshal_VOID__ENUM_FLOAT"
+              c:identifier="gtk_marshal_VOID__ENUM_FLOAT">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="src">
-          <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
         </parameter>
-        <parameter name="dest">
-          <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_attributes_unref"
-              c:identifier="gtk_text_attributes_unref">
+    <function name="marshal_VOID__ENUM_FLOAT_BOOLEAN"
+              c:identifier="gtk_marshal_VOID__ENUM_FLOAT_BOOLEAN">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="values">
-          <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_attributes_ref"
-              c:identifier="gtk_text_attributes_ref">
+    <function name="marshal_VOID__INT_INT"
+              c:identifier="gtk_marshal_VOID__INT_INT">
       <return-value>
-        <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="values">
-          <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <glib:boxed c:type="TextAttributes"
-                glib:name="TextAttributes"
-                glib:type-name="GtkTextAttributes"
-                glib:get-type="gtk_text_attributes_get_type">
-    </glib:boxed>
-    <class name="TextChildAnchor"
-           c:type="GtkTextChildAnchor"
-           parent="GObject.Object"
-           glib:type-name="GtkTextChildAnchor"
-           glib:get-type="gtk_text_child_anchor_get_type">
-      <constructor name="new" c:identifier="gtk_text_child_anchor_new">
-        <return-value>
-          <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
-        </return-value>
-      </constructor>
-      <method name="get_widgets"
-              c:identifier="gtk_text_child_anchor_get_widgets">
-        <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="anchor">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_deleted"
-              c:identifier="gtk_text_child_anchor_get_deleted">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="anchor">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
-          </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="text_iter_get_buffer"
-              c:identifier="gtk_text_iter_get_buffer">
+    <function name="marshal_VOID__INT_INT_POINTER"
+              c:identifier="gtk_marshal_VOID__INT_INT_POINTER">
       <return-value>
-        <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="iter">
-          <type name="TextIter" c:type="GtkTextIter*"/>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_iter_copy" c:identifier="gtk_text_iter_copy">
+    <function name="marshal_VOID__POINTER_INT"
+              c:identifier="gtk_marshal_VOID__POINTER_INT">
       <return-value>
-        <type name="TextIter" c:type="GtkTextIter*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="iter">
-          <type name="TextIter" c:type="GtkTextIter*"/>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_iter_free" c:identifier="gtk_text_iter_free">
+    <function name="marshal_VOID__POINTER_POINTER"
+              c:identifier="gtk_marshal_VOID__POINTER_POINTER">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="iter">
-          <type name="TextIter" c:type="GtkTextIter*"/>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <glib:boxed c:type="TextIter"
-                glib:name="TextIter"
-                glib:type-name="GtkTextIter"
-                glib:get-type="gtk_text_iter_get_type">
-      <method name="get_offset" c:identifier="gtk_text_iter_get_offset">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_line" c:identifier="gtk_text_iter_get_line">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_line_offset"
-              c:identifier="gtk_text_iter_get_line_offset">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_line_index"
-              c:identifier="gtk_text_iter_get_line_index">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_visible_line_offset"
-              c:identifier="gtk_text_iter_get_visible_line_offset">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_visible_line_index"
-              c:identifier="gtk_text_iter_get_visible_line_index">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_char" c:identifier="gtk_text_iter_get_char">
-        <return-value>
-          <type name="GLib.gunichar" c:type="gunichar"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_slice" c:identifier="gtk_text_iter_get_slice">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <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_text" c:identifier="gtk_text_iter_get_text">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <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_visible_slice"
-              c:identifier="gtk_text_iter_get_visible_slice">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <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_visible_text"
-              c:identifier="gtk_text_iter_get_visible_text">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <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_pixbuf" c:identifier="gtk_text_iter_get_pixbuf">
-        <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_marks" c:identifier="gtk_text_iter_get_marks">
-        <return-value>
-          <type name="GLib.GSList" c:type="GSList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_child_anchor"
-              c:identifier="gtk_text_iter_get_child_anchor">
-        <return-value>
-          <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_toggled_tags"
-              c:identifier="gtk_text_iter_get_toggled_tags">
-        <return-value>
-          <type name="GLib.GSList" c:type="GSList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="toggled_on">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="begins_tag" c:identifier="gtk_text_iter_begins_tag">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="tag" allow-none="1">
-            <type name="TextTag" c:type="GtkTextTag*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="ends_tag" c:identifier="gtk_text_iter_ends_tag">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="tag" allow-none="1">
-            <type name="TextTag" c:type="GtkTextTag*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="toggles_tag" c:identifier="gtk_text_iter_toggles_tag">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="tag" allow-none="1">
-            <type name="TextTag" c:type="GtkTextTag*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="has_tag" c:identifier="gtk_text_iter_has_tag">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_tags" c:identifier="gtk_text_iter_get_tags">
-        <return-value>
-          <type name="GLib.GSList" c:type="GSList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="editable" c:identifier="gtk_text_iter_editable">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="default_setting">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="can_insert" c:identifier="gtk_text_iter_can_insert">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="default_editability">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="starts_word" c:identifier="gtk_text_iter_starts_word">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="ends_word" c:identifier="gtk_text_iter_ends_word">
+    <function name="marshal_VOID__POINTER_POINTER_POINTER"
+              c:identifier="gtk_marshal_VOID__POINTER_POINTER_POINTER">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__POINTER_STRING_STRING"
+              c:identifier="gtk_marshal_VOID__POINTER_STRING_STRING">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__POINTER_UINT"
+              c:identifier="gtk_marshal_VOID__POINTER_UINT">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__POINTER_UINT_ENUM"
+              c:identifier="gtk_marshal_VOID__POINTER_UINT_ENUM">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__POINTER_POINTER_UINT_UINT"
+              c:identifier="gtk_marshal_VOID__POINTER_POINTER_UINT_UINT">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT"
+              c:identifier="gtk_marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__POINTER_UINT_UINT"
+              c:identifier="gtk_marshal_VOID__POINTER_UINT_UINT">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__STRING_INT_POINTER"
+              c:identifier="gtk_marshal_VOID__STRING_INT_POINTER">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER"
+              c:identifier="gtk_marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__UINT_POINTER_UINT_UINT_ENUM"
+              c:identifier="gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="marshal_VOID__UINT_STRING"
+              c:identifier="gtk_marshal_VOID__UINT_STRING">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="closure">
+          <type name="GObject.Closure" c:type="GClosure*"/>
+        </parameter>
+        <parameter name="return_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="n_param_values">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="param_values">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="invocation_hint">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="marshal_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_newv" c:identifier="gtk_signal_newv">
+      <return-value>
+        <type name="uint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="signal_flags">
+          <type name="SignalRunType" c:type="GtkSignalRunType"/>
+        </parameter>
+        <parameter name="object_type">
+          <type name="GObject.Type" c:type="GtkType"/>
+        </parameter>
+        <parameter name="function_offset">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="marshaller">
+          <type name="SignalMarshaller" c:type="GtkSignalMarshaller"/>
+        </parameter>
+        <parameter name="return_val">
+          <type name="GObject.Type" c:type="GtkType"/>
+        </parameter>
+        <parameter name="n_args">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="args">
+          <type name="GObject.Type" c:type="GtkType*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_new" c:identifier="gtk_signal_new">
+      <return-value>
+        <type name="uint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="signal_flags">
+          <type name="SignalRunType" c:type="GtkSignalRunType"/>
+        </parameter>
+        <parameter name="object_type">
+          <type name="GObject.Type" c:type="GtkType"/>
+        </parameter>
+        <parameter name="function_offset">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="marshaller">
+          <type name="SignalMarshaller" c:type="GtkSignalMarshaller"/>
+        </parameter>
+        <parameter name="return_val">
+          <type name="GObject.Type" c:type="GtkType"/>
+        </parameter>
+        <parameter name="n_args">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_emit_stop_by_name"
+              c:identifier="gtk_signal_emit_stop_by_name">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="Object" c:type="GtkObject*"/>
+        </parameter>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_connect_object_while_alive"
+              c:identifier="gtk_signal_connect_object_while_alive">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="Object" c:type="GtkObject*"/>
+        </parameter>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="func">
+          <type name="SignalFunc" c:type="GtkSignalFunc"/>
+        </parameter>
+        <parameter name="alive_object">
+          <type name="Object" c:type="GtkObject*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_connect_while_alive"
+              c:identifier="gtk_signal_connect_while_alive">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="Object" c:type="GtkObject*"/>
+        </parameter>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="func">
+          <type name="SignalFunc" c:type="GtkSignalFunc"/>
+        </parameter>
+        <parameter name="func_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="alive_object">
+          <type name="Object" c:type="GtkObject*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_connect_full"
+              c:identifier="gtk_signal_connect_full">
+      <return-value>
+        <type name="ulong" c:type="gulong"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="Object" c:type="GtkObject*"/>
+        </parameter>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="func">
+          <type name="SignalFunc" c:type="GtkSignalFunc"/>
+        </parameter>
+        <parameter name="unsupported">
+          <type name="CallbackMarshal" c:type="GtkCallbackMarshal"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy_func">
+          <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+        </parameter>
+        <parameter name="object_signal">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="after">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_emitv" c:identifier="gtk_signal_emitv">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="Object" c:type="GtkObject*"/>
+        </parameter>
+        <parameter name="signal_id">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="args">
+          <type name="Arg" c:type="GtkArg*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_emit" c:identifier="gtk_signal_emit">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="Object" c:type="GtkObject*"/>
+        </parameter>
+        <parameter name="signal_id">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_emit_by_name"
+              c:identifier="gtk_signal_emit_by_name">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="Object" c:type="GtkObject*"/>
+        </parameter>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_emitv_by_name"
+              c:identifier="gtk_signal_emitv_by_name">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="Object" c:type="GtkObject*"/>
+        </parameter>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="args">
+          <type name="Arg" c:type="GtkArg*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="signal_compat_matched"
+              c:identifier="gtk_signal_compat_matched">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="Object" c:type="GtkObject*"/>
+        </parameter>
+        <parameter name="func">
+          <type name="SignalFunc" c:type="GtkSignalFunc"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="match">
+          <type name="GObject.SignalMatchType" c:type="GSignalMatchType"/>
+        </parameter>
+        <parameter name="action">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="Calendar"
+           c:type="GtkCalendar"
+           parent="Widget"
+           glib:type-name="GtkCalendar"
+           glib:get-type="gtk_calendar_get_type">
+      <method name="select_month" c:identifier="gtk_calendar_select_month">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
+          </parameter>
+          <parameter name="month">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="year">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="inside_word" c:identifier="gtk_text_iter_inside_word">
+      <method name="select_day" c:identifier="gtk_calendar_select_day">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
+          </parameter>
+          <parameter name="day">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="starts_sentence"
-              c:identifier="gtk_text_iter_starts_sentence">
+      <method name="mark_day" c:identifier="gtk_calendar_mark_day">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
+          </parameter>
+          <parameter name="day">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="ends_sentence" c:identifier="gtk_text_iter_ends_sentence">
+      <method name="unmark_day" c:identifier="gtk_calendar_unmark_day">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
+          </parameter>
+          <parameter name="day">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="inside_sentence"
-              c:identifier="gtk_text_iter_inside_sentence">
+      <method name="clear_marks" c:identifier="gtk_calendar_clear_marks">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="starts_line" c:identifier="gtk_text_iter_starts_line">
+      <method name="set_display_options"
+              c:identifier="gtk_calendar_set_display_options">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="CalendarDisplayOptions"
+                  c:type="GtkCalendarDisplayOptions"/>
           </parameter>
         </parameters>
       </method>
-      <method name="ends_line" c:identifier="gtk_text_iter_ends_line">
+      <method name="get_display_options"
+              c:identifier="gtk_calendar_get_display_options">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="CalendarDisplayOptions"
+                c:type="GtkCalendarDisplayOptions"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="is_cursor_position"
-              c:identifier="gtk_text_iter_is_cursor_position">
+      <method name="display_options"
+              c:identifier="gtk_calendar_display_options">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="CalendarDisplayOptions"
+                  c:type="GtkCalendarDisplayOptions"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_chars_in_line"
-              c:identifier="gtk_text_iter_get_chars_in_line">
+      <method name="get_date" c:identifier="gtk_calendar_get_date">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
+          </parameter>
+          <parameter name="year">
+            <type name="uint" c:type="guint*"/>
+          </parameter>
+          <parameter name="month">
+            <type name="uint" c:type="guint*"/>
+          </parameter>
+          <parameter name="day">
+            <type name="uint" c:type="guint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_bytes_in_line"
-              c:identifier="gtk_text_iter_get_bytes_in_line">
+      <method name="freeze" c:identifier="gtk_calendar_freeze">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_attributes"
-              c:identifier="gtk_text_iter_get_attributes">
+      <method name="thaw" c:identifier="gtk_calendar_thaw">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="values">
-            <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_language" c:identifier="gtk_text_iter_get_language">
+      <property name="year">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="month">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="day">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="show-heading">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="show-day-names">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="no-month-change">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="show-week-numbers">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="month_changed" c:type="month_changed">
         <return-value>
-          <type name="PangoLanguage" c:type="PangoLanguage*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="is_end" c:identifier="gtk_text_iter_is_end">
+      </callback>
+      <callback name="day_selected" c:type="day_selected">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="is_start" c:identifier="gtk_text_iter_is_start">
+      </callback>
+      <callback name="day_selected_double_click"
+                c:type="day_selected_double_click">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="forward_char" c:identifier="gtk_text_iter_forward_char">
+      </callback>
+      <callback name="prev_month" c:type="prev_month">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="backward_char" c:identifier="gtk_text_iter_backward_char">
+      </callback>
+      <callback name="next_month" c:type="next_month">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="forward_chars" c:identifier="gtk_text_iter_forward_chars">
+      </callback>
+      <callback name="prev_year" c:type="prev_year">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="backward_chars"
-              c:identifier="gtk_text_iter_backward_chars">
+      </callback>
+      <callback name="next_year" c:type="next_year">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="forward_line" c:identifier="gtk_text_iter_forward_line">
+      </callback>
+      <glib:signal name="month-changed">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="backward_line" c:identifier="gtk_text_iter_backward_line">
+      </glib:signal>
+      <glib:signal name="day-selected">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="forward_lines" c:identifier="gtk_text_iter_forward_lines">
+      </glib:signal>
+      <glib:signal name="day-selected-double-click">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="backward_lines"
-              c:identifier="gtk_text_iter_backward_lines">
+      </glib:signal>
+      <glib:signal name="prev-month">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="forward_word_end"
-              c:identifier="gtk_text_iter_forward_word_end">
+      </glib:signal>
+      <glib:signal name="next-month">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="backward_word_start"
-              c:identifier="gtk_text_iter_backward_word_start">
+      </glib:signal>
+      <glib:signal name="prev-year">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="next-year">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <record name="CalendarPrivate" c:type="GtkCalendarPrivate"/>
+    <function name="calendar_new" c:identifier="gtk_calendar_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <interface name="CellEditable"
+               c:type="GtkCellEditable"
+               glib:type-name="GtkCellEditable"
+               glib:get-type="gtk_cell_editable_get_type">
+      <callback name="editing_done" c:type="editing_done">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell_editable">
+            <type name="CellEditable" c:type="GtkCellEditable*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="forward_word_ends"
-              c:identifier="gtk_text_iter_forward_word_ends">
+      </callback>
+      <callback name="remove_widget" c:type="remove_widget">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
+          <parameter name="cell_editable">
+            <type name="CellEditable" c:type="GtkCellEditable*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="backward_word_starts"
-              c:identifier="gtk_text_iter_backward_word_starts">
+      </callback>
+      <callback name="start_editing" c:type="start_editing">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell_editable">
+            <type name="CellEditable" c:type="GtkCellEditable*"/>
           </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
+          <parameter name="event">
+            <type name="Gdk.Event" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="forward_visible_line"
-              c:identifier="gtk_text_iter_forward_visible_line">
+      </callback>
+      <glib:signal name="editing-done">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="backward_visible_line"
-              c:identifier="gtk_text_iter_backward_visible_line">
+      </glib:signal>
+      <glib:signal name="remove-widget">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="forward_visible_lines"
-              c:identifier="gtk_text_iter_forward_visible_lines">
+      </glib:signal>
+    </interface>
+    <function name="cell_editable_start_editing"
+              c:identifier="gtk_cell_editable_start_editing">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="cell_editable">
+          <type name="CellEditable" c:type="GtkCellEditable*"/>
+        </parameter>
+        <parameter name="event">
+          <type name="Gdk.Event" c:type="GdkEvent*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="cell_editable_editing_done"
+              c:identifier="gtk_cell_editable_editing_done">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="cell_editable">
+          <type name="CellEditable" c:type="GtkCellEditable*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="cell_editable_remove_widget"
+              c:identifier="gtk_cell_editable_remove_widget">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="cell_editable">
+          <type name="CellEditable" c:type="GtkCellEditable*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="CellRenderer"
+           c:type="GtkCellRenderer"
+           parent="Object"
+           glib:type-name="GtkCellRenderer"
+           glib:get-type="gtk_cell_renderer_get_type">
+      <constructor name="text_new" c:identifier="gtk_cell_renderer_text_new">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
         </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="backward_visible_lines"
-              c:identifier="gtk_text_iter_backward_visible_lines">
+      </constructor>
+      <constructor name="accel_new" c:identifier="gtk_cell_renderer_accel_new">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </return-value>
+      </constructor>
+      <constructor name="combo_new" c:identifier="gtk_cell_renderer_combo_new">
+        <return-value>
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </return-value>
+      </constructor>
+      <constructor name="pixbuf_new"
+                   c:identifier="gtk_cell_renderer_pixbuf_new">
+        <return-value>
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </return-value>
+      </constructor>
+      <constructor name="progress_new"
+                   c:identifier="gtk_cell_renderer_progress_new">
+        <return-value>
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </return-value>
+      </constructor>
+      <constructor name="spin_new" c:identifier="gtk_cell_renderer_spin_new">
+        <return-value>
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </return-value>
+      </constructor>
+      <constructor name="toggle_new"
+                   c:identifier="gtk_cell_renderer_toggle_new">
+        <return-value>
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </return-value>
+      </constructor>
+      <method name="get_size" c:identifier="gtk_cell_renderer_get_size">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="cell_area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="x_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="y_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="width">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="height">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="forward_visible_word_end"
-              c:identifier="gtk_text_iter_forward_visible_word_end">
+      <method name="render" c:identifier="gtk_cell_renderer_render">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
+          <parameter name="window">
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="background_area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="cell_area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="expose_area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="CellRendererState" c:type="GtkCellRendererState"/>
           </parameter>
         </parameters>
       </method>
-      <method name="backward_visible_word_start"
-              c:identifier="gtk_text_iter_backward_visible_word_start">
+      <method name="activate" c:identifier="gtk_cell_renderer_activate">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.Event" c:type="GdkEvent*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="background_area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="cell_area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="CellRendererState" c:type="GtkCellRendererState"/>
           </parameter>
         </parameters>
       </method>
-      <method name="forward_visible_word_ends"
-              c:identifier="gtk_text_iter_forward_visible_word_ends">
+      <method name="start_editing"
+              c:identifier="gtk_cell_renderer_start_editing">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="CellEditable" c:type="GtkCellEditable*"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
+          <parameter name="event">
+            <type name="Gdk.Event" c:type="GdkEvent*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="background_area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="cell_area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="CellRendererState" c:type="GtkCellRendererState"/>
           </parameter>
         </parameters>
       </method>
-      <method name="backward_visible_word_starts"
-              c:identifier="gtk_text_iter_backward_visible_word_starts">
+      <method name="set_fixed_size"
+              c:identifier="gtk_cell_renderer_set_fixed_size">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
+          <parameter name="width">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="height">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="forward_sentence_end"
-              c:identifier="gtk_text_iter_forward_sentence_end">
+      <method name="get_fixed_size"
+              c:identifier="gtk_cell_renderer_get_fixed_size">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
+          <parameter name="width">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="height">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="backward_sentence_start"
-              c:identifier="gtk_text_iter_backward_sentence_start">
+      <method name="editing_canceled"
+              c:identifier="gtk_cell_renderer_editing_canceled">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="forward_sentence_ends"
-              c:identifier="gtk_text_iter_forward_sentence_ends">
+      <method name="stop_editing"
+              c:identifier="gtk_cell_renderer_stop_editing">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
+          <parameter name="canceled">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="backward_sentence_starts"
-              c:identifier="gtk_text_iter_backward_sentence_starts">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="forward_cursor_position"
-              c:identifier="gtk_text_iter_forward_cursor_position">
+      <property name="mode">
+        <type name="CellRendererMode" c:type="GtkCellRendererMode"/>
+      </property>
+      <property name="visible">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="sensitive">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="xalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="yalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="xpad">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="ypad">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="width">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="height">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="is-expander">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="is-expanded">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="cell-background">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="cell-background-gdk">
+        <type name="Gdk.Color" c:type="GdkColor"/>
+      </property>
+      <property name="cell-background-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="get_size" c:type="get_size">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="cell_area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="x_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="y_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="width">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="height">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="backward_cursor_position"
-              c:identifier="gtk_text_iter_backward_cursor_position">
+      </callback>
+      <callback name="render" c:type="render">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
+          <parameter name="window">
+            <type name="Gdk.Drawable" c:type="GdkDrawable*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="background_area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="cell_area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="expose_area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="CellRendererState" c:type="GtkCellRendererState"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="forward_cursor_positions"
-              c:identifier="gtk_text_iter_forward_cursor_positions">
+      </callback>
+      <callback name="activate" c:type="activate">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
+          <parameter name="event">
+            <type name="Gdk.Event" c:type="GdkEvent*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="background_area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="cell_area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="CellRendererState" c:type="GtkCellRendererState"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="backward_cursor_positions"
-              c:identifier="gtk_text_iter_backward_cursor_positions">
+      </callback>
+      <callback name="start_editing" c:type="start_editing">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="CellEditable" c:type="GtkCellEditable*"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
+          <parameter name="event">
+            <type name="Gdk.Event" c:type="GdkEvent*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="background_area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="cell_area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="CellRendererState" c:type="GtkCellRendererState"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="forward_visible_cursor_position"
-              c:identifier="gtk_text_iter_forward_visible_cursor_position">
+      </callback>
+      <callback name="editing_canceled" c:type="editing_canceled">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="backward_visible_cursor_position"
-              c:identifier="gtk_text_iter_backward_visible_cursor_position">
+      </callback>
+      <callback name="editing_started" c:type="editing_started">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
+          <parameter name="editable">
+            <type name="CellEditable" c:type="GtkCellEditable*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="forward_visible_cursor_positions"
-              c:identifier="gtk_text_iter_forward_visible_cursor_positions">
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="editing-canceled">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="editing-started">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="object">
+            <type name="CellEditable" c:type="GtkCellEditable"/>
           </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
+          <parameter name="p0">
+            <type name="string" c:type="gchararray"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="backward_visible_cursor_positions"
-              c:identifier="gtk_text_iter_backward_visible_cursor_positions">
+      </glib:signal>
+    </class>
+    <glib:boxed c:type="GtkTreeIter"
+                glib:name="TreeIter"
+                glib:type-name="GtkTreeIter"
+                glib:get-type="gtk_tree_iter_get_type">
+    </glib:boxed>
+    <glib:boxed c:type="GtkTreePath"
+                glib:name="TreePath"
+                glib:type-name="GtkTreePath"
+                glib:get-type="gtk_tree_path_get_type">
+      <method name="compare" c:identifier="gtk_tree_path_compare">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="a">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
+          <parameter name="b">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_offset" c:identifier="gtk_text_iter_set_offset">
+      <method name="next" c:identifier="gtk_tree_path_next">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="char_offset">
-            <type name="int32" c:type="gint"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_line" c:identifier="gtk_text_iter_set_line">
+      <method name="prev" c:identifier="gtk_tree_path_prev">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="line_number">
-            <type name="int32" c:type="gint"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_line_offset"
-              c:identifier="gtk_text_iter_set_line_offset">
+      <method name="up" c:identifier="gtk_tree_path_up">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="char_on_line">
-            <type name="int32" c:type="gint"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_line_index"
-              c:identifier="gtk_text_iter_set_line_index">
+      <method name="down" c:identifier="gtk_tree_path_down">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="byte_on_line">
-            <type name="int32" c:type="gint"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="forward_to_end"
-              c:identifier="gtk_text_iter_forward_to_end">
+      <method name="is_ancestor" c:identifier="gtk_tree_path_is_ancestor">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="descendant">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="forward_to_line_end"
-              c:identifier="gtk_text_iter_forward_to_line_end">
+      <method name="is_descendant" c:identifier="gtk_tree_path_is_descendant">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="ancestor">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_visible_line_offset"
-              c:identifier="gtk_text_iter_set_visible_line_offset">
+    </glib:boxed>
+    <glib:boxed c:type="GtkTreeRowReference"
+                glib:name="TreeRowReference"
+                glib:type-name="GtkTreeRowReference"
+                glib:get-type="gtk_tree_row_reference_get_type">
+      <constructor name="new" c:identifier="gtk_tree_row_reference_new">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="model">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="char_on_line">
-            <type name="int32" c:type="gint"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_visible_line_index"
-              c:identifier="gtk_text_iter_set_visible_line_index">
+      </constructor>
+      <constructor name="new_proxy"
+                   c:identifier="gtk_tree_row_reference_new_proxy">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="proxy">
+            <type name="GObject.Object" c:type="GObject*"/>
           </parameter>
-          <parameter name="byte_on_line">
-            <type name="int32" c:type="gint"/>
+          <parameter name="model">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="forward_to_tag_toggle"
-              c:identifier="gtk_text_iter_forward_to_tag_toggle">
+      </constructor>
+      <constructor name="copy" c:identifier="gtk_tree_row_reference_copy">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="reference">
+            <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
           </parameter>
-          <parameter name="tag" allow-none="1">
-            <type name="TextTag" c:type="GtkTextTag*"/>
+        </parameters>
+      </constructor>
+      <method name="get_path" c:identifier="gtk_tree_row_reference_get_path">
+        <return-value>
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </return-value>
+        <parameters>
+          <parameter name="reference">
+            <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="backward_to_tag_toggle"
-              c:identifier="gtk_text_iter_backward_to_tag_toggle">
+      <method name="get_model" c:identifier="gtk_tree_row_reference_get_model">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="tag" allow-none="1">
-            <type name="TextTag" c:type="GtkTextTag*"/>
+          <parameter name="reference">
+            <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="forward_find_char"
-              c:identifier="gtk_text_iter_forward_find_char">
+      <method name="valid" c:identifier="gtk_tree_row_reference_valid">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="pred">
-            <type name="GtkTextCharPredicate" c:type="GtkTextCharPredicate"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-          <parameter name="limit">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="reference">
+            <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="backward_find_char"
-              c:identifier="gtk_text_iter_backward_find_char">
+      <method name="free" c:identifier="gtk_tree_row_reference_free">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="reference">
+            <type name="TreeRowReference" c:type="GtkTreeRowReference*"/>
           </parameter>
-          <parameter name="pred">
-            <type name="GtkTextCharPredicate" c:type="GtkTextCharPredicate"/>
+        </parameters>
+      </method>
+    </glib:boxed>
+    <interface name="TreeModel"
+               c:type="GtkTreeModel"
+               glib:type-name="GtkTreeModel"
+               glib:get-type="gtk_tree_model_get_type">
+      <callback name="row_changed" c:type="row_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_model">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
-          <parameter name="limit">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="forward_search"
-              c:identifier="gtk_text_iter_forward_search">
+      </callback>
+      <callback name="row_inserted" c:type="row_inserted">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="tree_model">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="str">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
-          <parameter name="flags">
-            <type name="TextSearchFlags" c:type="GtkTextSearchFlags"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="match_start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+        </parameters>
+      </callback>
+      <callback name="row_has_child_toggled" c:type="row_has_child_toggled">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_model">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="match_end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
-          <parameter name="limit" allow-none="1">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="backward_search"
-              c:identifier="gtk_text_iter_backward_search">
+      </callback>
+      <callback name="row_deleted" c:type="row_deleted">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="tree_model">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="str">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
-          <parameter name="flags">
-            <type name="TextSearchFlags" c:type="GtkTextSearchFlags"/>
+        </parameters>
+      </callback>
+      <callback name="rows_reordered" c:type="rows_reordered">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_model">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="match_start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
-          <parameter name="match_end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="limit" allow-none="1">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="new_order">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="equal" c:identifier="gtk_text_iter_equal">
+      </callback>
+      <callback name="get_flags" c:type="get_flags">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="TreeModelFlags" c:type="GtkTreeModelFlags"/>
         </return-value>
         <parameters>
-          <parameter name="lhs">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="tree_model">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="rhs">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+        </parameters>
+      </callback>
+      <callback name="get_n_columns" c:type="get_n_columns">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_model">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="compare" c:identifier="gtk_text_iter_compare">
+      </callback>
+      <callback name="get_column_type" c:type="get_column_type">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="GObject.Type" c:type="GType"/>
         </return-value>
         <parameters>
-          <parameter name="lhs">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="tree_model">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="rhs">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="index_">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="in_range" c:identifier="gtk_text_iter_in_range">
+      </callback>
+      <callback name="get_iter" c:type="get_iter">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="tree_model">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </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="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="order" c:identifier="gtk_text_iter_order">
+      </callback>
+      <callback name="get_path" c:type="get_path">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </return-value>
         <parameters>
-          <parameter name="first">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="tree_model">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="second">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
-      </method>
-    </glib:boxed>
-    <callback name="GtkTextCharPredicate">
+      </callback>
+      <callback name="get_value" c:type="get_value">
+        <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="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="value">
+            <type name="GObject.Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="iter_next" c:type="iter_next">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_model">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="iter_children" c:type="iter_children">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </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="parent">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="iter_has_child" c:type="iter_has_child">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_model">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="iter_n_children" c:type="iter_n_children">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_model">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="iter_nth_child" c:type="iter_nth_child">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </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="parent">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="n">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="iter_parent" c:type="iter_parent">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </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="child">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="ref_node" c:type="ref_node">
+        <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>
+        </parameters>
+      </callback>
+      <callback name="unref_node" c:type="unref_node">
+        <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>
+        </parameters>
+      </callback>
+      <glib:signal name="row-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="TreePath" c:type="GtkTreePath"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="TreeIter" c:type="GtkTreeIter"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="row-inserted">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="TreePath" c:type="GtkTreePath"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="TreeIter" c:type="GtkTreeIter"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="row-has-child-toggled">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="TreePath" c:type="GtkTreePath"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="TreeIter" c:type="GtkTreeIter"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="row-deleted">
+        <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="rows-reordered">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="TreePath" c:type="GtkTreePath"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="TreeIter" c:type="GtkTreeIter"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </interface>
+    <callback name="TreeModelForeachFunc" c:type="GtkTreeModelForeachFunc">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="ch">
-          <type name="GLib.gunichar" c:type="gunichar"/>
+        <parameter name="model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="user_data">
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
-    <record name="GtkTargetEntry" c:type="GtkTargetEntry">
-      <field name="target">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="flags">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="info">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GtkTargetPair" c:type="GtkTargetPair">
-      <field name="target">
-        <type name="GdkAtom" c:type="GdkAtom"/>
-      </field>
-      <field name="flags">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="info">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <function name="target_list_new" c:identifier="gtk_target_list_new">
+    <function name="tree_path_new" c:identifier="gtk_tree_path_new">
       <return-value>
-        <type name="TargetList" c:type="GtkTargetList*"/>
+        <type name="TreePath" c:type="GtkTreePath*"/>
+      </return-value>
+    </function>
+    <function name="tree_path_new_from_string"
+              c:identifier="gtk_tree_path_new_from_string">
+      <return-value>
+        <type name="TreePath" c:type="GtkTreePath*"/>
       </return-value>
       <parameters>
-        <parameter name="targets">
-          <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
-        </parameter>
-        <parameter name="ntargets">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="path">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="target_list_ref" c:identifier="gtk_target_list_ref">
+    <function name="tree_path_new_from_indices"
+              c:identifier="gtk_tree_path_new_from_indices">
       <return-value>
-        <type name="TargetList" c:type="GtkTargetList*"/>
+        <type name="TreePath" c:type="GtkTreePath*"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="TargetList" c:type="GtkTargetList*"/>
+        <parameter name="first_index">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="target_list_unref" c:identifier="gtk_target_list_unref">
+    <function name="tree_path_to_string"
+              c:identifier="gtk_tree_path_to_string">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="TargetList" c:type="GtkTargetList*"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="target_list_add" c:identifier="gtk_target_list_add">
+    <function name="tree_path_new_first"
+              c:identifier="gtk_tree_path_new_first">
+      <return-value>
+        <type name="TreePath" c:type="GtkTreePath*"/>
+      </return-value>
+    </function>
+    <function name="tree_path_append_index"
+              c:identifier="gtk_tree_path_append_index">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="TargetList" c:type="GtkTargetList*"/>
-        </parameter>
-        <parameter name="target">
-          <type name="GdkAtom" c:type="GdkAtom"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
-        <parameter name="info">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="index_">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="target_list_add_text_targets"
-              c:identifier="gtk_target_list_add_text_targets">
+    <function name="tree_path_prepend_index"
+              c:identifier="gtk_tree_path_prepend_index">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="TargetList" c:type="GtkTargetList*"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
-        <parameter name="info">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="index_">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="target_list_add_rich_text_targets"
-              c:identifier="gtk_target_list_add_rich_text_targets">
+    <function name="tree_path_get_depth"
+              c:identifier="gtk_tree_path_get_depth">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="TargetList" c:type="GtkTargetList*"/>
-        </parameter>
-        <parameter name="info">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="deserializable">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="buffer">
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="target_list_add_image_targets"
-              c:identifier="gtk_target_list_add_image_targets">
+    <function name="tree_path_get_indices"
+              c:identifier="gtk_tree_path_get_indices">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="int" c:type="gint*"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="TargetList" c:type="GtkTargetList*"/>
-        </parameter>
-        <parameter name="info">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="writable">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="target_list_add_uri_targets"
-              c:identifier="gtk_target_list_add_uri_targets">
+    <function name="tree_path_free" c:identifier="gtk_tree_path_free">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="TargetList" c:type="GtkTargetList*"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
-        <parameter name="info">
-          <type name="uint32" c:type="guint"/>
+      </parameters>
+    </function>
+    <function name="tree_path_copy" c:identifier="gtk_tree_path_copy">
+      <return-value>
+        <type name="TreePath" c:type="GtkTreePath*"/>
+      </return-value>
+      <parameters>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="target_list_add_table"
-              c:identifier="gtk_target_list_add_table">
+    <function name="tree_row_reference_inserted"
+              c:identifier="gtk_tree_row_reference_inserted">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="TargetList" c:type="GtkTargetList*"/>
-        </parameter>
-        <parameter name="targets">
-          <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
+        <parameter name="proxy">
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
-        <parameter name="ntargets">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="target_list_remove" c:identifier="gtk_target_list_remove">
+    <function name="tree_row_reference_deleted"
+              c:identifier="gtk_tree_row_reference_deleted">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="TargetList" c:type="GtkTargetList*"/>
+        <parameter name="proxy">
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
-        <parameter name="target">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="target_list_find" c:identifier="gtk_target_list_find">
+    <function name="tree_row_reference_reordered"
+              c:identifier="gtk_tree_row_reference_reordered">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="TargetList" c:type="GtkTargetList*"/>
+        <parameter name="proxy">
+          <type name="GObject.Object" c:type="GObject*"/>
         </parameter>
-        <parameter name="target">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
-        <parameter name="info">
-          <type name="GLib.guint" c:type="guint*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="new_order">
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="target_table_new_from_list"
-              c:identifier="gtk_target_table_new_from_list">
+    <function name="tree_iter_copy" c:identifier="gtk_tree_iter_copy">
       <return-value>
-        <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
+        <type name="TreeIter" c:type="GtkTreeIter*"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="TargetList" c:type="GtkTargetList*"/>
-        </parameter>
-        <parameter name="n_targets">
-          <type name="GLib.gint" c:type="gint*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="target_table_free" c:identifier="gtk_target_table_free">
+    <function name="tree_iter_free" c:identifier="gtk_tree_iter_free">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="targets">
-          <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
-        </parameter>
-        <parameter name="n_targets">
-          <type name="int32" c:type="gint"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="selection_owner_set"
-              c:identifier="gtk_selection_owner_set">
+    <function name="tree_model_get_flags"
+              c:identifier="gtk_tree_model_get_flags">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="TreeModelFlags" c:type="GtkTreeModelFlags"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="selection">
-          <type name="GdkAtom" c:type="GdkAtom"/>
-        </parameter>
-        <parameter name="time_">
-          <type name="uint32" c:type="guint32"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="selection_owner_set_for_display"
-              c:identifier="gtk_selection_owner_set_for_display">
+    <function name="tree_model_get_n_columns"
+              c:identifier="gtk_tree_model_get_n_columns">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
-        <parameter name="display">
-          <type name="Gdk.Display" c:type="GdkDisplay*"/>
-        </parameter>
-        <parameter name="widget" allow-none="1">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="selection">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+      </parameters>
+    </function>
+    <function name="tree_model_get_column_type"
+              c:identifier="gtk_tree_model_get_column_type">
+      <return-value>
+        <type name="GObject.Type" c:type="GType"/>
+      </return-value>
+      <parameters>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="time_">
-          <type name="uint32" c:type="guint32"/>
+        <parameter name="index_">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="selection_add_target"
-              c:identifier="gtk_selection_add_target">
+    <function name="tree_model_get_iter"
+              c:identifier="gtk_tree_model_get_iter">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="selection">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="target">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
-        <parameter name="info">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="selection_add_targets"
-              c:identifier="gtk_selection_add_targets">
+    <function name="tree_model_get_iter_from_string"
+              c:identifier="gtk_tree_model_get_iter_from_string">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="selection">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="targets">
-          <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
-        <parameter name="ntargets">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="path_string">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="selection_clear_targets"
-              c:identifier="gtk_selection_clear_targets">
+    <function name="tree_model_get_string_from_iter"
+              c:identifier="gtk_tree_model_get_string_from_iter">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="selection">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="selection_convert" c:identifier="gtk_selection_convert">
+    <function name="tree_model_get_iter_first"
+              c:identifier="gtk_tree_model_get_iter_first">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="selection">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
-        <parameter name="target">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+      </parameters>
+    </function>
+    <function name="tree_model_get_path"
+              c:identifier="gtk_tree_model_get_path">
+      <return-value>
+        <type name="TreePath" c:type="GtkTreePath*"/>
+      </return-value>
+      <parameters>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="time_">
-          <type name="uint32" c:type="guint32"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="selection_data_set" c:identifier="gtk_selection_data_set">
+    <function name="tree_model_get_value"
+              c:identifier="gtk_tree_model_get_value">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-        <parameter name="type">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="format">
-          <type name="int32" c:type="gint"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
-        <parameter name="data">
-          <type name="GLib.guchar" c:type="guchar*"/>
+        <parameter name="column">
+          <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="length">
-          <type name="int32" c:type="gint"/>
+        <parameter name="value">
+          <type name="GObject.Value" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="selection_data_set_text"
-              c:identifier="gtk_selection_data_set_text">
+    <function name="tree_model_iter_next"
+              c:identifier="gtk_tree_model_iter_next">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-        <parameter name="str">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="len">
-          <type name="int32" c:type="gint"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="selection_data_get_text"
-              c:identifier="gtk_selection_data_get_text">
-      <return-value>
-        <type name="GLib.guchar" c:type="guchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="selection_data_set_pixbuf"
-              c:identifier="gtk_selection_data_set_pixbuf">
+    <function name="tree_model_iter_children"
+              c:identifier="gtk_tree_model_iter_children">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="pixbuf">
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="selection_data_get_pixbuf"
-              c:identifier="gtk_selection_data_get_pixbuf">
-      <return-value>
-        <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        <parameter name="parent" allow-none="1">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="selection_data_set_uris"
-              c:identifier="gtk_selection_data_set_uris">
+    <function name="tree_model_iter_has_child"
+              c:identifier="gtk_tree_model_iter_has_child">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="uris">
-          <type name="GLib.gchar" c:type="gchar**"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="selection_data_get_uris"
-              c:identifier="gtk_selection_data_get_uris">
+    <function name="tree_model_iter_n_children"
+              c:identifier="gtk_tree_model_iter_n_children">
       <return-value>
-        <type name="GLib.gchar" c:type="gchar**"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="iter" allow-none="1">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="selection_data_get_targets"
-              c:identifier="gtk_selection_data_get_targets">
+    <function name="tree_model_iter_nth_child"
+              c:identifier="gtk_tree_model_iter_nth_child">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="targets">
-          <type name="GdkAtom" c:type="GdkAtom**"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
-        <parameter name="n_atoms">
-          <type name="GLib.gint" c:type="gint*"/>
+        <parameter name="parent" allow-none="1">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="selection_data_targets_include_text"
-              c:identifier="gtk_selection_data_targets_include_text">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        <parameter name="n">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="selection_data_targets_include_rich_text"
-              c:identifier="gtk_selection_data_targets_include_rich_text">
+    <function name="tree_model_iter_parent"
+              c:identifier="gtk_tree_model_iter_parent">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
-        </parameter>
-        <parameter name="buffer">
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="selection_data_targets_include_image"
-              c:identifier="gtk_selection_data_targets_include_image">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
-        <parameter name="writable">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="child">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="selection_data_targets_include_uri"
-              c:identifier="gtk_selection_data_targets_include_uri">
+    <function name="tree_model_ref_node"
+              c:identifier="gtk_tree_model_ref_node">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="targets_include_text"
-              c:identifier="gtk_targets_include_text">
+    <function name="tree_model_unref_node"
+              c:identifier="gtk_tree_model_unref_node">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="targets">
-          <type name="GdkAtom" c:type="GdkAtom*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="n_targets">
-          <type name="int32" c:type="gint"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="targets_include_rich_text"
-              c:identifier="gtk_targets_include_rich_text">
+    <function name="tree_model_get" c:identifier="gtk_tree_model_get">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="targets">
-          <type name="GdkAtom" c:type="GdkAtom*"/>
-        </parameter>
-        <parameter name="n_targets">
-          <type name="int32" c:type="gint"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="buffer">
-          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="targets_include_image"
-              c:identifier="gtk_targets_include_image">
+    <function name="tree_model_foreach" c:identifier="gtk_tree_model_foreach">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="targets">
-          <type name="GdkAtom" c:type="GdkAtom*"/>
+        <parameter name="model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="n_targets">
-          <type name="int32" c:type="gint"/>
+        <parameter name="func">
+          <type name="TreeModelForeachFunc" c:type="GtkTreeModelForeachFunc"/>
         </parameter>
-        <parameter name="writable">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <function name="targets_include_uri"
-              c:identifier="gtk_targets_include_uri">
+    <function name="tree_model_row_changed"
+              c:identifier="gtk_tree_model_row_changed">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="targets">
-          <type name="GdkAtom" c:type="GdkAtom*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="n_targets">
-          <type name="int32" c:type="gint"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="selection_remove_all"
-              c:identifier="gtk_selection_remove_all">
+    <function name="tree_model_row_inserted"
+              c:identifier="gtk_tree_model_row_inserted">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="selection_clear" c:identifier="gtk_selection_clear">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
-        <parameter name="event">
-          <type name="Gdk.GdkEventSelection" c:type="GdkEventSelection*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="selection_request" c:identifier="_gtk_selection_request">
+    <function name="tree_model_row_has_child_toggled"
+              c:identifier="gtk_tree_model_row_has_child_toggled">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="event">
-          <type name="Gdk.GdkEventSelection" c:type="GdkEventSelection*"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="selection_incr_event"
-              c:identifier="_gtk_selection_incr_event">
+    <function name="tree_model_row_deleted"
+              c:identifier="gtk_tree_model_row_deleted">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="event">
-          <type name="Gdk.GdkEventProperty" c:type="GdkEventProperty*"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="selection_notify" c:identifier="_gtk_selection_notify">
+    <function name="tree_model_rows_reordered"
+              c:identifier="gtk_tree_model_rows_reordered">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="event">
-          <type name="Gdk.GdkEventSelection" c:type="GdkEventSelection*"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="selection_property_notify"
-              c:identifier="_gtk_selection_property_notify">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
-        <parameter name="event">
-          <type name="Gdk.GdkEventProperty" c:type="GdkEventProperty*"/>
+        <parameter name="new_order">
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
-    <glib:boxed c:type="SelectionData"
-                glib:name="SelectionData"
-                glib:type-name="GtkSelectionData"
-                glib:get-type="gtk_selection_data_get_type">
-      <constructor name="copy" c:identifier="gtk_selection_data_copy">
+    <interface name="TreeSortable"
+               c:type="GtkTreeSortable"
+               glib:type-name="GtkTreeSortable"
+               glib:get-type="gtk_tree_sortable_get_type">
+      <callback name="sort_column_changed" c:type="sort_column_changed">
         <return-value>
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="sortable">
+            <type name="TreeSortable" c:type="GtkTreeSortable*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_sort_column_id" c:type="get_sort_column_id">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="sortable">
+            <type name="TreeSortable" c:type="GtkTreeSortable*"/>
+          </parameter>
+          <parameter name="sort_column_id">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="order">
+            <type name="SortType" c:type="GtkSortType*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_sort_column_id" c:type="set_sort_column_id">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="sortable">
+            <type name="TreeSortable" c:type="GtkTreeSortable*"/>
+          </parameter>
+          <parameter name="sort_column_id">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="order">
+            <type name="SortType" c:type="GtkSortType"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_sort_func" c:type="set_sort_func">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <parameter name="sortable">
+            <type name="TreeSortable" c:type="GtkTreeSortable*"/>
+          </parameter>
+          <parameter name="sort_column_id">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="func">
+            <type name="TreeIterCompareFunc" c:type="GtkTreeIterCompareFunc"/>
+          </parameter>
           <parameter name="data">
-            <type name="SelectionData" c:type="GtkSelectionData*"/>
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="free" c:identifier="gtk_selection_data_free">
+      </callback>
+      <callback name="set_default_sort_func" c:type="set_default_sort_func">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <parameter name="sortable">
+            <type name="TreeSortable" c:type="GtkTreeSortable*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="TreeIterCompareFunc" c:type="GtkTreeIterCompareFunc"/>
+          </parameter>
           <parameter name="data">
-            <type name="SelectionData" c:type="GtkSelectionData*"/>
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
           </parameter>
         </parameters>
-      </method>
-    </glib:boxed>
-    <glib:boxed c:type="TargetList"
-                glib:name="TargetList"
-                glib:type-name="GtkTargetList"
-                glib:get-type="gtk_target_list_get_type">
-    </glib:boxed>
-    <callback name="GtkClipboardReceivedFunc">
+      </callback>
+      <callback name="has_default_sort_func" c:type="has_default_sort_func">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="sortable">
+            <type name="TreeSortable" c:type="GtkTreeSortable*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <glib:signal name="sort-column-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </interface>
+    <callback name="TreeIterCompareFunc" c:type="GtkTreeIterCompareFunc">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
-        <parameter name="clipboard">
-          <type name="Clipboard" c:type="GtkClipboard*"/>
+        <parameter name="model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        <parameter name="a">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
-        <parameter name="data">
+        <parameter name="b">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
-    <callback name="GtkClipboardTextReceivedFunc">
+    <function name="tree_sortable_sort_column_changed"
+              c:identifier="gtk_tree_sortable_sort_column_changed">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clipboard">
-          <type name="Clipboard" c:type="GtkClipboard*"/>
-        </parameter>
-        <parameter name="text">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="sortable">
+          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
         </parameter>
       </parameters>
-    </callback>
-    <callback name="GtkClipboardRichTextReceivedFunc">
+    </function>
+    <function name="tree_sortable_get_sort_column_id"
+              c:identifier="gtk_tree_sortable_get_sort_column_id">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="clipboard">
-          <type name="Clipboard" c:type="GtkClipboard*"/>
-        </parameter>
-        <parameter name="format">
-          <type name="GdkAtom" c:type="GdkAtom"/>
-        </parameter>
-        <parameter name="text">
-          <type name="guint8" c:type="guint8*"/>
+        <parameter name="sortable">
+          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
         </parameter>
-        <parameter name="length">
-          <type name="size" c:type="gsize"/>
+        <parameter name="sort_column_id">
+          <type name="int" c:type="gint*"/>
         </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="order">
+          <type name="SortType" c:type="GtkSortType*"/>
         </parameter>
       </parameters>
-    </callback>
-    <callback name="GtkClipboardImageReceivedFunc">
+    </function>
+    <function name="tree_sortable_set_sort_column_id"
+              c:identifier="gtk_tree_sortable_set_sort_column_id">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clipboard">
-          <type name="Clipboard" c:type="GtkClipboard*"/>
+        <parameter name="sortable">
+          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
         </parameter>
-        <parameter name="pixbuf">
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+        <parameter name="sort_column_id">
+          <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="order">
+          <type name="SortType" c:type="GtkSortType"/>
         </parameter>
       </parameters>
-    </callback>
-    <callback name="GtkClipboardTargetsReceivedFunc">
+    </function>
+    <function name="tree_sortable_set_sort_func"
+              c:identifier="gtk_tree_sortable_set_sort_func">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clipboard">
-          <type name="Clipboard" c:type="GtkClipboard*"/>
+        <parameter name="sortable">
+          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
         </parameter>
-        <parameter name="atoms">
-          <type name="GdkAtom" c:type="GdkAtom*"/>
+        <parameter name="sort_column_id">
+          <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="n_atoms">
-          <type name="int32" c:type="gint"/>
+        <parameter name="sort_func">
+          <type name="TreeIterCompareFunc" c:type="GtkTreeIterCompareFunc"/>
         </parameter>
-        <parameter name="data">
+        <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
+        <parameter name="destroy">
+          <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+        </parameter>
       </parameters>
-    </callback>
-    <callback name="GtkClipboardGetFunc">
+    </function>
+    <function name="tree_sortable_set_default_sort_func"
+              c:identifier="gtk_tree_sortable_set_default_sort_func">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clipboard">
-          <type name="Clipboard" c:type="GtkClipboard*"/>
-        </parameter>
-        <parameter name="selection_data">
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        <parameter name="sortable">
+          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
         </parameter>
-        <parameter name="info">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="sort_func">
+          <type name="TreeIterCompareFunc" c:type="GtkTreeIterCompareFunc"/>
         </parameter>
-        <parameter name="user_data_or_owner">
+        <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
+        <parameter name="destroy">
+          <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+        </parameter>
       </parameters>
-    </callback>
-    <callback name="GtkClipboardClearFunc">
+    </function>
+    <function name="tree_sortable_has_default_sort_func"
+              c:identifier="gtk_tree_sortable_has_default_sort_func">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="clipboard">
-          <type name="Clipboard" c:type="GtkClipboard*"/>
-        </parameter>
-        <parameter name="user_data_or_owner">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="sortable">
+          <type name="TreeSortable" c:type="GtkTreeSortable*"/>
         </parameter>
       </parameters>
-    </callback>
-    <class name="Clipboard"
-           c:type="GtkClipboard"
-           parent="GObject.Object"
-           glib:type-name="GtkClipboard"
-           glib:get-type="gtk_clipboard_get_type">
-      <constructor name="get_for_display"
-                   c:identifier="gtk_clipboard_get_for_display">
+    </function>
+    <class name="TreeViewColumn"
+           c:type="GtkTreeViewColumn"
+           parent="Object"
+           glib:type-name="GtkTreeViewColumn"
+           glib:get-type="gtk_tree_view_column_get_type">
+      <constructor name="new" c:identifier="gtk_tree_view_column_new">
         <return-value>
-          <type name="Clipboard" c:type="GtkClipboard*"/>
+          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
         </return-value>
-        <parameters>
-          <parameter name="display">
-            <type name="Gdk.Display" c:type="GdkDisplay*"/>
-          </parameter>
-          <parameter name="selection">
-            <type name="GdkAtom" c:type="GdkAtom"/>
-          </parameter>
-        </parameters>
       </constructor>
-      <constructor name="get" c:identifier="gtk_clipboard_get">
+      <constructor name="new_with_attributes"
+                   c:identifier="gtk_tree_view_column_new_with_attributes">
         <return-value>
-          <type name="Clipboard" c:type="GtkClipboard*"/>
+          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+          <parameter name="title">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-        </parameters>
-      </constructor>
-      <method name="get_display" c:identifier="gtk_clipboard_get_display">
-        <return-value>
-          <type name="Gdk.Display" c:type="GdkDisplay*"/>
-        </return-value>
-        <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_with_data" c:identifier="gtk_clipboard_set_with_data">
+      </constructor>
+      <method name="pack_start" c:identifier="gtk_tree_view_column_pack_start">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="targets">
-            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
-          </parameter>
-          <parameter name="n_targets">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="get_func">
-            <type name="GtkClipboardGetFunc" c:type="GtkClipboardGetFunc"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="clear_func">
-            <type name="GtkClipboardClearFunc" c:type="GtkClipboardClearFunc"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_with_owner"
-              c:identifier="gtk_clipboard_set_with_owner">
+      <method name="pack_end" c:identifier="gtk_tree_view_column_pack_end">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="targets">
-            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
-          </parameter>
-          <parameter name="n_targets">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="get_func">
-            <type name="GtkClipboardGetFunc" c:type="GtkClipboardGetFunc"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="clear_func">
-            <type name="GtkClipboardClearFunc" c:type="GtkClipboardClearFunc"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
-          <parameter name="owner">
-            <type name="GObject.Object" c:type="GObject*"/>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_owner" c:identifier="gtk_clipboard_get_owner">
+      <method name="clear" c:identifier="gtk_tree_view_column_clear">
         <return-value>
-          <type name="GObject.Object" c:type="GObject*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="clear" c:identifier="gtk_clipboard_clear">
+      <method name="get_cell_renderers"
+              c:identifier="gtk_tree_view_column_get_cell_renderers">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_text" c:identifier="gtk_clipboard_set_text">
+      <method name="add_attribute"
+              c:identifier="gtk_tree_view_column_add_attribute">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="text">
+          <parameter name="cell_renderer">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
+          <parameter name="attribute">
             <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="len">
-            <type name="int32" c:type="gint"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_image" c:identifier="gtk_clipboard_set_image">
+      <method name="set_attributes"
+              c:identifier="gtk_tree_view_column_set_attributes">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="cell_renderer">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="request_contents"
-              c:identifier="gtk_clipboard_request_contents">
+      <method name="set_cell_data_func"
+              c:identifier="gtk_tree_view_column_set_cell_data_func">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="target">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+          <parameter name="cell_renderer">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
-          <parameter name="callback">
-            <type name="GtkClipboardReceivedFunc"
-                  c:type="GtkClipboardReceivedFunc"/>
+          <parameter name="func">
+            <type name="TreeCellDataFunc" c:type="GtkTreeCellDataFunc"/>
           </parameter>
-          <parameter name="user_data">
+          <parameter name="func_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
+          <parameter name="destroy">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="request_text" c:identifier="gtk_clipboard_request_text">
+      <method name="clear_attributes"
+              c:identifier="gtk_tree_view_column_clear_attributes">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkClipboardTextReceivedFunc"
-                  c:type="GtkClipboardTextReceivedFunc"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="cell_renderer">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="request_rich_text"
-              c:identifier="gtk_clipboard_request_rich_text">
+      <method name="set_spacing"
+              c:identifier="gtk_tree_view_column_set_spacing">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkClipboardRichTextReceivedFunc"
-                  c:type="GtkClipboardRichTextReceivedFunc"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="spacing">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="request_image" c:identifier="gtk_clipboard_request_image">
+      <method name="get_spacing"
+              c:identifier="gtk_tree_view_column_get_spacing">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="callback">
-            <type name="GtkClipboardImageReceivedFunc"
-                  c:type="GtkClipboardImageReceivedFunc"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="request_targets"
-              c:identifier="gtk_clipboard_request_targets">
+      <method name="set_visible"
+              c:identifier="gtk_tree_view_column_set_visible">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="callback">
-            <type name="GtkClipboardTargetsReceivedFunc"
-                  c:type="GtkClipboardTargetsReceivedFunc"/>
+          <parameter name="visible">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+        </parameters>
+      </method>
+      <method name="get_visible"
+              c:identifier="gtk_tree_view_column_get_visible">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="wait_for_contents"
-              c:identifier="gtk_clipboard_wait_for_contents">
+      <method name="set_resizable"
+              c:identifier="gtk_tree_view_column_set_resizable">
         <return-value>
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="target">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+          <parameter name="resizable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="wait_for_text" c:identifier="gtk_clipboard_wait_for_text">
+      <method name="get_resizable"
+              c:identifier="gtk_tree_view_column_get_resizable">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="wait_for_rich_text"
-              c:identifier="gtk_clipboard_wait_for_rich_text">
+      <method name="set_sizing" c:identifier="gtk_tree_view_column_set_sizing">
         <return-value>
-          <type name="guint8" c:type="guint8*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="length">
-            <type name="gsize" c:type="gsize*"/>
+          <parameter name="type">
+            <type name="TreeViewColumnSizing"
+                  c:type="GtkTreeViewColumnSizing"/>
           </parameter>
         </parameters>
       </method>
-      <method name="wait_for_image"
-              c:identifier="gtk_clipboard_wait_for_image">
+      <method name="get_sizing" c:identifier="gtk_tree_view_column_get_sizing">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="TreeViewColumnSizing" c:type="GtkTreeViewColumnSizing"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="wait_for_targets"
-              c:identifier="gtk_clipboard_wait_for_targets">
+      <method name="get_width" c:identifier="gtk_tree_view_column_get_width">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="targets">
-            <type name="GdkAtom" c:type="GdkAtom**"/>
-          </parameter>
-          <parameter name="n_targets">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="wait_is_text_available"
-              c:identifier="gtk_clipboard_wait_is_text_available">
+      <method name="get_fixed_width"
+              c:identifier="gtk_tree_view_column_get_fixed_width">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="wait_is_rich_text_available"
-              c:identifier="gtk_clipboard_wait_is_rich_text_available">
+      <method name="set_fixed_width"
+              c:identifier="gtk_tree_view_column_set_fixed_width">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="fixed_width">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="wait_is_image_available"
-              c:identifier="gtk_clipboard_wait_is_image_available">
+      <method name="set_min_width"
+              c:identifier="gtk_tree_view_column_set_min_width">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="min_width">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="wait_is_target_available"
-              c:identifier="gtk_clipboard_wait_is_target_available">
+      <method name="get_min_width"
+              c:identifier="gtk_tree_view_column_get_min_width">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="target">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_can_store" c:identifier="gtk_clipboard_set_can_store">
+      <method name="set_max_width"
+              c:identifier="gtk_tree_view_column_set_max_width">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="targets">
-            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="n_targets">
-            <type name="int32" c:type="gint"/>
+          <parameter name="max_width">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="store" c:identifier="gtk_clipboard_store">
+      <method name="get_max_width"
+              c:identifier="gtk_tree_view_column_get_max_width">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <glib:signal name="owner-change">
+      <method name="clicked" c:identifier="gtk_tree_view_column_clicked">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <function name="clipboard_handle_event"
-              c:identifier="_gtk_clipboard_handle_event">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="event">
-          <type name="Gdk.GdkEventOwnerChange" c:type="GdkEventOwnerChange*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clipboard_store_all"
-              c:identifier="_gtk_clipboard_store_all">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <record name="GtkRangeLayout" c:type="GtkRangeLayout"/>
-    <record name="GtkRangeStepTimer" c:type="GtkRangeStepTimer"/>
-    <class name="Range"
-           c:type="GtkRange"
-           parent="Widget"
-           glib:type-name="GtkRange"
-           glib:get-type="gtk_range_get_type">
-      <method name="set_update_policy"
-              c:identifier="gtk_range_set_update_policy">
+      </method>
+      <method name="set_title" c:identifier="gtk_tree_view_column_set_title">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="policy">
-            <type name="UpdateType" c:type="GtkUpdateType"/>
+          <parameter name="title">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_update_policy"
-              c:identifier="gtk_range_get_update_policy">
+      <method name="get_title" c:identifier="gtk_tree_view_column_get_title">
         <return-value>
-          <type name="UpdateType" c:type="GtkUpdateType"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_adjustment" c:identifier="gtk_range_set_adjustment">
+      <method name="set_expand" c:identifier="gtk_tree_view_column_set_expand">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_adjustment" c:identifier="gtk_range_get_adjustment">
+      <method name="get_expand" c:identifier="gtk_tree_view_column_get_expand">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_inverted" c:identifier="gtk_range_set_inverted">
+      <method name="set_clickable"
+              c:identifier="gtk_tree_view_column_set_clickable">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="setting">
+          <parameter name="clickable">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_inverted" c:identifier="gtk_range_get_inverted">
+      <method name="get_clickable"
+              c:identifier="gtk_tree_view_column_get_clickable">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_lower_stepper_sensitivity"
-              c:identifier="gtk_range_set_lower_stepper_sensitivity">
+      <method name="set_widget" c:identifier="gtk_tree_view_column_set_widget">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="sensitivity">
-            <type name="SensitivityType" c:type="GtkSensitivityType"/>
+          <parameter name="widget" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_lower_stepper_sensitivity"
-              c:identifier="gtk_range_get_lower_stepper_sensitivity">
+      <method name="get_widget" c:identifier="gtk_tree_view_column_get_widget">
         <return-value>
-          <type name="SensitivityType" c:type="GtkSensitivityType"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_upper_stepper_sensitivity"
-              c:identifier="gtk_range_set_upper_stepper_sensitivity">
+      <method name="set_alignment"
+              c:identifier="gtk_tree_view_column_set_alignment">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="sensitivity">
-            <type name="SensitivityType" c:type="GtkSensitivityType"/>
+          <parameter name="xalign">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_upper_stepper_sensitivity"
-              c:identifier="gtk_range_get_upper_stepper_sensitivity">
+      <method name="get_alignment"
+              c:identifier="gtk_tree_view_column_get_alignment">
         <return-value>
-          <type name="SensitivityType" c:type="GtkSensitivityType"/>
+          <type name="float" c:type="gfloat"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_increments" c:identifier="gtk_range_set_increments">
+      <method name="set_reorderable"
+              c:identifier="gtk_tree_view_column_set_reorderable">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="step">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="page">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="reorderable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_range" c:identifier="gtk_range_set_range">
+      <method name="get_reorderable"
+              c:identifier="gtk_tree_view_column_get_reorderable">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="min">
-            <type name="double" c:type="gdouble"/>
-          </parameter>
-          <parameter name="max">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_value" c:identifier="gtk_range_set_value">
+      <method name="set_sort_column_id"
+              c:identifier="gtk_tree_view_column_set_sort_column_id">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="value">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="sort_column_id">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_value" c:identifier="gtk_range_get_value">
+      <method name="get_sort_column_id"
+              c:identifier="gtk_tree_view_column_get_sort_column_id">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_show_fill_level"
-              c:identifier="gtk_range_set_show_fill_level">
+      <method name="set_sort_indicator"
+              c:identifier="gtk_tree_view_column_set_sort_indicator">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="show_fill_level">
+          <parameter name="setting">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_show_fill_level"
-              c:identifier="gtk_range_get_show_fill_level">
+      <method name="get_sort_indicator"
+              c:identifier="gtk_tree_view_column_get_sort_indicator">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_restrict_to_fill_level"
-              c:identifier="gtk_range_set_restrict_to_fill_level">
+      <method name="set_sort_order"
+              c:identifier="gtk_tree_view_column_set_sort_order">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="restrict_to_fill_level">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="order">
+            <type name="SortType" c:type="GtkSortType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_restrict_to_fill_level"
-              c:identifier="gtk_range_get_restrict_to_fill_level">
+      <method name="get_sort_order"
+              c:identifier="gtk_tree_view_column_get_sort_order">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="SortType" c:type="GtkSortType"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_fill_level" c:identifier="gtk_range_set_fill_level">
+      <method name="cell_set_cell_data"
+              c:identifier="gtk_tree_view_column_cell_set_cell_data">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="fill_level">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="tree_model">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_fill_level" c:identifier="gtk_range_get_fill_level">
-        <return-value>
-          <type name="double" c:type="gdouble"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="is_expander">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="is_expanded">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <property name="update-policy">
-        <type name="UpdateType" c:type="GtkUpdateType"/>
-      </property>
-      <property name="adjustment">
-        <type name="Adjustment" c:type="GtkAdjustment"/>
-      </property>
-      <property name="inverted">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="lower-stepper-sensitivity">
-        <type name="SensitivityType" c:type="GtkSensitivityType"/>
-      </property>
-      <property name="upper-stepper-sensitivity">
-        <type name="SensitivityType" c:type="GtkSensitivityType"/>
-      </property>
-      <property name="show-fill-level">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="restrict-to-fill-level">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="fill-level">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <field name="slider_detail">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="stepper_detail">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <callback name="value_changed">
+      <method name="cell_get_size"
+              c:identifier="gtk_tree_view_column_cell_get_size">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="adjust_bounds">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="cell_area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
-          <parameter name="new_value">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="x_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="y_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="width">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="height">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="move_slider">
+      </method>
+      <method name="cell_is_visible"
+              c:identifier="gtk_tree_view_column_cell_is_visible">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="scroll">
-            <type name="ScrollType" c:type="GtkScrollType"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_range_border">
+      </method>
+      <method name="focus_cell" c:identifier="gtk_tree_view_column_focus_cell">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="border_">
-            <type name="Border" c:type="GtkBorder*"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="change_value">
+      </method>
+      <method name="cell_get_position"
+              c:identifier="gtk_tree_view_column_cell_get_position">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
-          <parameter name="scroll">
-            <type name="ScrollType" c:type="GtkScrollType"/>
+          <parameter name="cell_renderer">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
-          <parameter name="new_value">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="start_pos">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="width">
+            <type name="int" c:type="gint*"/>
           </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="adjust-bounds">
+      </method>
+      <method name="queue_resize"
+              c:identifier="gtk_tree_view_column_queue_resize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="move-slider">
+      </method>
+      <method name="get_tree_view"
+              c:identifier="gtk_tree_view_column_get_tree_view">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="ScrollType" c:type="GtkScrollType"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="change-value">
+      </method>
+      <property name="visible">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="resizable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="width">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="spacing">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="sizing">
+        <type name="TreeViewColumnSizing" c:type="GtkTreeViewColumnSizing"/>
+      </property>
+      <property name="fixed-width">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="min-width">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="max-width">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="title">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="expand">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="clickable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="widget">
+        <type name="Widget" c:type="GtkWidget"/>
+      </property>
+      <property name="alignment">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="reorderable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="sort-indicator">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="sort-order">
+        <type name="SortType" c:type="GtkSortType"/>
+      </property>
+      <callback name="clicked" c:type="clicked">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="ScrollType" c:type="GtkScrollType"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <function name="range_get_wheel_delta"
-              c:identifier="_gtk_range_get_wheel_delta">
-      <return-value>
-        <type name="double" c:type="gdouble"/>
-      </return-value>
-      <parameters>
-        <parameter name="range">
-          <type name="Range" c:type="GtkRange*"/>
-        </parameter>
-        <parameter name="direction">
-          <type name="GdkScrollDirection" c:type="GdkScrollDirection"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="Scrollbar"
-           c:type="GtkScrollbar"
-           parent="Range"
-           glib:type-name="GtkScrollbar"
-           glib:get-type="gtk_scrollbar_get_type">
-      <callback name="_gtk_reserved1">
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
+      <glib:signal name="clicked">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
     </class>
-    <class name="HScrollbar"
-           c:type="GtkHScrollbar"
-           parent="Scrollbar"
-           glib:type-name="GtkHScrollbar"
-           glib:get-type="gtk_hscrollbar_get_type">
-    </class>
-    <function name="hscrollbar_new" c:identifier="gtk_hscrollbar_new">
+    <callback name="TreeCellDataFunc" c:type="GtkTreeCellDataFunc">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="adjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        <parameter name="tree_column">
+          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
         </parameter>
-      </parameters>
-    </function>
-    <class name="VScrollbar"
-           c:type="GtkVScrollbar"
-           parent="Scrollbar"
-           glib:type-name="GtkVScrollbar"
-           glib:get-type="gtk_vscrollbar_get_type">
-    </class>
-    <function name="vscrollbar_new" c:identifier="gtk_vscrollbar_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="adjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        <parameter name="cell">
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </parameter>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <record name="GtkCList" c:type="GtkCList">
-      <field name="container">
-        <type name="Container" c:type="GtkContainer"/>
-      </field>
-      <field name="flags">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="reserved1">
-        <type name="any" c:type="gpointer"/>
-      </field>
-      <field name="reserved2">
-        <type name="any" c:type="gpointer"/>
-      </field>
-      <field name="freeze_count">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="internal_allocation">
-        <type name="GdkRectangle" c:type="GdkRectangle"/>
-      </field>
-      <field name="rows">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="row_height">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="row_list">
-        <type name="GLib.GList" c:type="GList*"/>
-      </field>
-      <field name="row_list_end">
-        <type name="GLib.GList" c:type="GList*"/>
-      </field>
-      <field name="columns">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="column_title_area">
-        <type name="GdkRectangle" c:type="GdkRectangle"/>
-      </field>
-      <field name="title_window">
-        <type name="Gdk.Window" c:type="GdkWindow*"/>
-      </field>
-      <field name="column">
-        <type name="GtkCListColumn" c:type="GtkCListColumn*"/>
-      </field>
-      <field name="clist_window">
-        <type name="Gdk.Window" c:type="GdkWindow*"/>
-      </field>
-      <field name="clist_window_width">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="clist_window_height">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="hoffset">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="voffset">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="shadow_type">
-        <type name="ShadowType" c:type="GtkShadowType"/>
-      </field>
-      <field name="selection_mode">
-        <type name="SelectionMode" c:type="GtkSelectionMode"/>
-      </field>
-      <field name="selection">
-        <type name="GLib.GList" c:type="GList*"/>
-      </field>
-      <field name="selection_end">
-        <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="undo_anchor">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="button_actions">
-        <type name="uint8" c:type="guint8"/>
-      </field>
-      <field name="drag_button">
-        <type name="uint8" c:type="guint8"/>
-      </field>
-      <field name="click_cell">
-        <type name="GtkCListCellInfo" c:type="GtkCListCellInfo"/>
-      </field>
-      <field name="hadjustment">
-        <type name="Adjustment" c:type="GtkAdjustment*"/>
-      </field>
-      <field name="vadjustment">
-        <type name="Adjustment" c:type="GtkAdjustment*"/>
-      </field>
-      <field name="xor_gc">
-        <type name="Gdk.GC" c:type="GdkGC*"/>
-      </field>
-      <field name="fg_gc">
-        <type name="Gdk.GC" c:type="GdkGC*"/>
-      </field>
-      <field name="bg_gc">
-        <type name="Gdk.GC" c:type="GdkGC*"/>
-      </field>
-      <field name="cursor_drag">
-        <type name="GdkCursor" c:type="GdkCursor*"/>
-      </field>
-      <field name="x_drag">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="focus_row">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="focus_header_column">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="anchor">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="anchor_state">
-        <type name="StateType" c:type="GtkStateType"/>
-      </field>
-      <field name="drag_pos">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="htimer">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="vtimer">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="sort_type">
-        <type name="SortType" c:type="GtkSortType"/>
-      </field>
-      <field name="compare">
-        <type name="GtkCListCompareFunc" c:type="GtkCListCompareFunc"/>
-      </field>
-      <field name="sort_column">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="drag_highlight_row">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <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">
+    </callback>
+    <interface name="CellLayout"
+               c:type="GtkCellLayout"
+               glib:type-name="GtkCellLayout"
+               glib:get-type="gtk_cell_layout_get_type">
+      <callback name="pack_start" c:type="pack_start">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="hadjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="cell_layout">
+            <type name="CellLayout" c:type="GtkCellLayout*"/>
           </parameter>
-          <parameter name="vadjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="refresh">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="select_row">
+      <callback name="pack_end" c:type="pack_end">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="int32" c:type="gint"/>
+          <parameter name="cell_layout">
+            <type name="CellLayout" c:type="GtkCellLayout*"/>
           </parameter>
-          <parameter name="column">
-            <type name="int32" c:type="gint"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="unselect_row">
+      <callback name="clear" c:type="clear">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="column">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
+          <parameter name="cell_layout">
+            <type name="CellLayout" c:type="GtkCellLayout*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="row_move">
+      <callback name="add_attribute" c:type="add_attribute">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="source_row">
-            <type name="int32" c:type="gint"/>
+          <parameter name="cell_layout">
+            <type name="CellLayout" c:type="GtkCellLayout*"/>
           </parameter>
-          <parameter name="dest_row">
-            <type name="int32" c:type="gint"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="click_column">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
+          <parameter name="attribute">
+            <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="column">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="resize_column">
+      <callback name="set_cell_data_func" c:type="set_cell_data_func">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="width">
-            <type name="int32" c:type="gint"/>
+          <parameter name="cell_layout">
+            <type name="CellLayout" c:type="GtkCellLayout*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="toggle_focus_row">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="select_all">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
+          <parameter name="func">
+            <type name="CellLayoutDataFunc" c:type="GtkCellLayoutDataFunc"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="unselect_all">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
+          <parameter name="func_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="undo_selection">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
+          <parameter name="destroy">
+            <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="start_selection">
+      <callback name="clear_attributes" c:type="clear_attributes">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
+          <parameter name="cell_layout">
+            <type name="CellLayout" c:type="GtkCellLayout*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="end_selection">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="extend_selection">
+      <callback name="reorder" c:type="reorder">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
+          <parameter name="cell_layout">
+            <type name="CellLayout" c:type="GtkCellLayout*"/>
           </parameter>
-          <parameter name="scroll_type">
-            <type name="ScrollType" c:type="GtkScrollType"/>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
           </parameter>
           <parameter name="position">
-            <type name="float" c:type="gfloat"/>
-          </parameter>
-          <parameter name="auto_start_selection">
-            <type name="boolean" c:type="gboolean"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="scroll_horizontal">
+      <callback name="get_cells" c:type="get_cells">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="scroll_type">
-            <type name="ScrollType" c:type="GtkScrollType"/>
-          </parameter>
-          <parameter name="position">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="cell_layout">
+            <type name="CellLayout" c:type="GtkCellLayout*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="scroll_vertical">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
-          </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="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="abort_column_resize">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="resync_selection">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="selection_find">
-        <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="row_number">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="row_list_element">
-            <type name="GLib.GList" c:type="GList*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="draw_row">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="clist_row">
-            <type name="GtkCListRow" c:type="GtkCListRow*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="draw_drag_highlight">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="target_row">
-            <type name="GtkCListRow" c:type="GtkCListRow*"/>
-          </parameter>
-          <parameter name="target_row_number">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="drag_pos">
-            <type name="CListDragPos" c:type="GtkCListDragPos"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="clear">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="fake_unselect_all">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="sort_list">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="insert_row">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="remove_row">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_cell_contents">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="clist_row">
-            <type name="GtkCListRow" c:type="GtkCListRow*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="type">
-            <type name="CellType" c:type="GtkCellType"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="spacing">
-            <type name="uint8" c:type="guint8"/>
-          </parameter>
-          <parameter name="pixmap">
-            <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-          </parameter>
-          <parameter name="mask">
-            <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="cell_size_request">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="clist">
-            <type name="GtkCList" c:type="GtkCList*"/>
-          </parameter>
-          <parameter name="clist_row">
-            <type name="GtkCListRow" c:type="GtkCListRow*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="requisition">
-            <type name="Requisition" c:type="GtkRequisition*"/>
-          </parameter>
-        </parameters>
-      </callback>
-    </record>
-    <record name="GtkCListColumn" c:type="GtkCListColumn">
-      <field name="title">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="area">
-        <type name="GdkRectangle" c:type="GdkRectangle"/>
-      </field>
-      <field name="button">
-        <type name="Widget" c:type="GtkWidget*"/>
-      </field>
-      <field name="window">
-        <type name="Gdk.Window" c:type="GdkWindow*"/>
-      </field>
-      <field name="width">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="min_width">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="max_width">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="justification">
-        <type name="Justification" c:type="GtkJustification"/>
-      </field>
-      <field name="visible">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="width_set">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="resizeable">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="auto_resize">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="button_passive">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GtkCListRow" c:type="GtkCListRow">
-      <field name="cell">
-        <type name="GtkCell" c:type="GtkCell*"/>
-      </field>
-      <field name="state">
-        <type name="StateType" c:type="GtkStateType"/>
-      </field>
-      <field name="foreground">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </field>
-      <field name="background">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </field>
-      <field name="style">
-        <type name="Style" c:type="GtkStyle*"/>
-      </field>
-      <field name="data">
-        <type name="any" c:type="gpointer"/>
-      </field>
-      <field name="destroy">
-        <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-      </field>
-      <field name="fg_set">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="bg_set">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="selectable">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GtkCell" c:type="GtkCell">
-      <field name="type">
-        <type name="CellType" c:type="GtkCellType"/>
-      </field>
-      <field name="vertical">
-        <type name="int16" c:type="gint16"/>
-      </field>
-      <field name="horizontal">
-        <type name="int16" c:type="gint16"/>
-      </field>
-      <field name="style">
-        <type name="Style" c:type="GtkStyle*"/>
-      </field>
-      <field name="u">
-        <type name="???" c:type="???"/>
-      </field>
-    </record>
-    <record name="GtkCellText" c:type="GtkCellText">
-      <field name="type">
-        <type name="CellType" c:type="GtkCellType"/>
-      </field>
-      <field name="vertical">
-        <type name="int16" c:type="gint16"/>
-      </field>
-      <field name="horizontal">
-        <type name="int16" c:type="gint16"/>
-      </field>
-      <field name="style">
-        <type name="Style" c:type="GtkStyle*"/>
-      </field>
-      <field name="text">
-        <type name="string" c:type="gchar*"/>
-      </field>
-    </record>
-    <record name="GtkCellPixmap" c:type="GtkCellPixmap">
-      <field name="type">
-        <type name="CellType" c:type="GtkCellType"/>
-      </field>
-      <field name="vertical">
-        <type name="int16" c:type="gint16"/>
-      </field>
-      <field name="horizontal">
-        <type name="int16" c:type="gint16"/>
-      </field>
-      <field name="style">
-        <type name="Style" c:type="GtkStyle*"/>
-      </field>
-      <field name="pixmap">
-        <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-      </field>
-      <field name="mask">
-        <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-      </field>
-    </record>
-    <record name="GtkCellPixText" c:type="GtkCellPixText">
-      <field name="type">
-        <type name="CellType" c:type="GtkCellType"/>
-      </field>
-      <field name="vertical">
-        <type name="int16" c:type="gint16"/>
-      </field>
-      <field name="horizontal">
-        <type name="int16" c:type="gint16"/>
-      </field>
-      <field name="style">
-        <type name="Style" c:type="GtkStyle*"/>
-      </field>
-      <field name="text">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="spacing">
-        <type name="uint8" c:type="guint8"/>
-      </field>
-      <field name="pixmap">
-        <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-      </field>
-      <field name="mask">
-        <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-      </field>
-    </record>
-    <record name="GtkCellWidget" c:type="GtkCellWidget">
-      <field name="type">
-        <type name="CellType" c:type="GtkCellType"/>
-      </field>
-      <field name="vertical">
-        <type name="int16" c:type="gint16"/>
-      </field>
-      <field name="horizontal">
-        <type name="int16" c:type="gint16"/>
-      </field>
-      <field name="style">
-        <type name="Style" c:type="GtkStyle*"/>
-      </field>
-      <field name="widget">
-        <type name="Widget" c:type="GtkWidget*"/>
-      </field>
-    </record>
-    <callback name="GtkCListCompareFunc">
+    </interface>
+    <callback name="CellLayoutDataFunc" c:type="GtkCellLayoutDataFunc">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="ptr1">
-          <type name="any" c:type="gconstpointer"/>
+        <parameter name="cell_layout">
+          <type name="CellLayout" c:type="GtkCellLayout*"/>
         </parameter>
-        <parameter name="ptr2">
-          <type name="any" c:type="gconstpointer"/>
+        <parameter name="cell">
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
         </parameter>
-      </parameters>
-    </callback>
-    <record name="GtkCListCellInfo" c:type="GtkCListCellInfo">
-      <field name="row">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="column">
-        <type name="int32" c:type="gint"/>
-      </field>
-    </record>
-    <record name="GtkCListDestInfo" c:type="GtkCListDestInfo">
-      <field name="cell">
-        <type name="GtkCListCellInfo" c:type="GtkCListCellInfo"/>
-      </field>
-      <field name="insert_pos">
-        <type name="CListDragPos" c:type="GtkCListDragPos"/>
-      </field>
-    </record>
-    <function name="clist_get_type" c:identifier="gtk_clist_get_type">
-      <return-value>
-        <type name="GtkType" c:type="GtkType"/>
-      </return-value>
-    </function>
-    <function name="clist_new" c:identifier="gtk_clist_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="columns">
-          <type name="int32" c:type="gint"/>
+        <parameter name="tree_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="clist_new_with_titles"
-              c:identifier="gtk_clist_new_with_titles">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="columns">
-          <type name="int32" c:type="gint"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
-        <parameter name="titles">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="clist_set_hadjustment"
-              c:identifier="gtk_clist_set_hadjustment">
+    </callback>
+    <function name="cell_layout_pack_start"
+              c:identifier="gtk_cell_layout_pack_start">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="cell_layout">
+          <type name="CellLayout" c:type="GtkCellLayout*"/>
         </parameter>
-        <parameter name="adjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        <parameter name="cell">
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </parameter>
+        <parameter name="expand">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_set_vadjustment"
-              c:identifier="gtk_clist_set_vadjustment">
+    <function name="cell_layout_pack_end"
+              c:identifier="gtk_cell_layout_pack_end">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="cell_layout">
+          <type name="CellLayout" c:type="GtkCellLayout*"/>
         </parameter>
-        <parameter name="adjustment">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        <parameter name="cell">
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="clist_get_hadjustment"
-              c:identifier="gtk_clist_get_hadjustment">
-      <return-value>
-        <type name="Adjustment" c:type="GtkAdjustment*"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="expand">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_get_vadjustment"
-              c:identifier="gtk_clist_get_vadjustment">
+    <function name="cell_layout_get_cells"
+              c:identifier="gtk_cell_layout_get_cells">
       <return-value>
-        <type name="Adjustment" c:type="GtkAdjustment*"/>
+        <type name="GLib.List" c:type="GList*"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="cell_layout">
+          <type name="CellLayout" c:type="GtkCellLayout*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_set_shadow_type"
-              c:identifier="gtk_clist_set_shadow_type">
+    <function name="cell_layout_clear" c:identifier="gtk_cell_layout_clear">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
+        <parameter name="cell_layout">
+          <type name="CellLayout" c:type="GtkCellLayout*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_set_selection_mode"
-              c:identifier="gtk_clist_set_selection_mode">
+    <function name="cell_layout_set_attributes"
+              c:identifier="gtk_cell_layout_set_attributes">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="cell_layout">
+          <type name="CellLayout" c:type="GtkCellLayout*"/>
         </parameter>
-        <parameter name="mode">
-          <type name="SelectionMode" c:type="GtkSelectionMode"/>
+        <parameter name="cell">
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_set_reorderable"
-              c:identifier="gtk_clist_set_reorderable">
+    <function name="cell_layout_add_attribute"
+              c:identifier="gtk_cell_layout_add_attribute">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="cell_layout">
+          <type name="CellLayout" c:type="GtkCellLayout*"/>
         </parameter>
-        <parameter name="reorderable">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="cell">
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_use_drag_icons"
-              c:identifier="gtk_clist_set_use_drag_icons">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="attribute">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="use_icons">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="column">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_set_button_actions"
-              c:identifier="gtk_clist_set_button_actions">
+    <function name="cell_layout_set_cell_data_func"
+              c:identifier="gtk_cell_layout_set_cell_data_func">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="cell_layout">
+          <type name="CellLayout" c:type="GtkCellLayout*"/>
         </parameter>
-        <parameter name="button">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="cell">
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </parameter>
+        <parameter name="func">
+          <type name="CellLayoutDataFunc" c:type="GtkCellLayoutDataFunc"/>
+        </parameter>
+        <parameter name="func_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
-        <parameter name="button_actions">
-          <type name="uint8" c:type="guint8"/>
+        <parameter name="destroy">
+          <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_freeze" c:identifier="gtk_clist_freeze">
+    <function name="cell_layout_clear_attributes"
+              c:identifier="gtk_cell_layout_clear_attributes">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="cell_layout">
+          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        </parameter>
+        <parameter name="cell">
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_thaw" c:identifier="gtk_clist_thaw">
+    <function name="cell_layout_reorder"
+              c:identifier="gtk_cell_layout_reorder">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="cell_layout">
+          <type name="CellLayout" c:type="GtkCellLayout*"/>
+        </parameter>
+        <parameter name="cell">
+          <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+        </parameter>
+        <parameter name="position">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_column_titles_show"
-              c:identifier="gtk_clist_column_titles_show">
+    <function name="cell_layout_buildable_custom_tag_start"
+              c:identifier="_gtk_cell_layout_buildable_custom_tag_start">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="buildable">
+          <type name="Buildable" c:type="GtkBuildable*"/>
+        </parameter>
+        <parameter name="builder">
+          <type name="Builder" c:type="GtkBuilder*"/>
+        </parameter>
+        <parameter name="child">
+          <type name="GObject.Object" c:type="GObject*"/>
+        </parameter>
+        <parameter name="tagname">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="parser">
+          <type name="GLib.MarkupParser" c:type="GMarkupParser*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_column_titles_hide"
-              c:identifier="gtk_clist_column_titles_hide">
+    <function name="cell_layout_buildable_custom_tag_end"
+              c:identifier="_gtk_cell_layout_buildable_custom_tag_end">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="buildable">
+          <type name="Buildable" c:type="GtkBuildable*"/>
+        </parameter>
+        <parameter name="builder">
+          <type name="Builder" c:type="GtkBuilder*"/>
+        </parameter>
+        <parameter name="child">
+          <type name="GObject.Object" c:type="GObject*"/>
+        </parameter>
+        <parameter name="tagname">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_column_title_active"
-              c:identifier="gtk_clist_column_title_active">
+    <function name="cell_layout_buildable_add_child"
+              c:identifier="_gtk_cell_layout_buildable_add_child">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
+        <parameter name="buildable">
+          <type name="Buildable" c:type="GtkBuildable*"/>
         </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
+        <parameter name="builder">
+          <type name="Builder" c:type="GtkBuilder*"/>
+        </parameter>
+        <parameter name="child">
+          <type name="GObject.Object" c:type="GObject*"/>
+        </parameter>
+        <parameter name="type">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="clist_column_title_passive"
-              c:identifier="gtk_clist_column_title_passive">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_column_titles_active"
-              c:identifier="gtk_clist_column_titles_active">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_column_titles_passive"
-              c:identifier="gtk_clist_column_titles_passive">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_column_title"
-              c:identifier="gtk_clist_set_column_title">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="title">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_get_column_title"
-              c:identifier="gtk_clist_get_column_title">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_column_widget"
-              c:identifier="gtk_clist_set_column_widget">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_get_column_widget"
-              c:identifier="gtk_clist_get_column_widget">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_column_justification"
-              c:identifier="gtk_clist_set_column_justification">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="justification">
-          <type name="Justification" c:type="GtkJustification"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_column_visibility"
-              c:identifier="gtk_clist_set_column_visibility">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="visible">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_column_resizeable"
-              c:identifier="gtk_clist_set_column_resizeable">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="resizeable">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_column_auto_resize"
-              c:identifier="gtk_clist_set_column_auto_resize">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="auto_resize">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_columns_autosize"
-              c:identifier="gtk_clist_columns_autosize">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_optimal_column_width"
-              c:identifier="gtk_clist_optimal_column_width">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_column_width"
-              c:identifier="gtk_clist_set_column_width">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_column_min_width"
-              c:identifier="gtk_clist_set_column_min_width">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="min_width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_column_max_width"
-              c:identifier="gtk_clist_set_column_max_width">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="max_width">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_row_height"
-              c:identifier="gtk_clist_set_row_height">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="height">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_moveto" c:identifier="gtk_clist_moveto">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="row_align">
-          <type name="float" c:type="gfloat"/>
-        </parameter>
-        <parameter name="col_align">
-          <type name="float" c:type="gfloat"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_row_is_visible"
-              c:identifier="gtk_clist_row_is_visible">
-      <return-value>
-        <type name="Visibility" c:type="GtkVisibility"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_get_cell_type"
-              c:identifier="gtk_clist_get_cell_type">
-      <return-value>
-        <type name="CellType" c:type="GtkCellType"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_text" c:identifier="gtk_clist_set_text">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="text">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_get_text" c:identifier="gtk_clist_get_text">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="text">
-          <type name="GLib.gchar" c:type="gchar**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_pixmap" c:identifier="gtk_clist_set_pixmap">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask" allow-none="1">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_get_pixmap" c:identifier="gtk_clist_get_pixmap">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
-        </parameter>
-        <parameter name="mask">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_pixtext" c:identifier="gtk_clist_set_pixtext">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="text">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="spacing">
-          <type name="uint8" c:type="guint8"/>
-        </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_get_pixtext" c:identifier="gtk_clist_get_pixtext">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="text">
-          <type name="GLib.gchar" c:type="gchar**"/>
-        </parameter>
-        <parameter name="spacing">
-          <type name="guint8" c:type="guint8*"/>
-        </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
-        </parameter>
-        <parameter name="mask">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_foreground"
-              c:identifier="gtk_clist_set_foreground">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="color">
-          <type name="GdkColor" c:type="GdkColor*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_background"
-              c:identifier="gtk_clist_set_background">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="color">
-          <type name="GdkColor" c:type="GdkColor*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_cell_style"
-              c:identifier="gtk_clist_set_cell_style">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_get_cell_style"
-              c:identifier="gtk_clist_get_cell_style">
-      <return-value>
-        <type name="Style" c:type="GtkStyle*"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_row_style"
-              c:identifier="gtk_clist_set_row_style">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_get_row_style"
-              c:identifier="gtk_clist_get_row_style">
-      <return-value>
-        <type name="Style" c:type="GtkStyle*"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_shift" c:identifier="gtk_clist_set_shift">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="vertical">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="horizontal">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_selectable"
-              c:identifier="gtk_clist_set_selectable">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="selectable">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_get_selectable"
-              c:identifier="gtk_clist_get_selectable">
-      <return-value>
+    <class name="CellRendererText"
+           c:type="GtkCellRendererText"
+           parent="CellRenderer"
+           glib:type-name="GtkCellRendererText"
+           glib:get-type="gtk_cell_renderer_text_get_type">
+      <method name="set_fixed_height_from_font"
+              c:identifier="gtk_cell_renderer_text_set_fixed_height_from_font">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="renderer">
+            <type name="CellRendererText" c:type="GtkCellRendererText*"/>
+          </parameter>
+          <parameter name="number_of_rows">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="text">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="markup">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="attributes">
+        <type name="Pango.AttrList" c:type="PangoAttrList"/>
+      </property>
+      <property name="single-paragraph-mode">
         <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_prepend" c:identifier="gtk_clist_prepend">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="text">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_append" c:identifier="gtk_clist_append">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="text">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_insert" c:identifier="gtk_clist_insert">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="text">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_remove" c:identifier="gtk_clist_remove">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_row_data" c:identifier="gtk_clist_set_row_data">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_row_data_full"
-              c:identifier="gtk_clist_set_row_data_full">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="destroy">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_get_row_data" c:identifier="gtk_clist_get_row_data">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_find_row_from_data"
-              c:identifier="gtk_clist_find_row_from_data">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_select_row" c:identifier="gtk_clist_select_row">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_unselect_row" c:identifier="gtk_clist_unselect_row">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_undo_selection"
-              c:identifier="gtk_clist_undo_selection">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_clear" c:identifier="gtk_clist_clear">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_get_selection_info"
-              c:identifier="gtk_clist_get_selection_info">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="row">
-          <type name="GLib.gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="GLib.gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_select_all" c:identifier="gtk_clist_select_all">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_unselect_all" c:identifier="gtk_clist_unselect_all">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_swap_rows" c:identifier="gtk_clist_swap_rows">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="row1">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="row2">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_row_move" c:identifier="gtk_clist_row_move">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="source_row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="dest_row">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_compare_func"
-              c:identifier="gtk_clist_set_compare_func">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="cmp_func">
-          <type name="GtkCListCompareFunc" c:type="GtkCListCompareFunc"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_sort_column"
-              c:identifier="gtk_clist_set_sort_column">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_sort_type"
-              c:identifier="gtk_clist_set_sort_type">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="sort_type">
-          <type name="SortType" c:type="GtkSortType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_sort" c:identifier="gtk_clist_sort">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_set_auto_sort"
-              c:identifier="gtk_clist_set_auto_sort">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="auto_sort">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="clist_create_cell_layout"
-              c:identifier="_gtk_clist_create_cell_layout">
-      <return-value>
-        <type name="Pango.Layout" c:type="PangoLayout*"/>
-      </return-value>
-      <parameters>
-        <parameter name="clist">
-          <type name="GtkCList" c:type="GtkCList*"/>
-        </parameter>
-        <parameter name="clist_row">
-          <type name="GtkCListRow" c:type="GtkCListRow*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkColorButtonPrivate" c:type="GtkColorButtonPrivate"/>
-    <class name="ColorButton"
-           c:type="GtkColorButton"
-           parent="Button"
-           glib:type-name="GtkColorButton"
-           glib:get-type="gtk_color_button_get_type">
-      <method name="set_color" c:identifier="gtk_color_button_set_color">
+      </property>
+      <property name="width-chars">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="wrap-width">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="alignment">
+        <type name="Pango.Alignment" c:type="PangoAlignment"/>
+      </property>
+      <property name="background">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="foreground">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="background-gdk">
+        <type name="Gdk.Color" c:type="GdkColor"/>
+      </property>
+      <property name="foreground-gdk">
+        <type name="Gdk.Color" c:type="GdkColor"/>
+      </property>
+      <property name="font">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="font-desc">
+        <type name="Pango.FontDescription" c:type="PangoFontDescription"/>
+      </property>
+      <property name="family">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="style">
+        <type name="Pango.Style" c:type="PangoStyle"/>
+      </property>
+      <property name="variant">
+        <type name="Pango.Variant" c:type="PangoVariant"/>
+      </property>
+      <property name="weight">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="stretch">
+        <type name="Pango.Stretch" c:type="PangoStretch"/>
+      </property>
+      <property name="size">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="size-points">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="scale">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="editable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="strikethrough">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="underline">
+        <type name="Pango.Underline" c:type="PangoUnderline"/>
+      </property>
+      <property name="rise">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="language">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="ellipsize">
+        <type name="Pango.EllipsizeMode" c:type="PangoEllipsizeMode"/>
+      </property>
+      <property name="wrap-mode">
+        <type name="Pango.WrapMode" c:type="PangoWrapMode"/>
+      </property>
+      <property name="background-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="foreground-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="family-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="style-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="variant-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="weight-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="stretch-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="size-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="scale-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="editable-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="strikethrough-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="underline-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="rise-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="language-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="ellipsize-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="align-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="edited" c:type="edited">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="color_button">
-            <type name="ColorButton" c:type="GtkColorButton*"/>
+          <parameter name="cell_renderer_text">
+            <type name="CellRendererText" c:type="GtkCellRendererText*"/>
           </parameter>
-          <parameter name="color">
-            <type name="GdkColor" c:type="GdkColor*"/>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="new_text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_alpha" c:identifier="gtk_color_button_set_alpha">
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="color_button">
-            <type name="ColorButton" c:type="GtkColorButton*"/>
-          </parameter>
-          <parameter name="alpha">
-            <type name="uint16" c:type="guint16"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_color" c:identifier="gtk_color_button_get_color">
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="edited">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="color_button">
-            <type name="ColorButton" c:type="GtkColorButton*"/>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
           </parameter>
-          <parameter name="color">
-            <type name="GdkColor" c:type="GdkColor*"/>
+          <parameter name="p0">
+            <type name="string" c:type="gchararray"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_alpha" c:identifier="gtk_color_button_get_alpha">
+      </glib:signal>
+    </class>
+    <class name="CellRendererAccel"
+           c:type="GtkCellRendererAccel"
+           parent="CellRendererText"
+           glib:type-name="GtkCellRendererAccel"
+           glib:get-type="gtk_cell_renderer_accel_get_type">
+      <property name="accel-key">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="accel-mods">
+        <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+      </property>
+      <property name="keycode">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="accel-mode">
+        <type name="CellRendererAccelMode" c:type="GtkCellRendererAccelMode"/>
+      </property>
+      <callback name="accel_edited" c:type="accel_edited">
         <return-value>
-          <type name="uint16" c:type="guint16"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="color_button">
-            <type name="ColorButton" c:type="GtkColorButton*"/>
+          <parameter name="accel">
+            <type name="CellRendererAccel" c:type="GtkCellRendererAccel*"/>
+          </parameter>
+          <parameter name="path_string">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="accel_key">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="accel_mods">
+            <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+          </parameter>
+          <parameter name="hardware_keycode">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_use_alpha"
-              c:identifier="gtk_color_button_set_use_alpha">
+      </callback>
+      <callback name="accel_cleared" c:type="accel_cleared">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="color_button">
-            <type name="ColorButton" c:type="GtkColorButton*"/>
+          <parameter name="accel">
+            <type name="CellRendererAccel" c:type="GtkCellRendererAccel*"/>
           </parameter>
-          <parameter name="use_alpha">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="path_string">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_use_alpha"
-              c:identifier="gtk_color_button_get_use_alpha">
+      </callback>
+      <callback name="gtk_reserved0" c:type="_gtk_reserved0">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="color_button">
-            <type name="ColorButton" c:type="GtkColorButton*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_title" c:identifier="gtk_color_button_set_title">
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="accel-edited">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="color_button">
-            <type name="ColorButton" c:type="GtkColorButton*"/>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
           </parameter>
-          <parameter name="title">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="p0">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+          </parameter>
+          <parameter name="p2">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_title" c:identifier="gtk_color_button_get_title">
+      </glib:signal>
+      <glib:signal name="accel-cleared">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="color_button">
-            <type name="ColorButton" c:type="GtkColorButton*"/>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="use-alpha">
+      </glib:signal>
+    </class>
+    <class name="CellRendererCombo"
+           c:type="GtkCellRendererCombo"
+           parent="CellRendererText"
+           glib:type-name="GtkCellRendererCombo"
+           glib:get-type="gtk_cell_renderer_combo_get_type">
+      <property name="model">
+        <type name="TreeModel" c:type="GtkTreeModel"/>
+      </property>
+      <property name="text-column">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="has-entry">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="title">
+    </class>
+    <class name="CellRendererPixbuf"
+           c:type="GtkCellRendererPixbuf"
+           parent="CellRenderer"
+           glib:type-name="GtkCellRendererPixbuf"
+           glib:get-type="gtk_cell_renderer_pixbuf_get_type">
+      <property name="pixbuf">
+        <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf"/>
+      </property>
+      <property name="pixbuf-expander-open">
+        <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf"/>
+      </property>
+      <property name="pixbuf-expander-closed">
+        <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf"/>
+      </property>
+      <property name="stock-id">
         <type name="string" c:type="gchararray"/>
       </property>
-      <property name="color">
-        <type name="GdkColor" c:type="GdkColor"/>
+      <property name="stock-size">
+        <type name="uint" c:type="guint"/>
       </property>
-      <property name="alpha">
-        <type name="uint32" c:type="guint"/>
+      <property name="stock-detail">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="follow-state">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="icon-name">
+        <type name="string" c:type="gchararray"/>
       </property>
-      <callback name="color_set">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="cp">
-            <type name="ColorButton" c:type="GtkColorButton*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+    </class>
+    <class name="CellRendererProgress"
+           c:type="GtkCellRendererProgress"
+           parent="CellRenderer"
+           glib:type-name="GtkCellRendererProgress"
+           glib:get-type="gtk_cell_renderer_progress_get_type">
+      <property name="value">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="text">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="pulse">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="text-xalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="text-yalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="orientation">
+        <type name="ProgressBarOrientation"
+              c:type="GtkProgressBarOrientation"/>
+      </property>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="color-set">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
+      </callback>
     </class>
-    <function name="color_button_new" c:identifier="gtk_color_button_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="color_button_new_with_color"
-              c:identifier="gtk_color_button_new_with_color">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="color">
-          <type name="GdkColor" c:type="GdkColor*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="VBox"
-           c:type="GtkVBox"
-           parent="Box"
-           glib:type-name="GtkVBox"
-           glib:get-type="gtk_vbox_get_type">
+    <record name="CellRendererProgressPrivate"
+            c:type="GtkCellRendererProgressPrivate"/>
+    <class name="CellRendererSpin"
+           c:type="GtkCellRendererSpin"
+           parent="CellRendererText"
+           glib:type-name="GtkCellRendererSpin"
+           glib:get-type="gtk_cell_renderer_spin_get_type">
+      <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="uint" c:type="guint"/>
+      </property>
     </class>
-    <function name="vbox_new" c:identifier="gtk_vbox_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="homogeneous">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="spacing">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <callback name="GtkColorSelectionChangePaletteFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="colors">
-          <type name="GdkColor" c:type="GdkColor*"/>
-        </parameter>
-        <parameter name="n_colors">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkColorSelectionChangePaletteWithScreenFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="screen">
-          <type name="Gdk.Screen" c:type="GdkScreen*"/>
-        </parameter>
-        <parameter name="colors">
-          <type name="GdkColor" c:type="GdkColor*"/>
-        </parameter>
-        <parameter name="n_colors">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <class name="ColorSelection"
-           c:type="GtkColorSelection"
-           parent="VBox"
-           glib:type-name="GtkColorSelection"
-           glib:get-type="gtk_color_selection_get_type">
-      <method name="get_has_opacity_control"
-              c:identifier="gtk_color_selection_get_has_opacity_control">
+    <record name="CellRendererSpinPrivate"
+            c:type="GtkCellRendererSpinPrivate"/>
+    <class name="CellRendererToggle"
+           c:type="GtkCellRendererToggle"
+           parent="CellRenderer"
+           glib:type-name="GtkCellRendererToggle"
+           glib:get-type="gtk_cell_renderer_toggle_get_type">
+      <method name="get_radio"
+              c:identifier="gtk_cell_renderer_toggle_get_radio">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="toggle">
+            <type name="CellRendererToggle" c:type="GtkCellRendererToggle*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_has_opacity_control"
-              c:identifier="gtk_color_selection_set_has_opacity_control">
+      <method name="set_radio"
+              c:identifier="gtk_cell_renderer_toggle_set_radio">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="toggle">
+            <type name="CellRendererToggle" c:type="GtkCellRendererToggle*"/>
           </parameter>
-          <parameter name="has_opacity">
+          <parameter name="radio">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_has_palette"
-              c:identifier="gtk_color_selection_get_has_palette">
+      <method name="get_active"
+              c:identifier="gtk_cell_renderer_toggle_get_active">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="toggle">
+            <type name="CellRendererToggle" c:type="GtkCellRendererToggle*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_has_palette"
-              c:identifier="gtk_color_selection_set_has_palette">
+      <method name="set_active"
+              c:identifier="gtk_cell_renderer_toggle_set_active">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="toggle">
+            <type name="CellRendererToggle" c:type="GtkCellRendererToggle*"/>
           </parameter>
-          <parameter name="has_palette">
+          <parameter name="setting">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_current_color"
-              c:identifier="gtk_color_selection_set_current_color">
+      <property name="activatable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="active">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="radio">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="inconsistent">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="indicator-size">
+        <type name="int" c:type="gint"/>
+      </property>
+      <callback name="toggled" c:type="toggled">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="cell_renderer_toggle">
+            <type name="CellRendererToggle" c:type="GtkCellRendererToggle*"/>
           </parameter>
-          <parameter name="color">
-            <type name="GdkColor" c:type="GdkColor*"/>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_current_alpha"
-              c:identifier="gtk_color_selection_set_current_alpha">
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="toggled">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
           </parameter>
-          <parameter name="alpha">
-            <type name="uint16" c:type="guint16"/>
+        </parameters>
+      </glib:signal>
+    </class>
+    <class name="CellView"
+           c:type="GtkCellView"
+           parent="Widget"
+           glib:type-name="GtkCellView"
+           glib:get-type="gtk_cell_view_get_type">
+      <method name="set_model" c:identifier="gtk_cell_view_set_model">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="cell_view">
+            <type name="CellView" c:type="GtkCellView*"/>
+          </parameter>
+          <parameter name="model" allow-none="1">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_current_color"
-              c:identifier="gtk_color_selection_get_current_color">
+      <method name="set_displayed_row"
+              c:identifier="gtk_cell_view_set_displayed_row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="cell_view">
+            <type name="CellView" c:type="GtkCellView*"/>
           </parameter>
-          <parameter name="color">
-            <type name="GdkColor" c:type="GdkColor*"/>
+          <parameter name="path" allow-none="1">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_current_alpha"
-              c:identifier="gtk_color_selection_get_current_alpha">
+      <method name="get_displayed_row"
+              c:identifier="gtk_cell_view_get_displayed_row">
         <return-value>
-          <type name="uint16" c:type="guint16"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="cell_view">
+            <type name="CellView" c:type="GtkCellView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_previous_color"
-              c:identifier="gtk_color_selection_set_previous_color">
+      <method name="get_size_of_row"
+              c:identifier="gtk_cell_view_get_size_of_row">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="cell_view">
+            <type name="CellView" c:type="GtkCellView*"/>
           </parameter>
-          <parameter name="color">
-            <type name="GdkColor" c:type="GdkColor*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="requisition">
+            <type name="Requisition" c:type="GtkRequisition*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_previous_alpha"
-              c:identifier="gtk_color_selection_set_previous_alpha">
+      <method name="set_background_color"
+              c:identifier="gtk_cell_view_set_background_color">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="cell_view">
+            <type name="CellView" c:type="GtkCellView*"/>
           </parameter>
-          <parameter name="alpha">
-            <type name="uint16" c:type="guint16"/>
+          <parameter name="color">
+            <type name="Gdk.Color" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_previous_color"
-              c:identifier="gtk_color_selection_get_previous_color">
+      <method name="get_cell_renderers"
+              c:identifier="gtk_cell_view_get_cell_renderers">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
-          </parameter>
-          <parameter name="color">
-            <type name="GdkColor" c:type="GdkColor*"/>
+          <parameter name="cell_view">
+            <type name="CellView" c:type="GtkCellView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_previous_alpha"
-              c:identifier="gtk_color_selection_get_previous_alpha">
+      <property name="background">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="background-gdk">
+        <type name="Gdk.Color" c:type="GdkColor"/>
+      </property>
+      <property name="background-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="model">
+        <type name="TreeModel" c:type="GtkTreeModel"/>
+      </property>
+    </class>
+    <record name="CellViewPrivate" c:type="GtkCellViewPrivate"/>
+    <function name="cell_view_new" c:identifier="gtk_cell_view_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="cell_view_new_with_text"
+              c:identifier="gtk_cell_view_new_with_text">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="cell_view_new_with_markup"
+              c:identifier="gtk_cell_view_new_with_markup">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="markup">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="cell_view_new_with_pixbuf"
+              c:identifier="gtk_cell_view_new_with_pixbuf">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="pixbuf">
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="ToggleButton"
+           c:type="GtkToggleButton"
+           parent="Button"
+           glib:type-name="GtkToggleButton"
+           glib:get-type="gtk_toggle_button_get_type">
+      <method name="set_mode" c:identifier="gtk_toggle_button_set_mode">
         <return-value>
-          <type name="uint16" c:type="guint16"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="toggle_button">
+            <type name="ToggleButton" c:type="GtkToggleButton*"/>
+          </parameter>
+          <parameter name="draw_indicator">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="is_adjusting"
-              c:identifier="gtk_color_selection_is_adjusting">
+      <method name="get_mode" c:identifier="gtk_toggle_button_get_mode">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="toggle_button">
+            <type name="ToggleButton" c:type="GtkToggleButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_color" c:identifier="gtk_color_selection_set_color">
+      <method name="set_active" c:identifier="gtk_toggle_button_set_active">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="toggle_button">
+            <type name="ToggleButton" c:type="GtkToggleButton*"/>
           </parameter>
-          <parameter name="color">
-            <type name="GLib.gdouble" c:type="gdouble*"/>
+          <parameter name="is_active">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_color" c:identifier="gtk_color_selection_get_color">
+      <method name="get_active" c:identifier="gtk_toggle_button_get_active">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="toggle_button">
+            <type name="ToggleButton" c:type="GtkToggleButton*"/>
           </parameter>
-          <parameter name="color">
-            <type name="GLib.gdouble" c:type="gdouble*"/>
+        </parameters>
+      </method>
+      <method name="toggled" c:identifier="gtk_toggle_button_toggled">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="toggle_button">
+            <type name="ToggleButton" c:type="GtkToggleButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_update_policy"
-              c:identifier="gtk_color_selection_set_update_policy">
+      <method name="set_inconsistent"
+              c:identifier="gtk_toggle_button_set_inconsistent">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="colorsel">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="toggle_button">
+            <type name="ToggleButton" c:type="GtkToggleButton*"/>
           </parameter>
-          <parameter name="policy">
-            <type name="UpdateType" c:type="GtkUpdateType"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <property name="has-palette">
+      <method name="get_inconsistent"
+              c:identifier="gtk_toggle_button_get_inconsistent">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="toggle_button">
+            <type name="ToggleButton" c:type="GtkToggleButton*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="active">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="has-opacity-control">
+      <property name="inconsistent">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="current-color">
-        <type name="GdkColor" c:type="GdkColor"/>
-      </property>
-      <property name="current-alpha">
-        <type name="uint32" c:type="guint"/>
+      <property name="draw-indicator">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <callback name="color_changed">
+      <callback name="toggled" c:type="toggled">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="color_selection">
-            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          <parameter name="toggle_button">
+            <type name="ToggleButton" c:type="GtkToggleButton*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="color-changed">
+      <glib:signal name="toggled">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
     </class>
-    <function name="color_selection_new"
-              c:identifier="gtk_color_selection_new">
+    <function name="toggle_button_new" c:identifier="gtk_toggle_button_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
-    <function name="color_selection_palette_from_string"
-              c:identifier="gtk_color_selection_palette_from_string">
+    <function name="toggle_button_new_with_label"
+              c:identifier="gtk_toggle_button_new_with_label">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="str">
+        <parameter name="label">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="colors">
-          <type name="GdkColor" c:type="GdkColor**"/>
-        </parameter>
-        <parameter name="n_colors">
-          <type name="GLib.gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="color_selection_palette_to_string"
-              c:identifier="gtk_color_selection_palette_to_string">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="colors">
-          <type name="GdkColor" c:type="GdkColor*"/>
-        </parameter>
-        <parameter name="n_colors">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="color_selection_set_change_palette_hook"
-              c:identifier="gtk_color_selection_set_change_palette_hook">
-      <return-value>
-        <type name="GtkColorSelectionChangePaletteFunc"
-              c:type="GtkColorSelectionChangePaletteFunc"/>
-      </return-value>
-      <parameters>
-        <parameter name="func">
-          <type name="GtkColorSelectionChangePaletteFunc"
-                c:type="GtkColorSelectionChangePaletteFunc"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="color_selection_set_change_palette_with_screen_hook"
-              c:identifier="gtk_color_selection_set_change_palette_with_screen_hook">
+    <function name="toggle_button_new_with_mnemonic"
+              c:identifier="gtk_toggle_button_new_with_mnemonic">
       <return-value>
-        <type name="GtkColorSelectionChangePaletteWithScreenFunc"
-              c:type="GtkColorSelectionChangePaletteWithScreenFunc"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="func">
-          <type name="GtkColorSelectionChangePaletteWithScreenFunc"
-                c:type="GtkColorSelectionChangePaletteWithScreenFunc"/>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <class name="ColorSelectionDialog"
-           c:type="GtkColorSelectionDialog"
-           parent="Dialog"
-           glib:type-name="GtkColorSelectionDialog"
-           glib:get-type="gtk_color_selection_dialog_get_type">
-      <callback name="_gtk_reserved1">
+    <class name="CheckButton"
+           c:type="GtkCheckButton"
+           parent="ToggleButton"
+           glib:type-name="GtkCheckButton"
+           glib:get-type="gtk_check_button_get_type">
+      <callback name="draw_indicator" c:type="draw_indicator">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="check_button">
+            <type name="CheckButton" c:type="GtkCheckButton*"/>
+          </parameter>
+          <parameter name="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
-    <function name="color_selection_dialog_new"
-              c:identifier="gtk_color_selection_dialog_new">
+    <function name="check_button_new" c:identifier="gtk_check_button_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="check_button_new_with_label"
+              c:identifier="gtk_check_button_new_with_label">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="title">
+        <parameter name="label">
           <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_get_data" c:identifier="gtk_drag_get_data">
+    <function name="check_button_new_with_mnemonic"
+              c:identifier="gtk_check_button_new_with_mnemonic">
       <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="context">
-          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
-        </parameter>
-        <parameter name="target">
-          <type name="GdkAtom" c:type="GdkAtom"/>
-        </parameter>
-        <parameter name="time_">
-          <type name="uint32" c:type="guint32"/>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_finish" c:identifier="gtk_drag_finish">
+    <function name="check_button_get_props"
+              c:identifier="_gtk_check_button_get_props">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="context">
-          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
-        </parameter>
-        <parameter name="success">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="del">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="check_button">
+          <type name="CheckButton" c:type="GtkCheckButton*"/>
         </parameter>
-        <parameter name="time_">
-          <type name="uint32" c:type="guint32"/>
+        <parameter name="indicator_size">
+          <type name="int" c:type="gint*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="drag_get_source_widget"
-              c:identifier="gtk_drag_get_source_widget">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="context">
-          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+        <parameter name="indicator_spacing">
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_highlight" c:identifier="gtk_drag_highlight">
-      <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="drag_unhighlight" c:identifier="gtk_drag_unhighlight">
-      <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="drag_dest_set" c:identifier="gtk_drag_dest_set">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="DestDefaults" c:type="GtkDestDefaults"/>
-        </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>
-      </parameters>
-    </function>
-    <function name="drag_dest_set_proxy"
-              c:identifier="gtk_drag_dest_set_proxy">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
+    <class name="Item"
+           c:type="GtkItem"
+           parent="Bin"
+           glib:type-name="GtkItem"
+           glib:get-type="gtk_item_get_type">
+      <method name="select" c:identifier="gtk_item_select">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="item">
+            <type name="Item" c:type="GtkItem*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="deselect" c:identifier="gtk_item_deselect">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="item">
+            <type name="Item" c:type="GtkItem*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="toggle" c:identifier="gtk_item_toggle">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="item">
+            <type name="Item" c:type="GtkItem*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <callback name="select" c:type="select">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="item">
+            <type name="Item" c:type="GtkItem*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="deselect" c:type="deselect">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="item">
+            <type name="Item" c:type="GtkItem*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="toggle" c:type="toggle">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="item">
+            <type name="Item" c:type="GtkItem*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="select">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="deselect">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="toggle">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <class name="MenuItem"
+           c:type="GtkMenuItem"
+           parent="Item"
+           glib:type-name="GtkMenuItem"
+           glib:get-type="gtk_menu_item_get_type">
+      <method name="set_submenu" c:identifier="gtk_menu_item_set_submenu">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          </parameter>
+          <parameter name="submenu">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_submenu" c:identifier="gtk_menu_item_get_submenu">
+        <return-value>
           <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="proxy_window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="protocol">
-          <type name="GdkDragProtocol" c:type="GdkDragProtocol"/>
-        </parameter>
-        <parameter name="use_coordinates">
+        </return-value>
+        <parameters>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="select" c:identifier="gtk_menu_item_select">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="deselect" c:identifier="gtk_menu_item_deselect">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="activate" c:identifier="gtk_menu_item_activate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="toggle_size_request"
+              c:identifier="gtk_menu_item_toggle_size_request">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          </parameter>
+          <parameter name="requisition">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="toggle_size_allocate"
+              c:identifier="gtk_menu_item_toggle_size_allocate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          </parameter>
+          <parameter name="allocation">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_right_justified"
+              c:identifier="gtk_menu_item_set_right_justified">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          </parameter>
+          <parameter name="right_justified">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_right_justified"
+              c:identifier="gtk_menu_item_get_right_justified">
+        <return-value>
           <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drag_dest_unset" c:identifier="gtk_drag_dest_unset">
-      <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="drag_dest_find_target"
-              c:identifier="gtk_drag_dest_find_target">
-      <return-value>
-        <type name="GdkAtom" c:type="GdkAtom"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="context">
-          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
-        </parameter>
-        <parameter name="target_list">
-          <type name="TargetList" c:type="GtkTargetList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drag_dest_get_target_list"
-              c:identifier="gtk_drag_dest_get_target_list">
+        </return-value>
+        <parameters>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_accel_path"
+              c:identifier="gtk_menu_item_set_accel_path">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          </parameter>
+          <parameter name="accel_path" allow-none="1">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_submenu"
+              c:identifier="gtk_menu_item_remove_submenu">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="submenu">
+        <type name="Menu" c:type="GtkMenu"/>
+      </property>
+      <field name="hide_on_activate">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <callback name="activate" c:type="activate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="activate_item" c:type="activate_item">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="toggle_size_request" c:type="toggle_size_request">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          </parameter>
+          <parameter name="requisition">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="toggle_size_allocate" c:type="toggle_size_allocate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_item">
+            <type name="MenuItem" c:type="GtkMenuItem*"/>
+          </parameter>
+          <parameter name="allocation">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="activate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="activate-item">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="toggle-size-request">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="toggle-size-allocate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
+    <function name="menu_item_new" c:identifier="gtk_menu_item_new">
       <return-value>
-        <type name="TargetList" c:type="GtkTargetList*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="drag_dest_set_target_list"
-              c:identifier="gtk_drag_dest_set_target_list">
+    <function name="menu_item_new_with_label"
+              c:identifier="gtk_menu_item_new_with_label">
       <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="target_list">
-          <type name="TargetList" c:type="GtkTargetList*"/>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_dest_add_text_targets"
-              c:identifier="gtk_drag_dest_add_text_targets">
+    <function name="menu_item_new_with_mnemonic"
+              c:identifier="gtk_menu_item_new_with_mnemonic">
       <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="label">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_dest_add_image_targets"
-              c:identifier="gtk_drag_dest_add_image_targets">
+    <function name="menu_item_refresh_accel_path"
+              c:identifier="_gtk_menu_item_refresh_accel_path">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="menu_item">
+          <type name="MenuItem" c:type="GtkMenuItem*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="drag_dest_add_uri_targets"
-              c:identifier="gtk_drag_dest_add_uri_targets">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="prefix">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="drag_dest_set_track_motion"
-              c:identifier="gtk_drag_dest_set_track_motion">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="accel_group">
+          <type name="AccelGroup" c:type="GtkAccelGroup*"/>
         </parameter>
-        <parameter name="track_motion">
+        <parameter name="group_changed">
           <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_dest_get_track_motion"
-              c:identifier="gtk_drag_dest_get_track_motion">
+    <function name="menu_item_is_selectable"
+              c:identifier="_gtk_menu_item_is_selectable">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drag_source_set" c:identifier="gtk_drag_source_set">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
+        <parameter name="menu_item">
           <type name="Widget" c:type="GtkWidget*"/>
         </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>
       </parameters>
     </function>
-    <function name="drag_source_unset" c:identifier="gtk_drag_source_unset">
+    <function name="menu_item_popup_submenu"
+              c:identifier="_gtk_menu_item_popup_submenu">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
+        <parameter name="menu_item">
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="drag_source_get_target_list"
-              c:identifier="gtk_drag_source_get_target_list">
-      <return-value>
-        <type name="TargetList" c:type="GtkTargetList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="with_delay">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_source_set_target_list"
-              c:identifier="gtk_drag_source_set_target_list">
+    <function name="menu_item_popdown_submenu"
+              c:identifier="_gtk_menu_item_popdown_submenu">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
+        <parameter name="menu_item">
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="target_list">
-          <type name="TargetList" c:type="GtkTargetList*"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="drag_source_add_text_targets"
-              c:identifier="gtk_drag_source_add_text_targets">
-      <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="drag_source_add_image_targets"
-              c:identifier="gtk_drag_source_add_image_targets">
-      <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="drag_source_add_uri_targets"
-              c:identifier="gtk_drag_source_add_uri_targets">
-      <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="drag_source_set_icon"
-              c:identifier="gtk_drag_source_set_icon">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="colormap">
-          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
-        </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask" allow-none="1">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drag_source_set_icon_pixbuf"
-              c:identifier="gtk_drag_source_set_icon_pixbuf">
+    <class name="CheckMenuItem"
+           c:type="GtkCheckMenuItem"
+           parent="MenuItem"
+           glib:type-name="GtkCheckMenuItem"
+           glib:get-type="gtk_check_menu_item_get_type">
+      <method name="set_active" c:identifier="gtk_check_menu_item_set_active">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="check_menu_item">
+            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
+          </parameter>
+          <parameter name="is_active">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_active" c:identifier="gtk_check_menu_item_get_active">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="check_menu_item">
+            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="toggled" c:identifier="gtk_check_menu_item_toggled">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="check_menu_item">
+            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_inconsistent"
+              c:identifier="gtk_check_menu_item_set_inconsistent">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="check_menu_item">
+            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
+          </parameter>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_inconsistent"
+              c:identifier="gtk_check_menu_item_get_inconsistent">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="check_menu_item">
+            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_draw_as_radio"
+              c:identifier="gtk_check_menu_item_set_draw_as_radio">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="check_menu_item">
+            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
+          </parameter>
+          <parameter name="draw_as_radio">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_draw_as_radio"
+              c:identifier="gtk_check_menu_item_get_draw_as_radio">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="check_menu_item">
+            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_show_toggle"
+              c:identifier="gtk_check_menu_item_set_show_toggle">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_item">
+            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
+          </parameter>
+          <parameter name="always">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="active">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="inconsistent">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="draw-as-radio">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="toggled" c:type="toggled">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="check_menu_item">
+            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="draw_indicator" c:type="draw_indicator">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="check_menu_item">
+            <type name="CheckMenuItem" c:type="GtkCheckMenuItem*"/>
+          </parameter>
+          <parameter name="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="toggled">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="check_menu_item_new"
+              c:identifier="gtk_check_menu_item_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="pixbuf">
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="drag_source_set_icon_stock"
-              c:identifier="gtk_drag_source_set_icon_stock">
+    <function name="check_menu_item_new_with_label"
+              c:identifier="gtk_check_menu_item_new_with_label">
       <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="stock_id">
+        <parameter name="label">
           <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_source_set_icon_name"
-              c:identifier="gtk_drag_source_set_icon_name">
+    <function name="check_menu_item_new_with_mnemonic"
+              c:identifier="gtk_check_menu_item_new_with_mnemonic">
       <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="icon_name">
+        <parameter name="label">
           <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="drag_begin" c:identifier="gtk_drag_begin">
-      <return-value>
-        <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="targets">
-          <type name="TargetList" c:type="GtkTargetList*"/>
-        </parameter>
-        <parameter name="actions">
-          <type name="GdkDragAction" c:type="GdkDragAction"/>
-        </parameter>
-        <parameter name="button">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="event">
-          <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drag_set_icon_widget"
-              c:identifier="gtk_drag_set_icon_widget">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="context">
-          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
-        </parameter>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="hot_x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="hot_y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drag_set_icon_pixmap"
-              c:identifier="gtk_drag_set_icon_pixmap">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="context">
-          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
-        </parameter>
-        <parameter name="colormap">
-          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
-        </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-        <parameter name="hot_x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="hot_y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drag_set_icon_pixbuf"
-              c:identifier="gtk_drag_set_icon_pixbuf">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="context">
-          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
-        </parameter>
-        <parameter name="pixbuf">
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </parameter>
-        <parameter name="hot_x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="hot_y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drag_set_icon_stock"
-              c:identifier="gtk_drag_set_icon_stock">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="context">
-          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
-        </parameter>
-        <parameter name="stock_id">
+    <glib:boxed c:type="GtkTextIter"
+                glib:name="TextIter"
+                glib:type-name="GtkTextIter"
+                glib:get-type="gtk_text_iter_get_type">
+      <method name="get_offset" c:identifier="gtk_text_iter_get_offset">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_line" c:identifier="gtk_text_iter_get_line">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_line_offset"
+              c:identifier="gtk_text_iter_get_line_offset">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_line_index"
+              c:identifier="gtk_text_iter_get_line_index">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_visible_line_offset"
+              c:identifier="gtk_text_iter_get_visible_line_offset">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_visible_line_index"
+              c:identifier="gtk_text_iter_get_visible_line_index">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_char" c:identifier="gtk_text_iter_get_char">
+        <return-value>
+          <type name="GLib.unichar" c:type="gunichar"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_slice" c:identifier="gtk_text_iter_get_slice">
+        <return-value>
           <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="hot_x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="hot_y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drag_set_icon_name" c:identifier="gtk_drag_set_icon_name">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="context">
-          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
-        </parameter>
-        <parameter name="icon_name">
+        </return-value>
+        <parameters>
+          <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_text" c:identifier="gtk_text_iter_get_text">
+        <return-value>
           <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="hot_x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="hot_y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drag_set_icon_default"
-              c:identifier="gtk_drag_set_icon_default">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="context">
-          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drag_check_threshold"
-              c:identifier="gtk_drag_check_threshold">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="start_x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="start_y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="current_x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="current_y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drag_source_handle_event"
-              c:identifier="_gtk_drag_source_handle_event">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="event">
-          <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drag_dest_handle_event"
-              c:identifier="_gtk_drag_dest_handle_event">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="toplevel">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="event">
-          <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="drag_set_default_icon"
-              c:identifier="gtk_drag_set_default_icon">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="colormap">
-          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
-        </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-        <parameter name="hot_x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="hot_y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkEditable" c:type="GtkEditable"/>
-    <interface name="Editable"
-               c:type="GtkEditable"
-               glib:type-name="GtkEditable"
-               glib:get-type="gtk_editable_get_type">
-      <callback name="insert_text">
+        </return-value>
+        <parameters>
+          <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_visible_slice"
+              c:identifier="gtk_text_iter_get_visible_slice">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <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_visible_text"
+              c:identifier="gtk_text_iter_get_visible_text">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <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_pixbuf" c:identifier="gtk_text_iter_get_pixbuf">
+        <return-value>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_marks" c:identifier="gtk_text_iter_get_marks">
+        <return-value>
+          <type name="GLib.SList" c:type="GSList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_child_anchor"
+              c:identifier="gtk_text_iter_get_child_anchor">
+        <return-value>
+          <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_toggled_tags"
+              c:identifier="gtk_text_iter_get_toggled_tags">
+        <return-value>
+          <type name="GLib.SList" c:type="GSList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="toggled_on">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="begins_tag" c:identifier="gtk_text_iter_begins_tag">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="tag" allow-none="1">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="ends_tag" c:identifier="gtk_text_iter_ends_tag">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="tag" allow-none="1">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="toggles_tag" c:identifier="gtk_text_iter_toggles_tag">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="tag" allow-none="1">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="has_tag" c:identifier="gtk_text_iter_has_tag">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_tags" c:identifier="gtk_text_iter_get_tags">
+        <return-value>
+          <type name="GLib.SList" c:type="GSList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="editable" c:identifier="gtk_text_iter_editable">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="default_setting">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="can_insert" c:identifier="gtk_text_iter_can_insert">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="default_editability">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="starts_word" c:identifier="gtk_text_iter_starts_word">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="ends_word" c:identifier="gtk_text_iter_ends_word">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="inside_word" c:identifier="gtk_text_iter_inside_word">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="starts_sentence"
+              c:identifier="gtk_text_iter_starts_sentence">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="ends_sentence" c:identifier="gtk_text_iter_ends_sentence">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="inside_sentence"
+              c:identifier="gtk_text_iter_inside_sentence">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="starts_line" c:identifier="gtk_text_iter_starts_line">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="ends_line" c:identifier="gtk_text_iter_ends_line">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="is_cursor_position"
+              c:identifier="gtk_text_iter_is_cursor_position">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_chars_in_line"
+              c:identifier="gtk_text_iter_get_chars_in_line">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_bytes_in_line"
+              c:identifier="gtk_text_iter_get_bytes_in_line">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_attributes"
+              c:identifier="gtk_text_iter_get_attributes">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="values">
+            <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_language" c:identifier="gtk_text_iter_get_language">
+        <return-value>
+          <type name="Pango.Language" c:type="PangoLanguage*"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="is_end" c:identifier="gtk_text_iter_is_end">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="is_start" c:identifier="gtk_text_iter_is_start">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_char" c:identifier="gtk_text_iter_forward_char">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_char" c:identifier="gtk_text_iter_backward_char">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_chars" c:identifier="gtk_text_iter_forward_chars">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_chars"
+              c:identifier="gtk_text_iter_backward_chars">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_line" c:identifier="gtk_text_iter_forward_line">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_line" c:identifier="gtk_text_iter_backward_line">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_lines" c:identifier="gtk_text_iter_forward_lines">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_lines"
+              c:identifier="gtk_text_iter_backward_lines">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_word_end"
+              c:identifier="gtk_text_iter_forward_word_end">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_word_start"
+              c:identifier="gtk_text_iter_backward_word_start">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_word_ends"
+              c:identifier="gtk_text_iter_forward_word_ends">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_word_starts"
+              c:identifier="gtk_text_iter_backward_word_starts">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_visible_line"
+              c:identifier="gtk_text_iter_forward_visible_line">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_visible_line"
+              c:identifier="gtk_text_iter_backward_visible_line">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_visible_lines"
+              c:identifier="gtk_text_iter_forward_visible_lines">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_visible_lines"
+              c:identifier="gtk_text_iter_backward_visible_lines">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_visible_word_end"
+              c:identifier="gtk_text_iter_forward_visible_word_end">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_visible_word_start"
+              c:identifier="gtk_text_iter_backward_visible_word_start">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_visible_word_ends"
+              c:identifier="gtk_text_iter_forward_visible_word_ends">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_visible_word_starts"
+              c:identifier="gtk_text_iter_backward_visible_word_starts">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_sentence_end"
+              c:identifier="gtk_text_iter_forward_sentence_end">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_sentence_start"
+              c:identifier="gtk_text_iter_backward_sentence_start">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_sentence_ends"
+              c:identifier="gtk_text_iter_forward_sentence_ends">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_sentence_starts"
+              c:identifier="gtk_text_iter_backward_sentence_starts">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_cursor_position"
+              c:identifier="gtk_text_iter_forward_cursor_position">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_cursor_position"
+              c:identifier="gtk_text_iter_backward_cursor_position">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_cursor_positions"
+              c:identifier="gtk_text_iter_forward_cursor_positions">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_cursor_positions"
+              c:identifier="gtk_text_iter_backward_cursor_positions">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_visible_cursor_position"
+              c:identifier="gtk_text_iter_forward_visible_cursor_position">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_visible_cursor_position"
+              c:identifier="gtk_text_iter_backward_visible_cursor_position">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_visible_cursor_positions"
+              c:identifier="gtk_text_iter_forward_visible_cursor_positions">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_visible_cursor_positions"
+              c:identifier="gtk_text_iter_backward_visible_cursor_positions">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_offset" c:identifier="gtk_text_iter_set_offset">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="char_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_line" c:identifier="gtk_text_iter_set_line">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="line_number">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_line_offset"
+              c:identifier="gtk_text_iter_set_line_offset">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="char_on_line">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_line_index"
+              c:identifier="gtk_text_iter_set_line_index">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="byte_on_line">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_to_end"
+              c:identifier="gtk_text_iter_forward_to_end">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_to_line_end"
+              c:identifier="gtk_text_iter_forward_to_line_end">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_visible_line_offset"
+              c:identifier="gtk_text_iter_set_visible_line_offset">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="char_on_line">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_visible_line_index"
+              c:identifier="gtk_text_iter_set_visible_line_index">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="byte_on_line">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_to_tag_toggle"
+              c:identifier="gtk_text_iter_forward_to_tag_toggle">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="tag" allow-none="1">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_to_tag_toggle"
+              c:identifier="gtk_text_iter_backward_to_tag_toggle">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="tag" allow-none="1">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_find_char"
+              c:identifier="gtk_text_iter_forward_find_char">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="pred">
+            <type name="TextCharPredicate" c:type="GtkTextCharPredicate"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="limit">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_find_char"
+              c:identifier="gtk_text_iter_backward_find_char">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="pred">
+            <type name="TextCharPredicate" c:type="GtkTextCharPredicate"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="limit">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="forward_search"
+              c:identifier="gtk_text_iter_forward_search">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="str">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="TextSearchFlags" c:type="GtkTextSearchFlags"/>
+          </parameter>
+          <parameter name="match_start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="match_end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="limit" allow-none="1">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="backward_search"
+              c:identifier="gtk_text_iter_backward_search">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="str">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="TextSearchFlags" c:type="GtkTextSearchFlags"/>
+          </parameter>
+          <parameter name="match_start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="match_end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="limit" allow-none="1">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="equal" c:identifier="gtk_text_iter_equal">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="lhs">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="rhs">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="compare" c:identifier="gtk_text_iter_compare">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="lhs">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="rhs">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="in_range" c:identifier="gtk_text_iter_in_range">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <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>
+        </parameters>
+      </method>
+      <method name="order" c:identifier="gtk_text_iter_order">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="first">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="second">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </glib:boxed>
+    <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="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          </parameter>
+          <parameter name="tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove" c:identifier="gtk_text_tag_table_remove">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          </parameter>
+          <parameter name="tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="foreach" c:identifier="gtk_text_tag_table_foreach">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="TextTagTableForeach" c:type="GtkTextTagTableForeach"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_size" c:identifier="gtk_text_tag_table_get_size">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <callback name="tag_changed" c:type="tag_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </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>
+        </parameters>
+      </callback>
+      <callback name="tag_added" c:type="tag_added">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          </parameter>
+          <parameter name="tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="tag_removed" c:type="tag_removed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          </parameter>
+          <parameter name="tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_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="object">
+            <type name="TextTag" c:type="GtkTextTag"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="tag-added">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="TextTag" c:type="GtkTextTag"/>
+          </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>
+        </parameters>
+      </glib:signal>
+    </class>
+    <glib:boxed c:type="GtkTextAttributes"
+                glib:name="TextAttributes"
+                glib:type-name="GtkTextAttributes"
+                glib:get-type="gtk_text_attributes_get_type">
+    </glib:boxed>
+    <class name="TextTag"
+           c:type="GtkTextTag"
+           parent="GObject.Object"
+           glib:type-name="GtkTextTag"
+           glib:get-type="gtk_text_tag_get_type">
+      <constructor name="new" c:identifier="gtk_text_tag_new">
+        <return-value>
+          <type name="TextTag" c:type="GtkTextTag*"/>
+        </return-value>
+        <parameters>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="table_lookup"
+                   c:identifier="gtk_text_tag_table_lookup">
+        <return-value>
+          <type name="TextTag" c:type="GtkTextTag*"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="get_priority" c:identifier="gtk_text_tag_get_priority">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_priority" c:identifier="gtk_text_tag_set_priority">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+          <parameter name="priority">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="event" c:identifier="gtk_text_tag_event">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+          <parameter name="event_object">
+            <type name="GObject.Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.Event" c:type="GdkEvent*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="background">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="foreground">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="background-gdk">
+        <type name="Gdk.Color" c:type="GdkColor"/>
+      </property>
+      <property name="foreground-gdk">
+        <type name="Gdk.Color" c:type="GdkColor"/>
+      </property>
+      <property name="background-stipple">
+        <type name="Gdk.Pixmap" c:type="GdkPixmap"/>
+      </property>
+      <property name="foreground-stipple">
+        <type name="Gdk.Pixmap" c:type="GdkPixmap"/>
+      </property>
+      <property name="font">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="font-desc">
+        <type name="Pango.FontDescription" c:type="PangoFontDescription"/>
+      </property>
+      <property name="family">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="style">
+        <type name="Pango.Style" c:type="PangoStyle"/>
+      </property>
+      <property name="variant">
+        <type name="Pango.Variant" c:type="PangoVariant"/>
+      </property>
+      <property name="weight">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="stretch">
+        <type name="Pango.Stretch" c:type="PangoStretch"/>
+      </property>
+      <property name="size">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="size-points">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="scale">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="pixels-above-lines">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="pixels-below-lines">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="pixels-inside-wrap">
+        <type name="int" 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="direction">
+        <type name="TextDirection" c:type="GtkTextDirection"/>
+      </property>
+      <property name="left-margin">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="indent">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="strikethrough">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="right-margin">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="underline">
+        <type name="Pango.Underline" c:type="PangoUnderline"/>
+      </property>
+      <property name="rise">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="background-full-height">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="language">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="tabs">
+        <type name="Pango.TabArray" c:type="PangoTabArray"/>
+      </property>
+      <property name="invisible">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="paragraph-background">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="paragraph-background-gdk">
+        <type name="Gdk.Color" c:type="GdkColor"/>
+      </property>
+      <property name="accumulative-margin">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="background-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="foreground-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="background-stipple-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="foreground-stipple-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="family-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="style-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="variant-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="weight-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="stretch-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="size-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="scale-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="pixels-above-lines-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="pixels-below-lines-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="pixels-inside-wrap-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="editable-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="wrap-mode-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="justification-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="left-margin-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="indent-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="strikethrough-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="right-margin-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="underline-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="rise-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="background-full-height-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="language-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="tabs-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="invisible-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="paragraph-background-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="event" c:type="event">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+          <parameter name="event_object">
+            <type name="GObject.Object" c:type="GObject*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.Event" c:type="GdkEvent*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="event">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GObject.Object" c:type="GObject"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="TextIter" c:type="GtkTextIter"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
+    <record name="TextAppearance" c:type="GtkTextAppearance">
+      <field name="bg_color">
+        <type name="Gdk.Color" c:type="GdkColor"/>
+      </field>
+      <field name="fg_color">
+        <type name="Gdk.Color" c:type="GdkColor"/>
+      </field>
+      <field name="bg_stipple">
+        <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
+      </field>
+      <field name="fg_stipple">
+        <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
+      </field>
+      <field name="rise">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="padding1">
+        <type name="any" c:type="gpointer"/>
+      </field>
+      <field name="underline">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="strikethrough">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="draw_bg">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="inside_selection">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="is_text">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="pad1">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="pad2">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="pad3">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="pad4">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </record>
+    <function name="text_attributes_new"
+              c:identifier="gtk_text_attributes_new">
+      <return-value>
+        <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+      </return-value>
+    </function>
+    <function name="text_attributes_copy"
+              c:identifier="gtk_text_attributes_copy">
+      <return-value>
+        <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+      </return-value>
+      <parameters>
+        <parameter name="src">
+          <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_attributes_copy_values"
+              c:identifier="gtk_text_attributes_copy_values">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="src">
+          <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+        </parameter>
+        <parameter name="dest">
+          <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_attributes_unref"
+              c:identifier="gtk_text_attributes_unref">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="values">
+          <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_attributes_ref"
+              c:identifier="gtk_text_attributes_ref">
+      <return-value>
+        <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+      </return-value>
+      <parameters>
+        <parameter name="values">
+          <type name="TextAttributes" c:type="GtkTextAttributes*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="TextChildAnchor"
+           c:type="GtkTextChildAnchor"
+           parent="GObject.Object"
+           glib:type-name="GtkTextChildAnchor"
+           glib:get-type="gtk_text_child_anchor_get_type">
+      <constructor name="new" c:identifier="gtk_text_child_anchor_new">
+        <return-value>
+          <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+        </return-value>
+      </constructor>
+      <method name="get_widgets"
+              c:identifier="gtk_text_child_anchor_get_widgets">
+        <return-value>
+          <type name="GLib.List" c:type="GList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="anchor">
+            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_deleted"
+              c:identifier="gtk_text_child_anchor_get_deleted">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="anchor">
+            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <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="table">
+            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="get_line_count"
+              c:identifier="gtk_text_buffer_get_line_count">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_char_count"
+              c:identifier="gtk_text_buffer_get_char_count">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_tag_table"
+              c:identifier="gtk_text_buffer_get_tag_table">
+        <return-value>
+          <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_text" c:identifier="gtk_text_buffer_set_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </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="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert" c:identifier="gtk_text_buffer_insert">
+        <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="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_at_cursor"
+              c:identifier="gtk_text_buffer_insert_at_cursor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </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="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_interactive"
+              c:identifier="gtk_text_buffer_insert_interactive">
+        <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>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="len">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="default_editable">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_interactive_at_cursor"
+              c:identifier="gtk_text_buffer_insert_interactive_at_cursor">
+        <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="int" c:type="gint"/>
+          </parameter>
+          <parameter name="default_editable">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_range" c:identifier="gtk_text_buffer_insert_range">
+        <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="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_range_interactive"
+              c:identifier="gtk_text_buffer_insert_range_interactive">
+        <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>
+          <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="insert_with_tags"
+              c:identifier="gtk_text_buffer_insert_with_tags">
+        <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="int" c:type="gint"/>
+          </parameter>
+          <parameter name="first_tag">
+            <type name="TextTag" c:type="GtkTextTag*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_with_tags_by_name"
+              c:identifier="gtk_text_buffer_insert_with_tags_by_name">
+        <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="int" c:type="gint"/>
+          </parameter>
+          <parameter name="first_tag_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="delete" c:identifier="gtk_text_buffer_delete">
+        <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>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="delete_interactive"
+              c:identifier="gtk_text_buffer_delete_interactive">
+        <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>
+        </parameters>
+      </method>
+      <method name="backspace" c:identifier="gtk_text_buffer_backspace">
+        <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>
+          <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="get_text" c:identifier="gtk_text_buffer_get_text">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </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>
+          <parameter name="include_hidden_chars">
+            <type name="boolean" c:type="gboolean"/>
+          </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>
+          <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="insert_pixbuf"
+              c:identifier="gtk_text_buffer_insert_pixbuf">
+        <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="pixbuf">
+            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_child_anchor"
+              c:identifier="gtk_text_buffer_insert_child_anchor">
+        <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="anchor">
+            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="create_child_anchor"
+              c:identifier="gtk_text_buffer_create_child_anchor">
+        <return-value>
+          <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_mark" c:identifier="gtk_text_buffer_add_mark">
+        <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>
+          <parameter name="where">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="create_mark" c:identifier="gtk_text_buffer_create_mark">
+        <return-value>
+          <type name="TextMark" c:type="GtkTextMark*"/>
+        </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>
+          <parameter name="left_gravity">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="move_mark" c:identifier="gtk_text_buffer_move_mark">
+        <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>
+          <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>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_mark" c:identifier="gtk_text_buffer_get_mark">
+        <return-value>
+          <type name="TextMark" c:type="GtkTextMark*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </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>
+        <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>
+        </parameters>
+      </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>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_insert" c:identifier="gtk_text_buffer_get_insert">
+        <return-value>
+          <type name="TextMark" c:type="GtkTextMark*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_selection_bound"
+              c:identifier="gtk_text_buffer_get_selection_bound">
+        <return-value>
+          <type name="TextMark" c:type="GtkTextMark*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="place_cursor" c:identifier="gtk_text_buffer_place_cursor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="where">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="select_range" c:identifier="gtk_text_buffer_select_range">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="ins">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="bound">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="apply_tag" c:identifier="gtk_text_buffer_apply_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>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_tag" c:identifier="gtk_text_buffer_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>
+          <parameter name="start">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </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>
+        <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>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </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>
+        <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>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </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="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="create_tag" c:identifier="gtk_text_buffer_create_tag">
+        <return-value>
+          <type name="TextTag" c:type="GtkTextTag*"/>
+        </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>
+        </parameters>
+      </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="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="line_number">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="char_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </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="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="line_number">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="byte_index">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </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="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="char_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </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="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="line_number">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </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="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </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="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_bounds" c:identifier="gtk_text_buffer_get_bounds">
+        <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>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_iter_at_mark"
+              c:identifier="gtk_text_buffer_get_iter_at_mark">
+        <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="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">
+        <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="anchor">
+            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_modified" c:identifier="gtk_text_buffer_get_modified">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_modified" c:identifier="gtk_text_buffer_set_modified">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </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">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <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="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <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="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="cut_clipboard"
+              c:identifier="gtk_text_buffer_cut_clipboard">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <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="copy_clipboard"
+              c:identifier="gtk_text_buffer_copy_clipboard">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="paste_clipboard"
+              c:identifier="gtk_text_buffer_paste_clipboard">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="clipboard">
+            <type name="Clipboard" c:type="GtkClipboard*"/>
+          </parameter>
+          <parameter name="override_location" allow-none="1">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </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">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </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>
+        </parameters>
+      </method>
+      <method name="delete_selection"
+              c:identifier="gtk_text_buffer_delete_selection">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </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="begin_user_action"
+              c:identifier="gtk_text_buffer_begin_user_action">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <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>
+        </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>
+        </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="register_serialize_format"
+              c:identifier="gtk_text_buffer_register_serialize_format">
+        <return-value>
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </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="TextBufferSerializeFunc"
+                  c:type="GtkTextBufferSerializeFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="user_data_destroy">
+            <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="register_serialize_tagset"
+              c:identifier="gtk_text_buffer_register_serialize_tagset">
+        <return-value>
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </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>
+        </parameters>
+      </method>
+      <method name="register_deserialize_format"
+              c:identifier="gtk_text_buffer_register_deserialize_format">
+        <return-value>
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </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="TextBufferDeserializeFunc"
+                  c:type="GtkTextBufferDeserializeFunc"/>
+          </parameter>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="user_data_destroy">
+            <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="register_deserialize_tagset"
+              c:identifier="gtk_text_buffer_register_deserialize_tagset">
+        <return-value>
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </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>
+        </parameters>
+      </method>
+      <method name="unregister_serialize_format"
+              c:identifier="gtk_text_buffer_unregister_serialize_format">
+        <return-value>
+          <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>
+        </parameters>
+      </method>
+      <method name="unregister_deserialize_format"
+              c:identifier="gtk_text_buffer_unregister_deserialize_format">
+        <return-value>
+          <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>
+        </parameters>
+      </method>
+      <method name="deserialize_set_can_create_tags"
+              c:identifier="gtk_text_buffer_deserialize_set_can_create_tags">
+        <return-value>
+          <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>
+          <parameter name="can_create_tags">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <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="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="format">
+            <type name="GdkAtom" c:type="GdkAtom"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_serialize_formats"
+              c:identifier="gtk_text_buffer_get_serialize_formats">
+        <return-value>
+          <type name="GdkAtom" c:type="GdkAtom*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="n_formats">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_deserialize_formats"
+              c:identifier="gtk_text_buffer_get_deserialize_formats">
+        <return-value>
+          <type name="GdkAtom" c:type="GdkAtom*"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+          <parameter name="n_formats">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="serialize" c:identifier="gtk_text_buffer_serialize">
+        <return-value>
+          <type name="uint8" 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="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="size_t" c:type="gsize*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="deserialize" c:identifier="gtk_text_buffer_deserialize">
+        <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="format">
+            <type name="GdkAtom" c:type="GdkAtom"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="uint8" c:type="guint8*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="size_t" c:type="gsize"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </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="int" 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" c:type="insert_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </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="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="insert_pixbuf" c:type="insert_pixbuf">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </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="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="insert_child_anchor" c:type="insert_child_anchor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </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="anchor">
+            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="delete_range" c:type="delete_range">
+        <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>
+          <parameter name="end">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="changed" c:type="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="modified_changed" c:type="modified_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="mark_set" c:type="mark_set">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <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>
+      </callback>
+      <callback name="mark_deleted" c:type="mark_deleted">
+        <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>
+        </parameters>
+      </callback>
+      <callback name="apply_tag" c:type="apply_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>
+          <parameter name="start_char">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end_char">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="remove_tag" c:type="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>
+          <parameter name="start_char">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+          <parameter name="end_char">
+            <type name="TextIter" c:type="GtkTextIter*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="begin_user_action" c:type="begin_user_action">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="end_user_action" c:type="end_user_action">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="buffer">
+            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved5" c:type="_gtk_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved6" c:type="_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>
+          <parameter name="p0">
+            <type name="string" c:type="gchararray"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="insert-pixbuf">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="TextIter" c:type="GtkTextIter"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="insert-child-anchor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="TextIter" c:type="GtkTextIter"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="TextChildAnchor" c:type="GtkTextChildAnchor"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="delete-range">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="TextIter" c:type="GtkTextIter"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="TextIter" c:type="GtkTextIter"/>
+          </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">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="TextIter" c:type="GtkTextIter"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="TextMark" c:type="GtkTextMark"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="mark-deleted">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="TextMark" c:type="GtkTextMark"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="apply-tag">
+        <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>
+          <parameter name="p1">
+            <type name="TextIter" c:type="GtkTextIter"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="remove-tag">
+        <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>
+          <parameter name="p1">
+            <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_iter_get_buffer"
+              c:identifier="gtk_text_iter_get_buffer">
+      <return-value>
+        <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+      </return-value>
+      <parameters>
+        <parameter name="iter">
+          <type name="TextIter" c:type="GtkTextIter*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_iter_copy" c:identifier="gtk_text_iter_copy">
+      <return-value>
+        <type name="TextIter" c:type="GtkTextIter*"/>
+      </return-value>
+      <parameters>
+        <parameter name="iter">
+          <type name="TextIter" c:type="GtkTextIter*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_iter_free" c:identifier="gtk_text_iter_free">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="iter">
+          <type name="TextIter" c:type="GtkTextIter*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <callback name="TextCharPredicate" c:type="GtkTextCharPredicate">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="ch">
+          <type name="GLib.unichar" c:type="gunichar"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <glib:boxed c:type="GtkTargetList"
+                glib:name="TargetList"
+                glib:type-name="GtkTargetList"
+                glib:get-type="gtk_target_list_get_type">
+    </glib:boxed>
+    <record name="TargetEntry" c:type="GtkTargetEntry">
+      <field name="target">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="flags">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="info">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </record>
+    <record name="TargetPair" c:type="GtkTargetPair">
+      <field name="target">
+        <type name="GdkAtom" c:type="GdkAtom"/>
+      </field>
+      <field name="flags">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="info">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </record>
+    <function name="target_list_new" c:identifier="gtk_target_list_new">
+      <return-value>
+        <type name="TargetList" c:type="GtkTargetList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="targets">
+          <type name="TargetEntry" c:type="GtkTargetEntry*"/>
+        </parameter>
+        <parameter name="ntargets">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="target_list_ref" c:identifier="gtk_target_list_ref">
+      <return-value>
+        <type name="TargetList" c:type="GtkTargetList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="TargetList" c:type="GtkTargetList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="target_list_unref" c:identifier="gtk_target_list_unref">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="TargetList" c:type="GtkTargetList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="target_list_add" c:identifier="gtk_target_list_add">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="TargetList" c:type="GtkTargetList*"/>
+        </parameter>
+        <parameter name="target">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="info">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="target_list_add_text_targets"
+              c:identifier="gtk_target_list_add_text_targets">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="TargetList" c:type="GtkTargetList*"/>
+        </parameter>
+        <parameter name="info">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="target_list_add_rich_text_targets"
+              c:identifier="gtk_target_list_add_rich_text_targets">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="TargetList" c:type="GtkTargetList*"/>
+        </parameter>
+        <parameter name="info">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="deserializable">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+        <parameter name="buffer">
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="target_list_add_image_targets"
+              c:identifier="gtk_target_list_add_image_targets">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="TargetList" c:type="GtkTargetList*"/>
+        </parameter>
+        <parameter name="info">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="writable">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="target_list_add_uri_targets"
+              c:identifier="gtk_target_list_add_uri_targets">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="TargetList" c:type="GtkTargetList*"/>
+        </parameter>
+        <parameter name="info">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="target_list_add_table"
+              c:identifier="gtk_target_list_add_table">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="TargetList" c:type="GtkTargetList*"/>
+        </parameter>
+        <parameter name="targets">
+          <type name="TargetEntry" c:type="GtkTargetEntry*"/>
+        </parameter>
+        <parameter name="ntargets">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="target_list_remove" c:identifier="gtk_target_list_remove">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="TargetList" c:type="GtkTargetList*"/>
+        </parameter>
+        <parameter name="target">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="target_list_find" c:identifier="gtk_target_list_find">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="TargetList" c:type="GtkTargetList*"/>
+        </parameter>
+        <parameter name="target">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+        <parameter name="info">
+          <type name="uint" c:type="guint*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="target_table_new_from_list"
+              c:identifier="gtk_target_table_new_from_list">
+      <return-value>
+        <type name="TargetEntry" c:type="GtkTargetEntry*"/>
+      </return-value>
+      <parameters>
+        <parameter name="list">
+          <type name="TargetList" c:type="GtkTargetList*"/>
+        </parameter>
+        <parameter name="n_targets">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="target_table_free" c:identifier="gtk_target_table_free">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="targets">
+          <type name="TargetEntry" c:type="GtkTargetEntry*"/>
+        </parameter>
+        <parameter name="n_targets">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_owner_set"
+              c:identifier="gtk_selection_owner_set">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="selection">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+        <parameter name="time_">
+          <type name="uint32" c:type="guint32"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_owner_set_for_display"
+              c:identifier="gtk_selection_owner_set_for_display">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="display">
+          <type name="Gdk.Display" c:type="GdkDisplay*"/>
+        </parameter>
+        <parameter name="widget" allow-none="1">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="selection">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+        <parameter name="time_">
+          <type name="uint32" c:type="guint32"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_add_target"
+              c:identifier="gtk_selection_add_target">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="selection">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+        <parameter name="target">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+        <parameter name="info">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_add_targets"
+              c:identifier="gtk_selection_add_targets">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="selection">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+        <parameter name="targets">
+          <type name="TargetEntry" c:type="GtkTargetEntry*"/>
+        </parameter>
+        <parameter name="ntargets">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_clear_targets"
+              c:identifier="gtk_selection_clear_targets">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="selection">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_convert" c:identifier="gtk_selection_convert">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="selection">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+        <parameter name="target">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+        <parameter name="time_">
+          <type name="uint32" c:type="guint32"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_data_set" c:identifier="gtk_selection_data_set">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        </parameter>
+        <parameter name="type">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+        <parameter name="format">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="data">
+          <type name="GLib.uchar" c:type="guchar*"/>
+        </parameter>
+        <parameter name="length">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_data_set_text"
+              c:identifier="gtk_selection_data_set_text">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        </parameter>
+        <parameter name="str">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="len">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_data_get_text"
+              c:identifier="gtk_selection_data_get_text">
+      <return-value>
+        <type name="GLib.uchar" c:type="guchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_data_set_pixbuf"
+              c:identifier="gtk_selection_data_set_pixbuf">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        </parameter>
+        <parameter name="pixbuf">
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_data_get_pixbuf"
+              c:identifier="gtk_selection_data_get_pixbuf">
+      <return-value>
+        <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+      </return-value>
+      <parameters>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_data_set_uris"
+              c:identifier="gtk_selection_data_set_uris">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        </parameter>
+        <parameter name="uris">
+          <type name="GLib.char" c:type="gchar**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_data_get_uris"
+              c:identifier="gtk_selection_data_get_uris">
+      <return-value>
+        <type name="GLib.char" c:type="gchar**"/>
+      </return-value>
+      <parameters>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_data_get_targets"
+              c:identifier="gtk_selection_data_get_targets">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        </parameter>
+        <parameter name="targets">
+          <type name="GdkAtom" c:type="GdkAtom**"/>
+        </parameter>
+        <parameter name="n_atoms">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_data_targets_include_text"
+              c:identifier="gtk_selection_data_targets_include_text">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_data_targets_include_rich_text"
+              c:identifier="gtk_selection_data_targets_include_rich_text">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        </parameter>
+        <parameter name="buffer">
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_data_targets_include_image"
+              c:identifier="gtk_selection_data_targets_include_image">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        </parameter>
+        <parameter name="writable">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_data_targets_include_uri"
+              c:identifier="gtk_selection_data_targets_include_uri">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="targets_include_text"
+              c:identifier="gtk_targets_include_text">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="targets">
+          <type name="GdkAtom" c:type="GdkAtom*"/>
+        </parameter>
+        <parameter name="n_targets">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="targets_include_rich_text"
+              c:identifier="gtk_targets_include_rich_text">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="targets">
+          <type name="GdkAtom" c:type="GdkAtom*"/>
+        </parameter>
+        <parameter name="n_targets">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="buffer">
+          <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="targets_include_image"
+              c:identifier="gtk_targets_include_image">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="targets">
+          <type name="GdkAtom" c:type="GdkAtom*"/>
+        </parameter>
+        <parameter name="n_targets">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="writable">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="targets_include_uri"
+              c:identifier="gtk_targets_include_uri">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="targets">
+          <type name="GdkAtom" c:type="GdkAtom*"/>
+        </parameter>
+        <parameter name="n_targets">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_remove_all"
+              c:identifier="gtk_selection_remove_all">
+      <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="selection_clear" c:identifier="gtk_selection_clear">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="event">
+          <type name="Gdk.EventSelection" c:type="GdkEventSelection*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_request" c:identifier="_gtk_selection_request">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="event">
+          <type name="Gdk.EventSelection" c:type="GdkEventSelection*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_incr_event"
+              c:identifier="_gtk_selection_incr_event">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="event">
+          <type name="Gdk.EventProperty" c:type="GdkEventProperty*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_notify" c:identifier="_gtk_selection_notify">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="event">
+          <type name="Gdk.EventSelection" c:type="GdkEventSelection*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="selection_property_notify"
+              c:identifier="_gtk_selection_property_notify">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="event">
+          <type name="Gdk.EventProperty" c:type="GdkEventProperty*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <callback name="ClipboardReceivedFunc" c:type="GtkClipboardReceivedFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clipboard">
+          <type name="Clipboard" c:type="GtkClipboard*"/>
+        </parameter>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="ClipboardTextReceivedFunc"
+              c:type="GtkClipboardTextReceivedFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clipboard">
+          <type name="Clipboard" c:type="GtkClipboard*"/>
+        </parameter>
+        <parameter name="text">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="ClipboardRichTextReceivedFunc"
+              c:type="GtkClipboardRichTextReceivedFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clipboard">
+          <type name="Clipboard" c:type="GtkClipboard*"/>
+        </parameter>
+        <parameter name="format">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+        <parameter name="text">
+          <type name="uint8" c:type="guint8*"/>
+        </parameter>
+        <parameter name="length">
+          <type name="size_t" c:type="gsize"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="ClipboardImageReceivedFunc"
+              c:type="GtkClipboardImageReceivedFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clipboard">
+          <type name="Clipboard" c:type="GtkClipboard*"/>
+        </parameter>
+        <parameter name="pixbuf">
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="ClipboardTargetsReceivedFunc"
+              c:type="GtkClipboardTargetsReceivedFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clipboard">
+          <type name="Clipboard" c:type="GtkClipboard*"/>
+        </parameter>
+        <parameter name="atoms">
+          <type name="GdkAtom" c:type="GdkAtom*"/>
+        </parameter>
+        <parameter name="n_atoms">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="ClipboardGetFunc" c:type="GtkClipboardGetFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clipboard">
+          <type name="Clipboard" c:type="GtkClipboard*"/>
+        </parameter>
+        <parameter name="selection_data">
+          <type name="SelectionData" c:type="GtkSelectionData*"/>
+        </parameter>
+        <parameter name="info">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="user_data_or_owner">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="ClipboardClearFunc" c:type="GtkClipboardClearFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="clipboard">
+          <type name="Clipboard" c:type="GtkClipboard*"/>
+        </parameter>
+        <parameter name="user_data_or_owner">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <function name="clipboard_handle_event"
+              c:identifier="_gtk_clipboard_handle_event">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="event">
+          <type name="Gdk.EventOwnerChange" c:type="GdkEventOwnerChange*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clipboard_store_all"
+              c:identifier="_gtk_clipboard_store_all">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <record name="RangeLayout" c:type="GtkRangeLayout"/>
+    <record name="RangeStepTimer" c:type="GtkRangeStepTimer"/>
+    <class name="Range"
+           c:type="GtkRange"
+           parent="Widget"
+           glib:type-name="GtkRange"
+           glib:get-type="gtk_range_get_type">
+      <method name="set_update_policy"
+              c:identifier="gtk_range_set_update_policy">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+          <parameter name="policy">
+            <type name="UpdateType" c:type="GtkUpdateType"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_update_policy"
+              c:identifier="gtk_range_get_update_policy">
+        <return-value>
+          <type name="UpdateType" c:type="GtkUpdateType"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_adjustment" c:identifier="gtk_range_set_adjustment">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_adjustment" c:identifier="gtk_range_get_adjustment">
+        <return-value>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_inverted" c:identifier="gtk_range_set_inverted">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_inverted" c:identifier="gtk_range_get_inverted">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_lower_stepper_sensitivity"
+              c:identifier="gtk_range_set_lower_stepper_sensitivity">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+          <parameter name="sensitivity">
+            <type name="SensitivityType" c:type="GtkSensitivityType"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_lower_stepper_sensitivity"
+              c:identifier="gtk_range_get_lower_stepper_sensitivity">
+        <return-value>
+          <type name="SensitivityType" c:type="GtkSensitivityType"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_upper_stepper_sensitivity"
+              c:identifier="gtk_range_set_upper_stepper_sensitivity">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+          <parameter name="sensitivity">
+            <type name="SensitivityType" c:type="GtkSensitivityType"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_upper_stepper_sensitivity"
+              c:identifier="gtk_range_get_upper_stepper_sensitivity">
+        <return-value>
+          <type name="SensitivityType" c:type="GtkSensitivityType"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_increments" c:identifier="gtk_range_set_increments">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+          <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_range" c:identifier="gtk_range_set_range">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+          <parameter name="min">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="max">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_value" c:identifier="gtk_range_set_value">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_value" c:identifier="gtk_range_get_value">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_show_fill_level"
+              c:identifier="gtk_range_set_show_fill_level">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+          <parameter name="show_fill_level">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_show_fill_level"
+              c:identifier="gtk_range_get_show_fill_level">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_restrict_to_fill_level"
+              c:identifier="gtk_range_set_restrict_to_fill_level">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+          <parameter name="restrict_to_fill_level">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_restrict_to_fill_level"
+              c:identifier="gtk_range_get_restrict_to_fill_level">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_fill_level" c:identifier="gtk_range_set_fill_level">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+          <parameter name="fill_level">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_fill_level" c:identifier="gtk_range_get_fill_level">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="update-policy">
+        <type name="UpdateType" c:type="GtkUpdateType"/>
+      </property>
+      <property name="adjustment">
+        <type name="Adjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="inverted">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="lower-stepper-sensitivity">
+        <type name="SensitivityType" c:type="GtkSensitivityType"/>
+      </property>
+      <property name="upper-stepper-sensitivity">
+        <type name="SensitivityType" c:type="GtkSensitivityType"/>
+      </property>
+      <property name="show-fill-level">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="restrict-to-fill-level">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="fill-level">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <field name="slider_detail">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="stepper_detail">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <callback name="value_changed" c:type="value_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="adjust_bounds" c:type="adjust_bounds">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+          <parameter name="new_value">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="move_slider" c:type="move_slider">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+          <parameter name="scroll">
+            <type name="ScrollType" c:type="GtkScrollType"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_range_border" c:type="get_range_border">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+          <parameter name="border_">
+            <type name="Border" c:type="GtkBorder*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="change_value" c:type="change_value">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="range">
+            <type name="Range" c:type="GtkRange*"/>
+          </parameter>
+          <parameter name="scroll">
+            <type name="ScrollType" c:type="GtkScrollType"/>
+          </parameter>
+          <parameter name="new_value">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_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="adjust-bounds">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="move-slider">
+        <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="change-value">
+        <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="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
+    <function name="range_get_wheel_delta"
+              c:identifier="_gtk_range_get_wheel_delta">
+      <return-value>
+        <type name="double" c:type="gdouble"/>
+      </return-value>
+      <parameters>
+        <parameter name="range">
+          <type name="Range" c:type="GtkRange*"/>
+        </parameter>
+        <parameter name="direction">
+          <type name="Gdk.ScrollDirection" c:type="GdkScrollDirection"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="Scrollbar"
+           c:type="GtkScrollbar"
+           parent="Range"
+           glib:type-name="GtkScrollbar"
+           glib:get-type="gtk_scrollbar_get_type">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <class name="HScrollbar"
+           c:type="GtkHScrollbar"
+           parent="Scrollbar"
+           glib:type-name="GtkHScrollbar"
+           glib:get-type="gtk_hscrollbar_get_type">
+    </class>
+    <function name="hscrollbar_new" c:identifier="gtk_hscrollbar_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="adjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="VScrollbar"
+           c:type="GtkVScrollbar"
+           parent="Scrollbar"
+           glib:type-name="GtkVScrollbar"
+           glib:get-type="gtk_vscrollbar_get_type">
+    </class>
+    <function name="vscrollbar_new" c:identifier="gtk_vscrollbar_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="adjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="CList"
+           c:type="GtkCList"
+           parent="Container"
+           glib:type-name="GtkCList"
+           glib:get-type="gtk_clist_get_type">
+      <method name="set_hadjustment" c:identifier="gtk_clist_set_hadjustment">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_vadjustment" c:identifier="gtk_clist_set_vadjustment">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_hadjustment" c:identifier="gtk_clist_get_hadjustment">
+        <return-value>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_vadjustment" c:identifier="gtk_clist_get_vadjustment">
+        <return-value>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_shadow_type" c:identifier="gtk_clist_set_shadow_type">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="ShadowType" c:type="GtkShadowType"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_selection_mode"
+              c:identifier="gtk_clist_set_selection_mode">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="mode">
+            <type name="SelectionMode" c:type="GtkSelectionMode"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_reorderable" c:identifier="gtk_clist_set_reorderable">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="reorderable">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_use_drag_icons"
+              c:identifier="gtk_clist_set_use_drag_icons">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="use_icons">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_button_actions"
+              c:identifier="gtk_clist_set_button_actions">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="button">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="button_actions">
+            <type name="uint8" c:type="guint8"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="freeze" c:identifier="gtk_clist_freeze">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="thaw" c:identifier="gtk_clist_thaw">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="column_titles_show"
+              c:identifier="gtk_clist_column_titles_show">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="column_titles_hide"
+              c:identifier="gtk_clist_column_titles_hide">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="column_title_active"
+              c:identifier="gtk_clist_column_title_active">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="column_title_passive"
+              c:identifier="gtk_clist_column_title_passive">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="column_titles_active"
+              c:identifier="gtk_clist_column_titles_active">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="column_titles_passive"
+              c:identifier="gtk_clist_column_titles_passive">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_column_title"
+              c:identifier="gtk_clist_set_column_title">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="title">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_column_title"
+              c:identifier="gtk_clist_get_column_title">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_column_widget"
+              c:identifier="gtk_clist_set_column_widget">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_column_widget"
+              c:identifier="gtk_clist_get_column_widget">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_column_justification"
+              c:identifier="gtk_clist_set_column_justification">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="justification">
+            <type name="Justification" c:type="GtkJustification"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_column_visibility"
+              c:identifier="gtk_clist_set_column_visibility">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="visible">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_column_resizeable"
+              c:identifier="gtk_clist_set_column_resizeable">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="resizeable">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_column_auto_resize"
+              c:identifier="gtk_clist_set_column_auto_resize">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="auto_resize">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="columns_autosize"
+              c:identifier="gtk_clist_columns_autosize">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="optimal_column_width"
+              c:identifier="gtk_clist_optimal_column_width">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_column_width"
+              c:identifier="gtk_clist_set_column_width">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="width">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_column_min_width"
+              c:identifier="gtk_clist_set_column_min_width">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="min_width">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_column_max_width"
+              c:identifier="gtk_clist_set_column_max_width">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="max_width">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_row_height" c:identifier="gtk_clist_set_row_height">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="height">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="moveto" c:identifier="gtk_clist_moveto">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="row_align">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="col_align">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="row_is_visible" c:identifier="gtk_clist_row_is_visible">
+        <return-value>
+          <type name="Visibility" c:type="GtkVisibility"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_cell_type" c:identifier="gtk_clist_get_cell_type">
+        <return-value>
+          <type name="CellType" c:type="GtkCellType"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_text" c:identifier="gtk_clist_set_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_text" c:identifier="gtk_clist_get_text">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="text">
+            <type name="GLib.char" c:type="gchar**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_pixmap" c:identifier="gtk_clist_set_pixmap">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="pixmap">
+            <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+          </parameter>
+          <parameter name="mask" allow-none="1">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_pixmap" c:identifier="gtk_clist_get_pixmap">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="pixmap">
+            <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
+          </parameter>
+          <parameter name="mask">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_pixtext" c:identifier="gtk_clist_set_pixtext">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="spacing">
+            <type name="uint8" c:type="guint8"/>
+          </parameter>
+          <parameter name="pixmap">
+            <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+          </parameter>
+          <parameter name="mask">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_pixtext" c:identifier="gtk_clist_get_pixtext">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="text">
+            <type name="GLib.char" c:type="gchar**"/>
+          </parameter>
+          <parameter name="spacing">
+            <type name="uint8" c:type="guint8*"/>
+          </parameter>
+          <parameter name="pixmap">
+            <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
+          </parameter>
+          <parameter name="mask">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_foreground" c:identifier="gtk_clist_set_foreground">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="color">
+            <type name="Gdk.Color" c:type="GdkColor*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_background" c:identifier="gtk_clist_set_background">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="color">
+            <type name="Gdk.Color" c:type="GdkColor*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_cell_style" c:identifier="gtk_clist_set_cell_style">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_cell_style" c:identifier="gtk_clist_get_cell_style">
+        <return-value>
+          <type name="Style" c:type="GtkStyle*"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_row_style" c:identifier="gtk_clist_set_row_style">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_row_style" c:identifier="gtk_clist_get_row_style">
+        <return-value>
+          <type name="Style" c:type="GtkStyle*"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_shift" c:identifier="gtk_clist_set_shift">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="vertical">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="horizontal">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_selectable" c:identifier="gtk_clist_set_selectable">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="selectable">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_selectable" c:identifier="gtk_clist_get_selectable">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="prepend" c:identifier="gtk_clist_prepend">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="append" c:identifier="gtk_clist_append">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert" c:identifier="gtk_clist_insert">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove" c:identifier="gtk_clist_remove">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_row_data" c:identifier="gtk_clist_set_row_data">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_row_data_full"
+              c:identifier="gtk_clist_set_row_data_full">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_row_data" c:identifier="gtk_clist_get_row_data">
+        <return-value>
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="find_row_from_data"
+              c:identifier="gtk_clist_find_row_from_data">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="select_row" c:identifier="gtk_clist_select_row">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unselect_row" c:identifier="gtk_clist_unselect_row">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="undo_selection" c:identifier="gtk_clist_undo_selection">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="clear" c:identifier="gtk_clist_clear">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_selection_info"
+              c:identifier="gtk_clist_get_selection_info">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="select_all" c:identifier="gtk_clist_select_all">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unselect_all" c:identifier="gtk_clist_unselect_all">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="swap_rows" c:identifier="gtk_clist_swap_rows">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row1">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="row2">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="row_move" c:identifier="gtk_clist_row_move">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="source_row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="dest_row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_compare_func"
+              c:identifier="gtk_clist_set_compare_func">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="cmp_func">
+            <type name="CListCompareFunc" c:type="GtkCListCompareFunc"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_sort_column" c:identifier="gtk_clist_set_sort_column">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_sort_type" c:identifier="gtk_clist_set_sort_type">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="sort_type">
+            <type name="SortType" c:type="GtkSortType"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="sort" c:identifier="gtk_clist_sort">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_auto_sort" c:identifier="gtk_clist_set_auto_sort">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="Editable" c:type="GtkEditable*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="length">
-            <type name="int32" c:type="gint"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="position">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="auto_sort">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="delete_text">
+      </method>
+      <property name="n-columns">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="shadow-type">
+        <type name="ShadowType" c:type="GtkShadowType"/>
+      </property>
+      <property name="selection-mode">
+        <type name="SelectionMode" c:type="GtkSelectionMode"/>
+      </property>
+      <property name="row-height">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="titles-active">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="reorderable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="use-drag-icons">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="sort-type">
+        <type name="SortType" c:type="GtkSortType"/>
+      </property>
+      <callback name="set_scroll_adjustments" c:type="set_scroll_adjustments">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="Editable" c:type="GtkEditable*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="start_pos">
-            <type name="int32" c:type="gint"/>
+          <parameter name="hadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
-          <parameter name="end_pos">
-            <type name="int32" c:type="gint"/>
+          <parameter name="vadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="changed">
+      <callback name="refresh" c:type="refresh">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="Editable" c:type="GtkEditable*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="do_insert_text">
+      <callback name="select_row" c:type="select_row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="Editable" c:type="GtkEditable*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="length">
-            <type name="int32" c:type="gint"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="position">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="event">
+            <type name="Gdk.Event" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="do_delete_text">
+      <callback name="unselect_row" c:type="unselect_row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="Editable" c:type="GtkEditable*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="start_pos">
-            <type name="int32" c:type="gint"/>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="end_pos">
-            <type name="int32" c:type="gint"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.Event" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_chars">
+      <callback name="row_move" c:type="row_move">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="Editable" c:type="GtkEditable*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="start_pos">
-            <type name="int32" c:type="gint"/>
+          <parameter name="source_row">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="end_pos">
-            <type name="int32" c:type="gint"/>
+          <parameter name="dest_row">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_selection_bounds">
+      <callback name="click_column" c:type="click_column">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="Editable" c:type="GtkEditable*"/>
-          </parameter>
-          <parameter name="start_pos">
-            <type name="int32" c:type="gint"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="end_pos">
-            <type name="int32" c:type="gint"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_selection_bounds">
+      <callback name="resize_column" c:type="resize_column">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="Editable" c:type="GtkEditable*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="start_pos">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="end_pos">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="width">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_position">
+      <callback name="toggle_focus_row" c:type="toggle_focus_row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="Editable" c:type="GtkEditable*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_position">
+      <callback name="select_all" c:type="select_all">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="Editable" c:type="GtkEditable*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </callback>
-      <glib:signal name="changed">
+      <callback name="unselect_all" c:type="unselect_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="insert-text">
+        <parameters>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="undo_selection" c:type="undo_selection">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="string" c:type="gchararray"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="delete-text">
+      </callback>
+      <callback name="start_selection" c:type="start_selection">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="int32" c:type="gint"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </interface>
-    <function name="editable_select_region"
-              c:identifier="gtk_editable_select_region">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
-        </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="editable_get_selection_bounds"
-              c:identifier="gtk_editable_get_selection_bounds">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
-        </parameter>
-        <parameter name="start">
-          <type name="GLib.gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="end">
-          <type name="GLib.gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="editable_insert_text"
-              c:identifier="gtk_editable_insert_text">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
-        </parameter>
-        <parameter name="new_text">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="new_text_length">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="position" direction="inout">
-          <type name="GLib.gint" c:type="gint*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="editable_delete_text"
-              c:identifier="gtk_editable_delete_text">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
-        </parameter>
-        <parameter name="start_pos">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="end_pos">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="editable_get_chars" c:identifier="gtk_editable_get_chars">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
-        </parameter>
-        <parameter name="start_pos">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="end_pos">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="editable_cut_clipboard"
-              c:identifier="gtk_editable_cut_clipboard">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="editable_copy_clipboard"
-              c:identifier="gtk_editable_copy_clipboard">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="editable_paste_clipboard"
-              c:identifier="gtk_editable_paste_clipboard">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="editable_delete_selection"
-              c:identifier="gtk_editable_delete_selection">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="editable_set_position"
-              c:identifier="gtk_editable_set_position">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
-        </parameter>
-        <parameter name="position">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="editable_get_position"
-              c:identifier="gtk_editable_get_position">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="editable_set_editable"
-              c:identifier="gtk_editable_set_editable">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
-        </parameter>
-        <parameter name="is_editable">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="editable_get_editable"
-              c:identifier="gtk_editable_get_editable">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="editable">
-          <type name="Editable" c:type="GtkEditable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="IMContext"
-           c:type="GtkIMContext"
-           parent="GObject.Object"
-           glib:type-name="GtkIMContext"
-           glib:get-type="gtk_im_context_get_type">
-      <constructor name="simple_new" c:identifier="gtk_im_context_simple_new">
-        <return-value>
-          <type name="IMContext" c:type="GtkIMContext*"/>
-        </return-value>
-      </constructor>
-      <method name="set_client_window"
-              c:identifier="gtk_im_context_set_client_window">
+      </callback>
+      <callback name="end_selection" c:type="end_selection">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
-          </parameter>
-          <parameter name="window">
-            <type name="Gdk.Window" c:type="GdkWindow*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_preedit_string"
-              c:identifier="gtk_im_context_get_preedit_string">
+      </callback>
+      <callback name="extend_selection" c:type="extend_selection">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="str">
-            <type name="GLib.gchar" c:type="gchar**"/>
+          <parameter name="scroll_type">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
-          <parameter name="attrs">
-            <type name="PangoAttrList" c:type="PangoAttrList**"/>
+          <parameter name="position">
+            <type name="float" c:type="gfloat"/>
           </parameter>
-          <parameter name="cursor_pos">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="auto_start_selection">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="filter_keypress"
-              c:identifier="gtk_im_context_filter_keypress">
+      </callback>
+      <callback name="scroll_horizontal" c:type="scroll_horizontal">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventKey" c:type="GdkEventKey*"/>
+          <parameter name="scroll_type">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="focus_in" c:identifier="gtk_im_context_focus_in">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="position">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="focus_out" c:identifier="gtk_im_context_focus_out">
+      </callback>
+      <callback name="scroll_vertical" c:type="scroll_vertical">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="reset" c:identifier="gtk_im_context_reset">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <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="set_cursor_location"
-              c:identifier="gtk_im_context_set_cursor_location">
+      </callback>
+      <callback name="toggle_add_mode" c:type="toggle_add_mode">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
-          </parameter>
-          <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_use_preedit"
-              c:identifier="gtk_im_context_set_use_preedit">
+      </callback>
+      <callback name="abort_column_resize" c:type="abort_column_resize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
-          </parameter>
-          <parameter name="use_preedit">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_surrounding"
-              c:identifier="gtk_im_context_set_surrounding">
+      </callback>
+      <callback name="resync_selection" c:type="resync_selection">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="len">
-            <type name="int32" c:type="gint"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="cursor_index">
-            <type name="int32" c:type="gint"/>
+          <parameter name="event">
+            <type name="Gdk.Event" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_surrounding"
-              c:identifier="gtk_im_context_get_surrounding">
+      </callback>
+      <callback name="selection_find" c:type="selection_find">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="text">
-            <type name="GLib.gchar" c:type="gchar**"/>
+          <parameter name="row_number">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="cursor_index">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="row_list_element">
+            <type name="GLib.List" c:type="GList*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="delete_surrounding"
-              c:identifier="gtk_im_context_delete_surrounding">
+      </callback>
+      <callback name="draw_row" c:type="draw_row">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="offset">
-            <type name="int32" c:type="gint"/>
+          <parameter name="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
-          <parameter name="n_chars">
-            <type name="int32" c:type="gint"/>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
           </parameter>
-        </parameters>
-      </method>
-      <callback name="preedit_start">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clist_row">
+            <type name="CListRow" c:type="GtkCListRow*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="preedit_end">
+      <callback name="draw_drag_highlight" c:type="draw_drag_highlight">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="target_row">
+            <type name="CListRow" c:type="GtkCListRow*"/>
+          </parameter>
+          <parameter name="target_row_number">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="drag_pos">
+            <type name="CListDragPos" c:type="GtkCListDragPos"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="preedit_changed">
+      <callback name="clear" c:type="clear">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="commit">
+      <callback name="fake_unselect_all" c:type="fake_unselect_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="str">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="retrieve_surrounding">
+      <callback name="sort_list" c:type="sort_list">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="delete_surrounding">
+      <callback name="insert_row" c:type="insert_row">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="offset">
-            <type name="int32" c:type="gint"/>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="n_chars">
-            <type name="int32" c:type="gint"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_client_window">
+      <callback name="remove_row" c:type="remove_row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="window">
-            <type name="Gdk.Window" c:type="GdkWindow*"/>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_preedit_string">
+      <callback name="set_cell_contents" c:type="set_cell_contents">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="str">
-            <type name="GLib.gchar" c:type="gchar**"/>
+          <parameter name="clist_row">
+            <type name="CListRow" c:type="GtkCListRow*"/>
           </parameter>
-          <parameter name="attrs">
-            <type name="PangoAttrList" c:type="PangoAttrList**"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="cursor_pos">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="type">
+            <type name="CellType" c:type="GtkCellType"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="filter_keypress">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="event">
-            <type name="Gdk.GdkEventKey" c:type="GdkEventKey*"/>
+          <parameter name="spacing">
+            <type name="uint8" c:type="guint8"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="focus_in">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="pixmap">
+            <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+          </parameter>
+          <parameter name="mask">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="focus_out">
+      <callback name="cell_size_request" c:type="cell_size_request">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="reset">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="clist_row">
+            <type name="CListRow" c:type="GtkCListRow*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="requisition">
+            <type name="Requisition" c:type="GtkRequisition*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_cursor_location">
+      <glib:signal name="set-scroll-adjustments">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="object">
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
-          <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="p0">
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_use_preedit">
+      </glib:signal>
+      <glib:signal name="select-row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="use_preedit">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_surrounding">
+      </glib:signal>
+      <glib:signal name="unselect-row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="len">
-            <type name="int32" c:type="gint"/>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="cursor_index">
-            <type name="int32" c:type="gint"/>
+          <parameter name="p1">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_surrounding">
+      </glib:signal>
+      <glib:signal name="row-move">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMContext" c:type="GtkIMContext*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="GLib.gchar" c:type="gchar**"/>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="cursor_index">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
+      </glib:signal>
+      <glib:signal name="click-column">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+        <parameters>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="resize-column">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="toggle-focus-row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+      </glib:signal>
+      <glib:signal name="select-all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved5">
+      </glib:signal>
+      <glib:signal name="unselect-all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved6">
+      </glib:signal>
+      <glib:signal name="undo-selection">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <glib:signal name="preedit-start">
+      </glib:signal>
+      <glib:signal name="start-selection">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-      <glib:signal name="preedit-end">
+      <glib:signal name="end-selection">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-      <glib:signal name="preedit-changed">
+      <glib:signal name="toggle-add-mode">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-      <glib:signal name="commit">
+      <glib:signal name="extend-selection">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="string" c:type="gchararray"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="retrieve-surrounding">
+      <glib:signal name="scroll-vertical">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="ScrollType" c:type="GtkScrollType"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+        </parameters>
       </glib:signal>
-      <glib:signal name="delete-surrounding">
+      <glib:signal name="scroll-horizontal">
         <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"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
           <parameter name="p0">
-            <type name="int32" c:type="gint"/>
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
       </glib:signal>
+      <glib:signal name="abort-column-resize">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
     </class>
-    <class name="ListStore"
-           c:type="GtkListStore"
-           parent="GObject.Object"
-           glib:type-name="GtkListStore"
-           glib:get-type="gtk_list_store_get_type">
-      <constructor name="new" c:identifier="gtk_list_store_new">
+    <record name="CListColumn" c:type="GtkCListColumn">
+      <field name="title">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="area">
+        <type name="Gdk.Rectangle" c:type="GdkRectangle"/>
+      </field>
+      <field name="button">
+        <type name="Widget" c:type="GtkWidget*"/>
+      </field>
+      <field name="window">
+        <type name="Gdk.Window" c:type="GdkWindow*"/>
+      </field>
+      <field name="width">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="min_width">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="max_width">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="justification">
+        <type name="Justification" c:type="GtkJustification"/>
+      </field>
+      <field name="visible">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="width_set">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="resizeable">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="auto_resize">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="button_passive">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </record>
+    <record name="CListRow" c:type="GtkCListRow">
+      <field name="cell">
+        <type name="Cell" c:type="GtkCell*"/>
+      </field>
+      <field name="state">
+        <type name="StateType" c:type="GtkStateType"/>
+      </field>
+      <field name="foreground">
+        <type name="Gdk.Color" c:type="GdkColor"/>
+      </field>
+      <field name="background">
+        <type name="Gdk.Color" c:type="GdkColor"/>
+      </field>
+      <field name="style">
+        <type name="Style" c:type="GtkStyle*"/>
+      </field>
+      <field name="data">
+        <type name="any" c:type="gpointer"/>
+      </field>
+      <field name="destroy">
+        <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+      </field>
+      <field name="fg_set">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="bg_set">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="selectable">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </record>
+    <record name="Cell" c:type="GtkCell">
+      <field name="type">
+        <type name="CellType" c:type="GtkCellType"/>
+      </field>
+      <field name="vertical">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="horizontal">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="style">
+        <type name="Style" c:type="GtkStyle*"/>
+      </field>
+      <field name="u">
+        <type name="any" c:type="any"/>
+      </field>
+    </record>
+    <record name="CellText" c:type="GtkCellText">
+      <field name="type">
+        <type name="CellType" c:type="GtkCellType"/>
+      </field>
+      <field name="vertical">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="horizontal">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="style">
+        <type name="Style" c:type="GtkStyle*"/>
+      </field>
+      <field name="text">
+        <type name="string" c:type="gchar*"/>
+      </field>
+    </record>
+    <record name="CellPixmap" c:type="GtkCellPixmap">
+      <field name="type">
+        <type name="CellType" c:type="GtkCellType"/>
+      </field>
+      <field name="vertical">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="horizontal">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="style">
+        <type name="Style" c:type="GtkStyle*"/>
+      </field>
+      <field name="pixmap">
+        <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+      </field>
+      <field name="mask">
+        <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
+      </field>
+    </record>
+    <record name="CellPixText" c:type="GtkCellPixText">
+      <field name="type">
+        <type name="CellType" c:type="GtkCellType"/>
+      </field>
+      <field name="vertical">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="horizontal">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="style">
+        <type name="Style" c:type="GtkStyle*"/>
+      </field>
+      <field name="text">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="spacing">
+        <type name="uint8" c:type="guint8"/>
+      </field>
+      <field name="pixmap">
+        <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+      </field>
+      <field name="mask">
+        <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
+      </field>
+    </record>
+    <record name="CellWidget" c:type="GtkCellWidget">
+      <field name="type">
+        <type name="CellType" c:type="GtkCellType"/>
+      </field>
+      <field name="vertical">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="horizontal">
+        <type name="int16" c:type="gint16"/>
+      </field>
+      <field name="style">
+        <type name="Style" c:type="GtkStyle*"/>
+      </field>
+      <field name="widget">
+        <type name="Widget" c:type="GtkWidget*"/>
+      </field>
+    </record>
+    <callback name="CListCompareFunc" c:type="GtkCListCompareFunc">
+      <return-value>
+        <type name="int" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="CList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="ptr1">
+          <type name="any" c:type="gconstpointer"/>
+        </parameter>
+        <parameter name="ptr2">
+          <type name="any" c:type="gconstpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <record name="CListCellInfo" c:type="GtkCListCellInfo">
+      <field name="row">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="column">
+        <type name="int" c:type="gint"/>
+      </field>
+    </record>
+    <record name="CListDestInfo" c:type="GtkCListDestInfo">
+      <field name="cell">
+        <type name="CListCellInfo" c:type="GtkCListCellInfo"/>
+      </field>
+      <field name="insert_pos">
+        <type name="CListDragPos" c:type="GtkCListDragPos"/>
+      </field>
+    </record>
+    <function name="clist_new" c:identifier="gtk_clist_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="columns">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_new_with_titles"
+              c:identifier="gtk_clist_new_with_titles">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="columns">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="titles">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="clist_create_cell_layout"
+              c:identifier="_gtk_clist_create_cell_layout">
+      <return-value>
+        <type name="Pango.Layout" c:type="PangoLayout*"/>
+      </return-value>
+      <parameters>
+        <parameter name="clist">
+          <type name="CList" c:type="GtkCList*"/>
+        </parameter>
+        <parameter name="clist_row">
+          <type name="CListRow" c:type="GtkCListRow*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="ColorButton"
+           c:type="GtkColorButton"
+           parent="Button"
+           glib:type-name="GtkColorButton"
+           glib:get-type="gtk_color_button_get_type">
+      <method name="set_color" c:identifier="gtk_color_button_set_color">
         <return-value>
-          <type name="ListStore" c:type="GtkListStore*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="n_columns">
-            <type name="int32" c:type="gint"/>
+          <parameter name="color_button">
+            <type name="ColorButton" c:type="GtkColorButton*"/>
+          </parameter>
+          <parameter name="color">
+            <type name="Gdk.Color" c:type="GdkColor*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="newv" c:identifier="gtk_list_store_newv">
+      </method>
+      <method name="set_alpha" c:identifier="gtk_color_button_set_alpha">
         <return-value>
-          <type name="ListStore" c:type="GtkListStore*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="n_columns">
-            <type name="int32" c:type="gint"/>
+          <parameter name="color_button">
+            <type name="ColorButton" c:type="GtkColorButton*"/>
           </parameter>
-          <parameter name="types">
-            <type name="GObject.GType" c:type="GType*"/>
+          <parameter name="alpha">
+            <type name="uint16" c:type="guint16"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="set_column_types"
-              c:identifier="gtk_list_store_set_column_types">
+      </method>
+      <method name="get_color" c:identifier="gtk_color_button_get_color">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
+          <parameter name="color_button">
+            <type name="ColorButton" c:type="GtkColorButton*"/>
           </parameter>
-          <parameter name="n_columns">
-            <type name="int32" c:type="gint"/>
+          <parameter name="color">
+            <type name="Gdk.Color" c:type="GdkColor*"/>
           </parameter>
-          <parameter name="types">
-            <type name="GObject.GType" c:type="GType*"/>
+        </parameters>
+      </method>
+      <method name="get_alpha" c:identifier="gtk_color_button_get_alpha">
+        <return-value>
+          <type name="uint16" c:type="guint16"/>
+        </return-value>
+        <parameters>
+          <parameter name="color_button">
+            <type name="ColorButton" c:type="GtkColorButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_value" c:identifier="gtk_list_store_set_value">
+      <method name="set_use_alpha"
+              c:identifier="gtk_color_button_set_use_alpha">
         <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 name="color_button">
+            <type name="ColorButton" c:type="GtkColorButton*"/>
           </parameter>
-          <parameter name="column">
-            <type name="int32" c:type="gint"/>
+          <parameter name="use_alpha">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="value">
-            <type name="GObject.GValue" c:type="GValue*"/>
+        </parameters>
+      </method>
+      <method name="get_use_alpha"
+              c:identifier="gtk_color_button_get_use_alpha">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="color_button">
+            <type name="ColorButton" c:type="GtkColorButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set" c:identifier="gtk_list_store_set">
+      <method name="set_title" c:identifier="gtk_color_button_set_title">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
+          <parameter name="color_button">
+            <type name="ColorButton" c:type="GtkColorButton*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="title">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_valuesv" c:identifier="gtk_list_store_set_valuesv">
+      <method name="get_title" c:identifier="gtk_color_button_get_title">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
+          <parameter name="color_button">
+            <type name="ColorButton" c:type="GtkColorButton*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameters>
+      </method>
+      <property name="use-alpha">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="title">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="color">
+        <type name="Gdk.Color" c:type="GdkColor"/>
+      </property>
+      <property name="alpha">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <callback name="color_set" c:type="color_set">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="cp">
+            <type name="ColorButton" c:type="GtkColorButton*"/>
           </parameter>
-          <parameter name="columns">
-            <type name="GLib.gint" c:type="gint*"/>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="color-set">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <record name="ColorButtonPrivate" c:type="GtkColorButtonPrivate"/>
+    <function name="color_button_new" c:identifier="gtk_color_button_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="color_button_new_with_color"
+              c:identifier="gtk_color_button_new_with_color">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="color">
+          <type name="Gdk.Color" c:type="GdkColor*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="VBox"
+           c:type="GtkVBox"
+           parent="Box"
+           glib:type-name="GtkVBox"
+           glib:get-type="gtk_vbox_get_type">
+    </class>
+    <function name="vbox_new" c:identifier="gtk_vbox_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="homogeneous">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+        <parameter name="spacing">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="ColorSelection"
+           c:type="GtkColorSelection"
+           parent="VBox"
+           glib:type-name="GtkColorSelection"
+           glib:get-type="gtk_color_selection_get_type">
+      <method name="get_has_opacity_control"
+              c:identifier="gtk_color_selection_get_has_opacity_control">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
-          <parameter name="values">
-            <type name="GObject.GValue" c:type="GValue*"/>
+        </parameters>
+      </method>
+      <method name="set_has_opacity_control"
+              c:identifier="gtk_color_selection_set_has_opacity_control">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
-          <parameter name="n_values">
-            <type name="int32" c:type="gint"/>
+          <parameter name="has_opacity">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove" c:identifier="gtk_list_store_remove">
+      <method name="get_has_palette"
+              c:identifier="gtk_color_selection_get_has_palette">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert" c:identifier="gtk_list_store_insert">
+      <method name="set_has_palette"
+              c:identifier="gtk_color_selection_set_has_palette">
         <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 name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
+          <parameter name="has_palette">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_before" c:identifier="gtk_list_store_insert_before">
+      <method name="set_current_color"
+              c:identifier="gtk_color_selection_set_current_color">
         <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 name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
-          <parameter name="sibling">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="color">
+            <type name="Gdk.Color" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_after" c:identifier="gtk_list_store_insert_after">
+      <method name="set_current_alpha"
+              c:identifier="gtk_color_selection_set_current_alpha">
         <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 name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
-          <parameter name="sibling">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="alpha">
+            <type name="uint16" c:type="guint16"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_with_values"
-              c:identifier="gtk_list_store_insert_with_values">
+      <method name="get_current_color"
+              c:identifier="gtk_color_selection_get_current_color">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="color">
+            <type name="Gdk.Color" c:type="GdkColor*"/>
           </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
+        </parameters>
+      </method>
+      <method name="get_current_alpha"
+              c:identifier="gtk_color_selection_get_current_alpha">
+        <return-value>
+          <type name="uint16" c:type="guint16"/>
+        </return-value>
+        <parameters>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_with_valuesv"
-              c:identifier="gtk_list_store_insert_with_valuesv">
+      <method name="set_previous_color"
+              c:identifier="gtk_color_selection_set_previous_color">
         <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="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 name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
-          <parameter name="n_values">
-            <type name="int32" c:type="gint"/>
+          <parameter name="color">
+            <type name="Gdk.Color" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="prepend" c:identifier="gtk_list_store_prepend">
+      <method name="set_previous_alpha"
+              c:identifier="gtk_color_selection_set_previous_alpha">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="alpha">
+            <type name="uint16" c:type="guint16"/>
           </parameter>
         </parameters>
       </method>
-      <method name="append" c:identifier="gtk_list_store_append">
+      <method name="get_previous_color"
+              c:identifier="gtk_color_selection_get_previous_color">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="color">
+            <type name="Gdk.Color" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="clear" c:identifier="gtk_list_store_clear">
+      <method name="get_previous_alpha"
+              c:identifier="gtk_color_selection_get_previous_alpha">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="uint16" c:type="guint16"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="iter_is_valid" c:identifier="gtk_list_store_iter_is_valid">
+      <method name="is_adjusting"
+              c:identifier="gtk_color_selection_is_adjusting">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="list_store">
-            <type name="ListStore" c:type="GtkListStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="reorder" c:identifier="gtk_list_store_reorder">
+      <method name="set_color" c:identifier="gtk_color_selection_set_color">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="store">
-            <type name="ListStore" c:type="GtkListStore*"/>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
-          <parameter name="new_order">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="color">
+            <type name="double" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="swap" c:identifier="gtk_list_store_swap">
+      <method name="get_color" c:identifier="gtk_color_selection_get_color">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="store">
-            <type name="ListStore" c:type="GtkListStore*"/>
-          </parameter>
-          <parameter name="a">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
-          <parameter name="b">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="color">
+            <type name="double" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_after" c:identifier="gtk_list_store_move_after">
+      <method name="set_update_policy"
+              c:identifier="gtk_color_selection_set_update_policy">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="store">
-            <type name="ListStore" c:type="GtkListStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="colorsel">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
-          <parameter name="position" allow-none="1">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="policy">
+            <type name="UpdateType" c:type="GtkUpdateType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_before" c:identifier="gtk_list_store_move_before">
+      <property name="has-palette">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="has-opacity-control">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="current-color">
+        <type name="Gdk.Color" c:type="GdkColor"/>
+      </property>
+      <property name="current-alpha">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <callback name="color_changed" c:type="color_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="store">
-            <type name="ListStore" c:type="GtkListStore*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="position" allow-none="1">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="color_selection">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
           </parameter>
         </parameters>
-      </method>
-      <callback name="_gtk_reserved1">
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="color-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <callback name="ColorSelectionChangePaletteFunc"
+              c:type="GtkColorSelectionChangePaletteFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="colors">
+          <type name="Gdk.Color" c:type="GdkColor*"/>
+        </parameter>
+        <parameter name="n_colors">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="ColorSelectionChangePaletteWithScreenFunc"
+              c:type="GtkColorSelectionChangePaletteWithScreenFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="screen">
+          <type name="Gdk.Screen" c:type="GdkScreen*"/>
+        </parameter>
+        <parameter name="colors">
+          <type name="Gdk.Color" c:type="GdkColor*"/>
+        </parameter>
+        <parameter name="n_colors">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <function name="color_selection_new"
+              c:identifier="gtk_color_selection_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="color_selection_palette_from_string"
+              c:identifier="gtk_color_selection_palette_from_string">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="str">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="colors">
+          <type name="Gdk.Color" c:type="GdkColor**"/>
+        </parameter>
+        <parameter name="n_colors">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="color_selection_palette_to_string"
+              c:identifier="gtk_color_selection_palette_to_string">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="colors">
+          <type name="Gdk.Color" c:type="GdkColor*"/>
+        </parameter>
+        <parameter name="n_colors">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="color_selection_set_change_palette_hook"
+              c:identifier="gtk_color_selection_set_change_palette_hook">
+      <return-value>
+        <type name="ColorSelectionChangePaletteFunc"
+              c:type="GtkColorSelectionChangePaletteFunc"/>
+      </return-value>
+      <parameters>
+        <parameter name="func">
+          <type name="ColorSelectionChangePaletteFunc"
+                c:type="GtkColorSelectionChangePaletteFunc"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="color_selection_set_change_palette_with_screen_hook"
+              c:identifier="gtk_color_selection_set_change_palette_with_screen_hook">
+      <return-value>
+        <type name="ColorSelectionChangePaletteWithScreenFunc"
+              c:type="GtkColorSelectionChangePaletteWithScreenFunc"/>
+      </return-value>
+      <parameters>
+        <parameter name="func">
+          <type name="ColorSelectionChangePaletteWithScreenFunc"
+                c:type="GtkColorSelectionChangePaletteWithScreenFunc"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="ColorSelectionDialog"
+           c:type="GtkColorSelectionDialog"
+           parent="Dialog"
+           glib:type-name="GtkColorSelectionDialog"
+           glib:get-type="gtk_color_selection_dialog_get_type">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
-    <callback name="GtkTreeModelFilterVisibleFunc">
+    <function name="color_selection_dialog_new"
+              c:identifier="gtk_color_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>
+    <function name="drag_get_data" c:identifier="gtk_drag_get_data">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="context">
+          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+        <parameter name="target">
+          <type name="GdkAtom" c:type="GdkAtom"/>
+        </parameter>
+        <parameter name="time_">
+          <type name="uint32" c:type="guint32"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_finish" c:identifier="gtk_drag_finish">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="context">
+          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+        <parameter name="success">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+        <parameter name="del">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+        <parameter name="time_">
+          <type name="uint32" c:type="guint32"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_get_source_widget"
+              c:identifier="gtk_drag_get_source_widget">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="context">
+          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_highlight" c:identifier="gtk_drag_highlight">
+      <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="drag_unhighlight" c:identifier="gtk_drag_unhighlight">
+      <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="drag_dest_set" c:identifier="gtk_drag_dest_set">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="DestDefaults" c:type="GtkDestDefaults"/>
+        </parameter>
+        <parameter name="targets">
+          <type name="TargetEntry" c:type="GtkTargetEntry*"/>
+        </parameter>
+        <parameter name="n_targets">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="actions">
+          <type name="Gdk.DragAction" c:type="GdkDragAction"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_dest_set_proxy"
+              c:identifier="gtk_drag_dest_set_proxy">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="proxy_window">
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        </parameter>
+        <parameter name="protocol">
+          <type name="Gdk.DragProtocol" c:type="GdkDragProtocol"/>
+        </parameter>
+        <parameter name="use_coordinates">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_dest_unset" c:identifier="gtk_drag_dest_unset">
+      <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="drag_dest_find_target"
+              c:identifier="gtk_drag_dest_find_target">
+      <return-value>
+        <type name="GdkAtom" c:type="GdkAtom"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="context">
+          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+        <parameter name="target_list">
+          <type name="TargetList" c:type="GtkTargetList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_dest_get_target_list"
+              c:identifier="gtk_drag_dest_get_target_list">
+      <return-value>
+        <type name="TargetList" c:type="GtkTargetList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_dest_set_target_list"
+              c:identifier="gtk_drag_dest_set_target_list">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="target_list">
+          <type name="TargetList" c:type="GtkTargetList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_dest_add_text_targets"
+              c:identifier="gtk_drag_dest_add_text_targets">
+      <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="drag_dest_add_image_targets"
+              c:identifier="gtk_drag_dest_add_image_targets">
+      <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="drag_dest_add_uri_targets"
+              c:identifier="gtk_drag_dest_add_uri_targets">
+      <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="drag_dest_set_track_motion"
+              c:identifier="gtk_drag_dest_set_track_motion">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="track_motion">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_dest_get_track_motion"
+              c:identifier="gtk_drag_dest_get_track_motion">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+      </parameters>
+    </function>
+    <function name="drag_source_set" c:identifier="gtk_drag_source_set">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="start_button_mask">
+          <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+        </parameter>
+        <parameter name="targets">
+          <type name="TargetEntry" c:type="GtkTargetEntry*"/>
+        </parameter>
+        <parameter name="n_targets">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="actions">
+          <type name="Gdk.DragAction" c:type="GdkDragAction"/>
         </parameter>
       </parameters>
-    </callback>
-    <callback name="GtkTreeModelFilterModifyFunc">
+    </function>
+    <function name="drag_source_unset" c:identifier="gtk_drag_source_unset">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+      </parameters>
+    </function>
+    <function name="drag_source_get_target_list"
+              c:identifier="gtk_drag_source_get_target_list">
+      <return-value>
+        <type name="TargetList" c:type="GtkTargetList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="value">
-          <type name="GObject.GValue" c:type="GValue*"/>
+      </parameters>
+    </function>
+    <function name="drag_source_set_target_list"
+              c:identifier="gtk_drag_source_set_target_list">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
+        <parameter name="target_list">
+          <type name="TargetList" c:type="GtkTargetList*"/>
         </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+      </parameters>
+    </function>
+    <function name="drag_source_add_text_targets"
+              c:identifier="gtk_drag_source_add_text_targets">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
-    </callback>
-    <record name="GtkTreeModelFilterPrivate"
-            c:type="GtkTreeModelFilterPrivate"/>
-    <class name="TreeModelFilter"
-           c:type="GtkTreeModelFilter"
-           parent="GObject.Object"
-           glib:type-name="GtkTreeModelFilter"
-           glib:get-type="gtk_tree_model_filter_get_type">
-      <method name="set_visible_func"
-              c:identifier="gtk_tree_model_filter_set_visible_func">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTreeModelFilterVisibleFunc"
-                  c:type="GtkTreeModelFilterVisibleFunc"/>
-          </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="set_modify_func"
-              c:identifier="gtk_tree_model_filter_set_modify_func">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
-          </parameter>
-          <parameter name="n_columns">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="types">
-            <type name="GObject.GType" c:type="GType*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTreeModelFilterModifyFunc"
-                  c:type="GtkTreeModelFilterModifyFunc"/>
-          </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="set_visible_column"
-              c:identifier="gtk_tree_model_filter_set_visible_column">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_model" c:identifier="gtk_tree_model_filter_get_model">
-        <return-value>
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="convert_child_iter_to_iter"
-              c:identifier="gtk_tree_model_filter_convert_child_iter_to_iter">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
-          </parameter>
-          <parameter name="filter_iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="child_iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="convert_iter_to_child_iter"
-              c:identifier="gtk_tree_model_filter_convert_iter_to_child_iter">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
-          </parameter>
-          <parameter name="child_iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="filter_iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="convert_child_path_to_path"
-              c:identifier="gtk_tree_model_filter_convert_child_path_to_path">
-        <return-value>
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
-          </parameter>
-          <parameter name="child_path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="convert_path_to_child_path"
-              c:identifier="gtk_tree_model_filter_convert_path_to_child_path">
-        <return-value>
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
-          </parameter>
-          <parameter name="filter_path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="refilter" c:identifier="gtk_tree_model_filter_refilter">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="clear_cache"
-              c:identifier="gtk_tree_model_filter_clear_cache">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="filter">
-            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="child-model">
-        <type name="TreeModel" c:type="GtkTreeModel"/>
-      </property>
-      <property name="virtual-root">
-        <type name="TreePath" c:type="GtkTreePath"/>
-      </property>
-      <callback name="_gtk_reserved0">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </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>
-    </class>
-    <function name="tree_model_filter_new"
-              c:identifier="gtk_tree_model_filter_new">
+    </function>
+    <function name="drag_source_add_image_targets"
+              c:identifier="gtk_drag_source_add_image_targets">
       <return-value>
-        <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="child_model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="root" allow-none="1">
-          <type name="TreePath" c:type="GtkTreePath*"/>
+      </parameters>
+    </function>
+    <function name="drag_source_add_uri_targets"
+              c:identifier="gtk_drag_source_add_uri_targets">
+      <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="drag_source_set_icon"
+              c:identifier="gtk_drag_source_set_icon">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="colormap">
+          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
+        </parameter>
+        <parameter name="pixmap">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+        </parameter>
+        <parameter name="mask" allow-none="1">
+          <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_source_set_icon_pixbuf"
+              c:identifier="gtk_drag_source_set_icon_pixbuf">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="pixbuf">
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_source_set_icon_stock"
+              c:identifier="gtk_drag_source_set_icon_stock">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_source_set_icon_name"
+              c:identifier="gtk_drag_source_set_icon_name">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="icon_name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_begin" c:identifier="gtk_drag_begin">
+      <return-value>
+        <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="targets">
+          <type name="TargetList" c:type="GtkTargetList*"/>
+        </parameter>
+        <parameter name="actions">
+          <type name="Gdk.DragAction" c:type="GdkDragAction"/>
+        </parameter>
+        <parameter name="button">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="event">
+          <type name="Gdk.Event" c:type="GdkEvent*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_set_icon_widget"
+              c:identifier="gtk_drag_set_icon_widget">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="context">
+          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="hot_x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="hot_y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_set_icon_pixmap"
+              c:identifier="gtk_drag_set_icon_pixmap">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="context">
+          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+        <parameter name="colormap">
+          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
+        </parameter>
+        <parameter name="pixmap">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+        </parameter>
+        <parameter name="mask">
+          <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
+        </parameter>
+        <parameter name="hot_x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="hot_y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_set_icon_pixbuf"
+              c:identifier="gtk_drag_set_icon_pixbuf">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="context">
+          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+        <parameter name="pixbuf">
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+        </parameter>
+        <parameter name="hot_x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="hot_y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_set_icon_stock"
+              c:identifier="gtk_drag_set_icon_stock">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="context">
+          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="hot_x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="hot_y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_set_icon_name" c:identifier="gtk_drag_set_icon_name">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="context">
+          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+        </parameter>
+        <parameter name="icon_name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="hot_x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="hot_y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_set_icon_default"
+              c:identifier="gtk_drag_set_icon_default">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="context">
+          <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkEntryCompletionPrivate"
-            c:type="GtkEntryCompletionPrivate"/>
-    <callback name="GtkEntryCompletionMatchFunc">
+    <function name="drag_check_threshold"
+              c:identifier="gtk_drag_check_threshold">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="completion">
-          <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="start_x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="start_y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="current_x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="current_y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_source_handle_event"
+              c:identifier="_gtk_drag_source_handle_event">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="event">
+          <type name="Gdk.Event" c:type="GdkEvent*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_dest_handle_event"
+              c:identifier="_gtk_drag_dest_handle_event">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="toplevel">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="event">
+          <type name="Gdk.Event" c:type="GdkEvent*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="drag_set_default_icon"
+              c:identifier="gtk_drag_set_default_icon">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="colormap">
+          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
+        </parameter>
+        <parameter name="pixmap">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
         </parameter>
-        <parameter name="key">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="mask">
+          <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
         </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        <parameter name="hot_x">
+          <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="hot_y">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
-    </callback>
-    <class name="EntryCompletion"
-           c:type="GtkEntryCompletion"
-           parent="GObject.Object"
-           glib:type-name="GtkEntryCompletion"
-           glib:get-type="gtk_entry_completion_get_type">
-      <constructor name="new" c:identifier="gtk_entry_completion_new">
-        <return-value>
-          <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-        </return-value>
-      </constructor>
-      <method name="get_entry" c:identifier="gtk_entry_completion_get_entry">
-        <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_model" c:identifier="gtk_entry_completion_set_model">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="model" allow-none="1">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_model" c:identifier="gtk_entry_completion_get_model">
-        <return-value>
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_match_func"
-              c:identifier="gtk_entry_completion_set_match_func">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkEntryCompletionMatchFunc"
-                  c:type="GtkEntryCompletionMatchFunc"/>
-          </parameter>
-          <parameter name="func_data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-          <parameter name="func_notify">
-            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_minimum_key_length"
-              c:identifier="gtk_entry_completion_set_minimum_key_length">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="length">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_minimum_key_length"
-              c:identifier="gtk_entry_completion_get_minimum_key_length">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="complete" c:identifier="gtk_entry_completion_complete">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="insert_prefix"
-              c:identifier="gtk_entry_completion_insert_prefix">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="insert_action_text"
-              c:identifier="gtk_entry_completion_insert_action_text">
+    </function>
+    <interface name="Editable"
+               c:type="GtkEditable"
+               glib:type-name="GtkEditable"
+               glib:get-type="gtk_editable_get_type">
+      <callback name="insert_text" c:type="insert_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="index_">
-            <type name="int32" c:type="gint"/>
+          <parameter name="editable">
+            <type name="Editable" c:type="GtkEditable*"/>
           </parameter>
           <parameter name="text">
             <type name="string" c:type="gchar*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="insert_action_markup"
-              c:identifier="gtk_entry_completion_insert_action_markup">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="index_">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="markup">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="delete_action"
-              c:identifier="gtk_entry_completion_delete_action">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="index_">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_inline_completion"
-              c:identifier="gtk_entry_completion_set_inline_completion">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="inline_completion">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_inline_completion"
-              c:identifier="gtk_entry_completion_get_inline_completion">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_inline_selection"
-              c:identifier="gtk_entry_completion_set_inline_selection">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="inline_selection">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_inline_selection"
-              c:identifier="gtk_entry_completion_get_inline_selection">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_popup_completion"
-              c:identifier="gtk_entry_completion_set_popup_completion">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="popup_completion">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_popup_completion"
-              c:identifier="gtk_entry_completion_get_popup_completion">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_popup_set_width"
-              c:identifier="gtk_entry_completion_set_popup_set_width">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="popup_set_width">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_popup_set_width"
-              c:identifier="gtk_entry_completion_get_popup_set_width">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_popup_single_match"
-              c:identifier="gtk_entry_completion_set_popup_single_match">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="popup_single_match">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_popup_single_match"
-              c:identifier="gtk_entry_completion_get_popup_single_match">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          <parameter name="length">
+            <type name="int" c:type="gint"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_completion_prefix"
-              c:identifier="gtk_entry_completion_get_completion_prefix">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          <parameter name="position">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_text_column"
-              c:identifier="gtk_entry_completion_set_text_column">
+      </callback>
+      <callback name="delete_text" c:type="delete_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_text_column"
-              c:identifier="gtk_entry_completion_get_text_column">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="model">
-        <type name="TreeModel" c:type="GtkTreeModel"/>
-      </property>
-      <property name="minimum-key-length">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="text-column">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="inline-completion">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="popup-completion">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="popup-set-width">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="popup-single-match">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="inline-selection">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="match_selected">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          <parameter name="editable">
+            <type name="Editable" c:type="GtkEditable*"/>
           </parameter>
-          <parameter name="model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="start_pos">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="end_pos">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="action_activated">
+      <callback name="changed" c:type="changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="index_">
-            <type name="int32" c:type="gint"/>
+          <parameter name="editable">
+            <type name="Editable" c:type="GtkEditable*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="insert_prefix">
+      <callback name="do_insert_text" c:type="do_insert_text">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          <parameter name="editable">
+            <type name="Editable" c:type="GtkEditable*"/>
           </parameter>
-          <parameter name="prefix">
+          <parameter name="text">
             <type name="string" c:type="gchar*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="cursor_on_match">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="completion">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
-          </parameter>
-          <parameter name="model">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="length">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="position">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved0">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <glib:signal name="insert-prefix">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="string" c:type="gchararray"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="match-selected">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="TreeModel" c:type="GtkTreeModel"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="TreeIter" c:type="GtkTreeIter"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="cursor-on-match">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="TreeModel" c:type="GtkTreeModel"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="TreeIter" c:type="GtkTreeIter"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="action-activated">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </class>
-    <class name="Entry"
-           c:type="GtkEntry"
-           parent="Widget"
-           glib:type-name="GtkEntry"
-           glib:get-type="gtk_entry_get_type">
-      <method name="set_visibility" c:identifier="gtk_entry_set_visibility">
+      <callback name="do_delete_text" c:type="do_delete_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="editable">
+            <type name="Editable" c:type="GtkEditable*"/>
           </parameter>
-          <parameter name="visible">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="start_pos">
+            <type name="int" c:type="gint"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_visibility" c:identifier="gtk_entry_get_visibility">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="end_pos">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_invisible_char"
-              c:identifier="gtk_entry_set_invisible_char">
+      </callback>
+      <callback name="get_chars" c:type="get_chars">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="editable">
+            <type name="Editable" c:type="GtkEditable*"/>
           </parameter>
-          <parameter name="ch">
-            <type name="GLib.gunichar" c:type="gunichar"/>
+          <parameter name="start_pos">
+            <type name="int" c:type="gint"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_invisible_char"
-              c:identifier="gtk_entry_get_invisible_char">
-        <return-value>
-          <type name="GLib.gunichar" c:type="gunichar"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="end_pos">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_has_frame" c:identifier="gtk_entry_set_has_frame">
+      </callback>
+      <callback name="set_selection_bounds" c:type="set_selection_bounds">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_has_frame" c:identifier="gtk_entry_get_has_frame">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="editable">
+            <type name="Editable" c:type="GtkEditable*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="set_inner_border"
-              c:identifier="gtk_entry_set_inner_border">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="start_pos">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="border" allow-none="1">
-            <type name="Border" c:type="GtkBorder*"/>
+          <parameter name="end_pos">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_inner_border"
-              c:identifier="gtk_entry_get_inner_border">
+      </callback>
+      <callback name="get_selection_bounds" c:type="get_selection_bounds">
         <return-value>
-          <type name="Border" c:type="GtkBorder*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="editable">
+            <type name="Editable" c:type="GtkEditable*"/>
+          </parameter>
+          <parameter name="start_pos">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="end_pos">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_max_length" c:identifier="gtk_entry_set_max_length">
+      </callback>
+      <callback name="set_position" c:type="set_position">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="editable">
+            <type name="Editable" c:type="GtkEditable*"/>
           </parameter>
-          <parameter name="max">
-            <type name="int32" c:type="gint"/>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_max_length" c:identifier="gtk_entry_get_max_length">
+      </callback>
+      <callback name="get_position" c:type="get_position">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="editable">
+            <type name="Editable" c:type="GtkEditable*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_activates_default"
-              c:identifier="gtk_entry_set_activates_default">
+      </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="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
           </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_activates_default"
-              c:identifier="gtk_entry_get_activates_default">
+      </glib:signal>
+      <glib:signal name="delete-text">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_width_chars" c:identifier="gtk_entry_set_width_chars">
+      </glib:signal>
+    </interface>
+    <function name="editable_select_region"
+              c:identifier="gtk_editable_select_region">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+        <parameter name="start">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="end">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_get_selection_bounds"
+              c:identifier="gtk_editable_get_selection_bounds">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+        <parameter name="start">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+        <parameter name="end">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_insert_text"
+              c:identifier="gtk_editable_insert_text">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+        <parameter name="new_text">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="new_text_length">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="position" direction="inout">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_delete_text"
+              c:identifier="gtk_editable_delete_text">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+        <parameter name="start_pos">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="end_pos">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_get_chars" c:identifier="gtk_editable_get_chars">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+        <parameter name="start_pos">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="end_pos">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_cut_clipboard"
+              c:identifier="gtk_editable_cut_clipboard">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_copy_clipboard"
+              c:identifier="gtk_editable_copy_clipboard">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_paste_clipboard"
+              c:identifier="gtk_editable_paste_clipboard">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_delete_selection"
+              c:identifier="gtk_editable_delete_selection">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_set_position"
+              c:identifier="gtk_editable_set_position">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+        <parameter name="position">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_get_position"
+              c:identifier="gtk_editable_get_position">
+      <return-value>
+        <type name="int" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_set_editable"
+              c:identifier="gtk_editable_set_editable">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+        <parameter name="is_editable">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_get_editable"
+              c:identifier="gtk_editable_get_editable">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="Editable" c:type="GtkEditable*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="IMContext"
+           c:type="GtkIMContext"
+           parent="GObject.Object"
+           glib:type-name="GtkIMContext"
+           glib:get-type="gtk_im_context_get_type">
+      <constructor name="simple_new" c:identifier="gtk_im_context_simple_new">
+        <return-value>
+          <type name="IMContext" c:type="GtkIMContext*"/>
+        </return-value>
+      </constructor>
+      <method name="set_client_window"
+              c:identifier="gtk_im_context_set_client_window">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
-          <parameter name="n_chars">
-            <type name="int32" c:type="gint"/>
+          <parameter name="window">
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_width_chars" c:identifier="gtk_entry_get_width_chars">
+      <method name="get_preedit_string"
+              c:identifier="gtk_im_context_get_preedit_string">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
+          </parameter>
+          <parameter name="str">
+            <type name="GLib.char" c:type="gchar**"/>
+          </parameter>
+          <parameter name="attrs">
+            <type name="Pango.AttrList" c:type="PangoAttrList**"/>
+          </parameter>
+          <parameter name="cursor_pos">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_text" c:identifier="gtk_entry_set_text">
+      <method name="filter_keypress"
+              c:identifier="gtk_im_context_filter_keypress">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="event">
+            <type name="Gdk.EventKey" c:type="GdkEventKey*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_text" c:identifier="gtk_entry_get_text">
+      <method name="focus_in" c:identifier="gtk_im_context_focus_in">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_layout" c:identifier="gtk_entry_get_layout">
+      <method name="focus_out" c:identifier="gtk_im_context_focus_out">
         <return-value>
-          <type name="Pango.Layout" c:type="PangoLayout*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_layout_offsets"
-              c:identifier="gtk_entry_get_layout_offsets">
+      <method name="reset" c:identifier="gtk_im_context_reset">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_alignment" c:identifier="gtk_entry_set_alignment">
+      <method name="set_cursor_location"
+              c:identifier="gtk_im_context_set_cursor_location">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
-          <parameter name="xalign">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_alignment" c:identifier="gtk_entry_get_alignment">
+      <method name="set_use_preedit"
+              c:identifier="gtk_im_context_set_use_preedit">
         <return-value>
-          <type name="float" c:type="gfloat"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
+          </parameter>
+          <parameter name="use_preedit">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_completion" c:identifier="gtk_entry_set_completion">
+      <method name="set_surrounding"
+              c:identifier="gtk_im_context_set_surrounding">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
-          <parameter name="completion" allow-none="1">
-            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="len">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="cursor_index">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_completion" c:identifier="gtk_entry_get_completion">
+      <method name="get_surrounding"
+              c:identifier="gtk_im_context_get_surrounding">
         <return-value>
-          <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="GLib.char" c:type="gchar**"/>
+          </parameter>
+          <parameter name="cursor_index">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="layout_index_to_text_index"
-              c:identifier="gtk_entry_layout_index_to_text_index">
+      <method name="delete_surrounding"
+              c:identifier="gtk_im_context_delete_surrounding">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
-          <parameter name="layout_index">
-            <type name="int32" c:type="gint"/>
+          <parameter name="offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="n_chars">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="text_index_to_layout_index"
-              c:identifier="gtk_entry_text_index_to_layout_index">
+      <callback name="preedit_start" c:type="preedit_start">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="text_index">
-            <type name="int32" c:type="gint"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_cursor_hadjustment"
-              c:identifier="gtk_entry_set_cursor_hadjustment">
+      </callback>
+      <callback name="preedit_end" c:type="preedit_end">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_cursor_hadjustment"
-              c:identifier="gtk_entry_get_cursor_hadjustment">
+      </callback>
+      <callback name="preedit_changed" c:type="preedit_changed">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="append_text" c:identifier="gtk_entry_append_text">
+      </callback>
+      <callback name="commit" c:type="commit">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
-          <parameter name="text">
+          <parameter name="str">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="prepend_text" c:identifier="gtk_entry_prepend_text">
+      </callback>
+      <callback name="retrieve_surrounding" c:type="retrieve_surrounding">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_position" c:identifier="gtk_entry_set_position">
+      </callback>
+      <callback name="delete_surrounding" c:type="delete_surrounding">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
+          <parameter name="offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="n_chars">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="select_region" c:identifier="gtk_entry_select_region">
+      </callback>
+      <callback name="set_client_window" c:type="set_client_window">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="int32" c:type="gint"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
-          <parameter name="end">
-            <type name="int32" c:type="gint"/>
+          <parameter name="window">
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_editable" c:identifier="gtk_entry_set_editable">
+      </callback>
+      <callback name="get_preedit_string" c:type="get_preedit_string">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
-          <parameter name="editable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="str">
+            <type name="GLib.char" c:type="gchar**"/>
+          </parameter>
+          <parameter name="attrs">
+            <type name="Pango.AttrList" c:type="PangoAttrList**"/>
+          </parameter>
+          <parameter name="cursor_pos">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="cursor-position">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="selection-bound">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="editable">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="max-length">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="visibility">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="has-frame">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="inner-border">
-        <type name="Border" c:type="GtkBorder"/>
-      </property>
-      <property name="invisible-char">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <property name="activates-default">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="width-chars">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="scroll-offset">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="text">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="xalign">
-        <type name="float" c:type="gfloat"/>
-      </property>
-      <property name="truncate-multiline">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="shadow-type">
-        <type name="ShadowType" c:type="GtkShadowType"/>
-      </property>
-      <callback name="populate_popup">
+      </callback>
+      <callback name="filter_keypress" c:type="filter_keypress">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
-          <parameter name="menu">
-            <type name="Menu" c:type="GtkMenu*"/>
+          <parameter name="event">
+            <type name="Gdk.EventKey" c:type="GdkEventKey*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="activate">
+      <callback name="focus_in" c:type="focus_in">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="move_cursor">
+      <callback name="focus_out" c:type="focus_out">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="step">
-            <type name="MovementStep" c:type="GtkMovementStep"/>
-          </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="extend_selection">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="insert_at_cursor">
+      <callback name="reset" c:type="reset">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="str">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="delete_from_cursor">
+      <callback name="set_cursor_location" c:type="set_cursor_location">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="DeleteType" c:type="GtkDeleteType"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
           </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
+          <parameter name="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="backspace">
+      <callback name="set_use_preedit" c:type="set_use_preedit">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
+          </parameter>
+          <parameter name="use_preedit">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="cut_clipboard">
+      <callback name="set_surrounding" c:type="set_surrounding">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="len">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="cursor_index">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="copy_clipboard">
+      <callback name="get_surrounding" c:type="get_surrounding">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="GLib.char" c:type="gchar**"/>
+          </parameter>
+          <parameter name="cursor_index">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="paste_clipboard">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="toggle_overwrite">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="entry">
-            <type name="Entry" c:type="GtkEntry*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved5" c:type="_gtk_reserved5">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="move-cursor">
+      <callback name="gtk_reserved6" c:type="_gtk_reserved6">
         <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">
+      </callback>
+      <glib:signal name="preedit-start">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-      <glib:signal name="populate-popup">
+      <glib:signal name="preedit-end">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Menu" c:type="GtkMenu"/>
-          </parameter>
-        </parameters>
       </glib:signal>
-      <glib:signal name="activate">
+      <glib:signal name="preedit-changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-      <glib:signal name="insert-at-cursor">
+      <glib:signal name="commit">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -35674,11064 +36235,10097 @@
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="delete-from-cursor">
+      <glib:signal name="retrieve-surrounding">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="delete-surrounding">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="DeleteType" c:type="GtkDeleteType"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="p0">
-            <type name="int32" c:type="gint"/>
+            <type name="int" 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>
     </class>
-    <function name="entry_new" c:identifier="gtk_entry_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="entry_new_with_max_length"
-              c:identifier="gtk_entry_new_with_max_length">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="max">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkTreeViewPrivate" c:type="GtkTreeViewPrivate"/>
-    <callback name="GtkTreeViewColumnDropFunc">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_view">
-          <type name="TreeView" c:type="GtkTreeView*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-        </parameter>
-        <parameter name="prev_column">
-          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-        </parameter>
-        <parameter name="next_column">
-          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkTreeViewMappingFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_view">
-          <type name="TreeView" c:type="GtkTreeView*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkTreeViewSearchEqualFunc">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="key">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
-        </parameter>
-        <parameter name="search_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkTreeViewRowSeparatorFunc">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="iter">
-          <type name="TreeIter" c:type="GtkTreeIter*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkTreeViewSearchPositionFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_view">
-          <type name="TreeView" c:type="GtkTreeView*"/>
-        </parameter>
-        <parameter name="search_dialog">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <class name="TreeView"
-           c:type="GtkTreeView"
-           parent="Container"
-           glib:type-name="GtkTreeView"
-           glib:get-type="gtk_tree_view_get_type">
-      <method name="get_model" c:identifier="gtk_tree_view_get_model">
-        <return-value>
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_model" c:identifier="gtk_tree_view_set_model">
+    <class name="ListStore"
+           c:type="GtkListStore"
+           parent="GObject.Object"
+           glib:type-name="GtkListStore"
+           glib:get-type="gtk_list_store_get_type">
+      <constructor name="new" c:identifier="gtk_list_store_new">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="ListStore" c:type="GtkListStore*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="model" allow-none="1">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="n_columns">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_selection" c:identifier="gtk_tree_view_get_selection">
+      </constructor>
+      <constructor name="newv" c:identifier="gtk_list_store_newv">
         <return-value>
-          <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          <type name="ListStore" c:type="GtkListStore*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="n_columns">
+            <type name="int" c:type="gint"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_hadjustment"
-              c:identifier="gtk_tree_view_get_hadjustment">
-        <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="types">
+            <type name="GObject.Type" c:type="GType*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_hadjustment"
-              c:identifier="gtk_tree_view_set_hadjustment">
+      </constructor>
+      <method name="set_column_types"
+              c:identifier="gtk_list_store_set_column_types">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="n_columns">
+            <type name="int" c:type="gint"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_vadjustment"
-              c:identifier="gtk_tree_view_get_vadjustment">
-        <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="types">
+            <type name="GObject.Type" c:type="GType*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_vadjustment"
-              c:identifier="gtk_tree_view_set_vadjustment">
+      <method name="set_value" c:identifier="gtk_list_store_set_value">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_headers_visible"
-              c:identifier="gtk_tree_view_get_headers_visible">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="value">
+            <type name="GObject.Value" c:type="GValue*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_headers_visible"
-              c:identifier="gtk_tree_view_set_headers_visible">
+      <method name="set" c:identifier="gtk_list_store_set">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-          <parameter name="headers_visible">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="columns_autosize"
-              c:identifier="gtk_tree_view_columns_autosize">
+      <method name="set_valuesv" c:identifier="gtk_list_store_set_valuesv">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="columns">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="values">
+            <type name="GObject.Value" c:type="GValue*"/>
+          </parameter>
+          <parameter name="n_values">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_headers_clickable"
-              c:identifier="gtk_tree_view_get_headers_clickable">
+      <method name="remove" c:identifier="gtk_list_store_remove">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_headers_clickable"
-              c:identifier="gtk_tree_view_set_headers_clickable">
+      <method name="insert" c:identifier="gtk_list_store_insert">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_rules_hint"
-              c:identifier="gtk_tree_view_set_rules_hint">
+      <method name="insert_before" c:identifier="gtk_list_store_insert_before">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_rules_hint"
-              c:identifier="gtk_tree_view_get_rules_hint">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="sibling">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="append_column" c:identifier="gtk_tree_view_append_column">
+      <method name="insert_after" c:identifier="gtk_list_store_insert_after">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="remove_column" c:identifier="gtk_tree_view_remove_column">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="sibling">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_column" c:identifier="gtk_tree_view_insert_column">
+      <method name="insert_with_values"
+              c:identifier="gtk_list_store_insert_with_values">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-          <parameter name="column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
           <parameter name="position">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_column_with_attributes"
-              c:identifier="gtk_tree_view_insert_column_with_attributes">
+      <method name="insert_with_valuesv"
+              c:identifier="gtk_list_store_insert_with_valuesv">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="title">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="insert_column_with_data_func"
-              c:identifier="gtk_tree_view_insert_column_with_data_func">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
           <parameter name="position">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="title">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="func">
-            <type name="GtkTreeCellDataFunc" c:type="GtkTreeCellDataFunc"/>
+          <parameter name="columns">
+            <type name="int" c:type="gint*"/>
           </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="values">
+            <type name="GObject.Value" c:type="GValue*"/>
           </parameter>
-          <parameter name="dnotify">
-            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+          <parameter name="n_values">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_column" c:identifier="gtk_tree_view_get_column">
+      <method name="prepend" c:identifier="gtk_list_store_prepend">
         <return-value>
-          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="n">
-            <type name="int32" c:type="gint"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_columns" c:identifier="gtk_tree_view_get_columns">
-        <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_column_after"
-              c:identifier="gtk_tree_view_move_column_after">
+      <method name="append" c:identifier="gtk_list_store_append">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-          <parameter name="base_column" allow-none="1">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_expander_column"
-              c:identifier="gtk_tree_view_set_expander_column">
+      <method name="clear" c:identifier="gtk_list_store_clear">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_expander_column"
-              c:identifier="gtk_tree_view_get_expander_column">
+      <method name="iter_is_valid" c:identifier="gtk_list_store_iter_is_valid">
         <return-value>
-          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="list_store">
+            <type name="ListStore" c:type="GtkListStore*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_column_drag_function"
-              c:identifier="gtk_tree_view_set_column_drag_function">
+      <method name="reorder" c:identifier="gtk_list_store_reorder">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTreeViewColumnDropFunc"
-                  c:type="GtkTreeViewColumnDropFunc"/>
-          </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-          <parameter name="destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+          <parameter name="new_order">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="scroll_to_point"
-              c:identifier="gtk_tree_view_scroll_to_point">
+      <method name="swap" c:identifier="gtk_list_store_swap">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-          <parameter name="tree_x">
-            <type name="int32" c:type="gint"/>
+          <parameter name="a">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="tree_y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="b">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="scroll_to_cell"
-              c:identifier="gtk_tree_view_scroll_to_cell">
+      <method name="move_after" c:identifier="gtk_list_store_move_after">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="column" allow-none="1">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="use_align">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-          <parameter name="row_align">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="col_align">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="position" allow-none="1">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="row_activated" c:identifier="gtk_tree_view_row_activated">
+      <method name="move_before" c:identifier="gtk_list_store_move_before">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="store">
+            <type name="ListStore" c:type="GtkListStore*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="position" allow-none="1">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="expand_all" c:identifier="gtk_tree_view_expand_all">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <callback name="TreeModelFilterVisibleFunc"
+              c:type="GtkTreeModelFilterVisibleFunc">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="TreeModelFilterModifyFunc"
+              c:type="GtkTreeModelFilterModifyFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="column">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <class name="TreeModelFilter"
+           c:type="GtkTreeModelFilter"
+           parent="GObject.Object"
+           glib:type-name="GtkTreeModelFilter"
+           glib:get-type="gtk_tree_model_filter_get_type">
+      <method name="set_visible_func"
+              c:identifier="gtk_tree_model_filter_set_visible_func">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="filter">
+            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="TreeModelFilterVisibleFunc"
+                  c:type="GtkTreeModelFilterVisibleFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
-      <method name="collapse_all" c:identifier="gtk_tree_view_collapse_all">
+      <method name="set_modify_func"
+              c:identifier="gtk_tree_model_filter_set_modify_func">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="filter">
+            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
+          </parameter>
+          <parameter name="n_columns">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="types">
+            <type name="GObject.Type" c:type="GType*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="TreeModelFilterModifyFunc"
+                  c:type="GtkTreeModelFilterModifyFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
-      <method name="expand_to_path"
-              c:identifier="gtk_tree_view_expand_to_path">
+      <method name="set_visible_column"
+              c:identifier="gtk_tree_model_filter_set_visible_column">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="filter">
+            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="expand_row" c:identifier="gtk_tree_view_expand_row">
+      <method name="get_model" c:identifier="gtk_tree_model_filter_get_model">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="open_all">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="filter">
+            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="collapse_row" c:identifier="gtk_tree_view_collapse_row">
+      <method name="convert_child_iter_to_iter"
+              c:identifier="gtk_tree_model_filter_convert_child_iter_to_iter">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="filter">
+            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="filter_iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="child_iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="map_expanded_rows"
-              c:identifier="gtk_tree_view_map_expanded_rows">
+      <method name="convert_iter_to_child_iter"
+              c:identifier="gtk_tree_model_filter_convert_iter_to_child_iter">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="filter">
+            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
           </parameter>
-          <parameter name="func">
-            <type name="GtkTreeViewMappingFunc"
-                  c:type="GtkTreeViewMappingFunc"/>
+          <parameter name="child_iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="filter_iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="row_expanded" c:identifier="gtk_tree_view_row_expanded">
+      <method name="convert_child_path_to_path"
+              c:identifier="gtk_tree_model_filter_convert_child_path_to_path">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="filter">
+            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
           </parameter>
-          <parameter name="path">
+          <parameter name="child_path">
             <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_reorderable"
-              c:identifier="gtk_tree_view_set_reorderable">
+      <method name="convert_path_to_child_path"
+              c:identifier="gtk_tree_model_filter_convert_path_to_child_path">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="filter">
+            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
           </parameter>
-          <parameter name="reorderable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="filter_path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_reorderable"
-              c:identifier="gtk_tree_view_get_reorderable">
+      <method name="refilter" c:identifier="gtk_tree_model_filter_refilter">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="filter">
+            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_cursor" c:identifier="gtk_tree_view_set_cursor">
+      <method name="clear_cache"
+              c:identifier="gtk_tree_model_filter_clear_cache">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="focus_column" allow-none="1">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="start_editing">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="filter">
+            <type name="TreeModelFilter" c:type="GtkTreeModelFilter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_cursor_on_cell"
-              c:identifier="gtk_tree_view_set_cursor_on_cell">
+      <property name="child-model">
+        <type name="TreeModel" c:type="GtkTreeModel"/>
+      </property>
+      <property name="virtual-root">
+        <type name="TreePath" c:type="GtkTreePath"/>
+      </property>
+      <callback name="gtk_reserved0" c:type="_gtk_reserved0">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="focus_column" allow-none="1">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
-          </parameter>
-          <parameter name="focus_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_tree_view_get_cursor">
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <record name="TreeModelFilterPrivate" c:type="GtkTreeModelFilterPrivate"/>
+    <function name="tree_model_filter_new"
+              c:identifier="gtk_tree_model_filter_new">
+      <return-value>
+        <type name="TreeModel" c:type="GtkTreeModel*"/>
+      </return-value>
+      <parameters>
+        <parameter name="child_model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </parameter>
+        <parameter name="root" allow-none="1">
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="EntryCompletion"
+           c:type="GtkEntryCompletion"
+           parent="GObject.Object"
+           glib:type-name="GtkEntryCompletion"
+           glib:get-type="gtk_entry_completion_get_type">
+      <constructor name="new" c:identifier="gtk_entry_completion_new">
+        <return-value>
+          <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+        </return-value>
+      </constructor>
+      <method name="get_entry" c:identifier="gtk_entry_completion_get_entry">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
-          </parameter>
-          <parameter name="focus_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn**"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_bin_window"
-              c:identifier="gtk_tree_view_get_bin_window">
+      <method name="set_model" c:identifier="gtk_entry_completion_set_model">
         <return-value>
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          </parameter>
+          <parameter name="model" allow-none="1">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_path_at_pos"
-              c:identifier="gtk_tree_view_get_path_at_pos">
+      <method name="get_model" c:identifier="gtk_entry_completion_get_model">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </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="column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn**"/>
-          </parameter>
-          <parameter name="cell_x">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="cell_y">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_cell_area" c:identifier="gtk_tree_view_get_cell_area">
+      <method name="set_match_func"
+              c:identifier="gtk_entry_completion_set_match_func">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="func">
+            <type name="EntryCompletionMatchFunc"
+                  c:type="GtkEntryCompletionMatchFunc"/>
           </parameter>
-          <parameter name="column" allow-none="1">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="func_data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
-          <parameter name="rect">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="func_notify">
+            <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_background_area"
-              c:identifier="gtk_tree_view_get_background_area">
+      <method name="set_minimum_key_length"
+              c:identifier="gtk_entry_completion_set_minimum_key_length">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="rect">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="length">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_visible_rect"
-              c:identifier="gtk_tree_view_get_visible_rect">
+      <method name="get_minimum_key_length"
+              c:identifier="gtk_entry_completion_get_minimum_key_length">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="visible_rect">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="widget_to_tree_coords"
-              c:identifier="gtk_tree_view_widget_to_tree_coords">
+      <method name="complete" c:identifier="gtk_entry_completion_complete">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="wx">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="wy">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="tx">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="ty">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="tree_to_widget_coords"
-              c:identifier="gtk_tree_view_tree_to_widget_coords">
+      <method name="insert_prefix"
+              c:identifier="gtk_entry_completion_insert_prefix">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="tx">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="ty">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="wx">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="wy">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_visible_range"
-              c:identifier="gtk_tree_view_get_visible_range">
+      <method name="insert_action_text"
+              c:identifier="gtk_entry_completion_insert_action_text">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="start_path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
+          <parameter name="index_">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="end_path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="enable_model_drag_source"
-              c:identifier="gtk_tree_view_enable_model_drag_source">
+      <method name="insert_action_markup"
+              c:identifier="gtk_entry_completion_insert_action_markup">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="start_button_mask">
-            <type name="GdkModifierType" c:type="GdkModifierType"/>
-          </parameter>
-          <parameter name="targets">
-            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="n_targets">
-            <type name="int32" c:type="gint"/>
+          <parameter name="index_">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="actions">
-            <type name="GdkDragAction" c:type="GdkDragAction"/>
+          <parameter name="markup">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="enable_model_drag_dest"
-              c:identifier="gtk_tree_view_enable_model_drag_dest">
+      <method name="delete_action"
+              c:identifier="gtk_entry_completion_delete_action">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="targets">
-            <type name="GtkTargetEntry" c:type="GtkTargetEntry*"/>
-          </parameter>
-          <parameter name="n_targets">
-            <type name="int32" c:type="gint"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="actions">
-            <type name="GdkDragAction" c:type="GdkDragAction"/>
+          <parameter name="index_">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unset_rows_drag_source"
-              c:identifier="gtk_tree_view_unset_rows_drag_source">
+      <method name="set_inline_completion"
+              c:identifier="gtk_entry_completion_set_inline_completion">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          </parameter>
+          <parameter name="inline_completion">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unset_rows_drag_dest"
-              c:identifier="gtk_tree_view_unset_rows_drag_dest">
+      <method name="get_inline_completion"
+              c:identifier="gtk_entry_completion_get_inline_completion">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_drag_dest_row"
-              c:identifier="gtk_tree_view_set_drag_dest_row">
+      <method name="set_inline_selection"
+              c:identifier="gtk_entry_completion_set_inline_selection">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="inline_selection">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="pos">
-            <type name="TreeViewDropPosition"
-                  c:type="GtkTreeViewDropPosition"/>
+        </parameters>
+      </method>
+      <method name="get_inline_selection"
+              c:identifier="gtk_entry_completion_get_inline_selection">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_drag_dest_row"
-              c:identifier="gtk_tree_view_get_drag_dest_row">
+      <method name="set_popup_completion"
+              c:identifier="gtk_entry_completion_set_popup_completion">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="pos">
-            <type name="TreeViewDropPosition"
-                  c:type="GtkTreeViewDropPosition*"/>
+          <parameter name="popup_completion">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_dest_row_at_pos"
-              c:identifier="gtk_tree_view_get_dest_row_at_pos">
+      <method name="get_popup_completion"
+              c:identifier="gtk_entry_completion_get_popup_completion">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="drag_x">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="drag_y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
+        </parameters>
+      </method>
+      <method name="set_popup_set_width"
+              c:identifier="gtk_entry_completion_set_popup_set_width">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="pos">
-            <type name="TreeViewDropPosition"
-                  c:type="GtkTreeViewDropPosition*"/>
+          <parameter name="popup_set_width">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="create_row_drag_icon"
-              c:identifier="gtk_tree_view_create_row_drag_icon">
+      <method name="get_popup_set_width"
+              c:identifier="gtk_entry_completion_get_popup_set_width">
         <return-value>
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_enable_search"
-              c:identifier="gtk_tree_view_set_enable_search">
+      <method name="set_popup_single_match"
+              c:identifier="gtk_entry_completion_set_popup_single_match">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="enable_search">
+          <parameter name="popup_single_match">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_enable_search"
-              c:identifier="gtk_tree_view_get_enable_search">
+      <method name="get_popup_single_match"
+              c:identifier="gtk_entry_completion_get_popup_single_match">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_search_column"
-              c:identifier="gtk_tree_view_get_search_column">
+      <method name="get_completion_prefix"
+              c:identifier="gtk_entry_completion_get_completion_prefix">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_search_column"
-              c:identifier="gtk_tree_view_set_search_column">
+      <method name="set_text_column"
+              c:identifier="gtk_entry_completion_set_text_column">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
           <parameter name="column">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_search_equal_func"
-              c:identifier="gtk_tree_view_get_search_equal_func">
+      <method name="get_text_column"
+              c:identifier="gtk_entry_completion_get_text_column">
         <return-value>
-          <type name="GtkTreeViewSearchEqualFunc"
-                c:type="GtkTreeViewSearchEqualFunc"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_search_equal_func"
-              c:identifier="gtk_tree_view_set_search_equal_func">
+      <property name="model">
+        <type name="TreeModel" c:type="GtkTreeModel"/>
+      </property>
+      <property name="minimum-key-length">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="text-column">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="inline-completion">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="popup-completion">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="popup-set-width">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="popup-single-match">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="inline-selection">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="match_selected" c:type="match_selected">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="search_equal_func">
-            <type name="GtkTreeViewSearchEqualFunc"
-                  c:type="GtkTreeViewSearchEqualFunc"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="search_user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="model">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
-          <parameter name="search_destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_search_entry"
-              c:identifier="gtk_tree_view_get_search_entry">
+      </callback>
+      <callback name="action_activated" c:type="action_activated">
         <return-value>
-          <type name="Entry" c:type="GtkEntry*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          </parameter>
+          <parameter name="index_">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_search_entry"
-              c:identifier="gtk_tree_view_set_search_entry">
+      </callback>
+      <callback name="insert_prefix" c:type="insert_prefix">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
-          <parameter name="entry" allow-none="1">
-            <type name="Entry" c:type="GtkEntry*"/>
+          <parameter name="prefix">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_search_position_func"
-              c:identifier="gtk_tree_view_get_search_position_func">
+      </callback>
+      <callback name="cursor_on_match" c:type="cursor_on_match">
         <return-value>
-          <type name="GtkTreeViewSearchPositionFunc"
-                c:type="GtkTreeViewSearchPositionFunc"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          </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="set_search_position_func"
-              c:identifier="gtk_tree_view_set_search_position_func">
+      </callback>
+      <callback name="gtk_reserved0" c:type="_gtk_reserved0">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+      </callback>
+      <glib:signal name="insert-prefix">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTreeViewSearchPositionFunc"
-                  c:type="GtkTreeViewSearchPositionFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-          <parameter name="destroy">
-            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="convert_widget_to_tree_coords"
-              c:identifier="gtk_tree_view_convert_widget_to_tree_coords">
+      </glib:signal>
+      <glib:signal name="match-selected">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="wx">
-            <type name="int32" c:type="gint"/>
+          <parameter name="object">
+            <type name="TreeModel" c:type="GtkTreeModel"/>
           </parameter>
-          <parameter name="wy">
-            <type name="int32" c:type="gint"/>
+          <parameter name="p0">
+            <type name="TreeIter" c:type="GtkTreeIter"/>
           </parameter>
-          <parameter name="tx">
-            <type name="GLib.gint" c:type="gint*"/>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="cursor-on-match">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="TreeModel" c:type="GtkTreeModel"/>
           </parameter>
-          <parameter name="ty">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="p0">
+            <type name="TreeIter" c:type="GtkTreeIter"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="convert_tree_to_widget_coords"
-              c:identifier="gtk_tree_view_convert_tree_to_widget_coords">
+      </glib:signal>
+      <glib:signal name="action-activated">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="tx">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="ty">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="wx">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="wy">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="convert_widget_to_bin_window_coords"
-              c:identifier="gtk_tree_view_convert_widget_to_bin_window_coords">
+      </glib:signal>
+    </class>
+    <record name="EntryCompletionPrivate" c:type="GtkEntryCompletionPrivate"/>
+    <callback name="EntryCompletionMatchFunc"
+              c:type="GtkEntryCompletionMatchFunc">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="completion">
+          <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+        </parameter>
+        <parameter name="key">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <class name="Entry"
+           c:type="GtkEntry"
+           parent="Widget"
+           glib:type-name="GtkEntry"
+           glib:get-type="gtk_entry_get_type">
+      <method name="set_visibility" c:identifier="gtk_entry_set_visibility">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </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 name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="by">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="visible">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="convert_bin_window_to_widget_coords"
-              c:identifier="gtk_tree_view_convert_bin_window_to_widget_coords">
+      <method name="get_visibility" c:identifier="gtk_entry_get_visibility">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="bx">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="by">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="wx">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="wy">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="convert_tree_to_bin_window_coords"
-              c:identifier="gtk_tree_view_convert_tree_to_bin_window_coords">
+      <method name="set_invisible_char"
+              c:identifier="gtk_entry_set_invisible_char">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="tx">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="ty">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="bx">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="by">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="ch">
+            <type name="GLib.unichar" c:type="gunichar"/>
           </parameter>
         </parameters>
       </method>
-      <method name="convert_bin_window_to_tree_coords"
-              c:identifier="gtk_tree_view_convert_bin_window_to_tree_coords">
+      <method name="get_invisible_char"
+              c:identifier="gtk_entry_get_invisible_char">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.unichar" c:type="gunichar"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="bx">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="by">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="tx">
-            <type name="GLib.gint" c:type="gint*"/>
-          </parameter>
-          <parameter name="ty">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_destroy_count_func"
-              c:identifier="gtk_tree_view_set_destroy_count_func">
+      <method name="set_has_frame" c:identifier="gtk_entry_set_has_frame">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTreeDestroyCountFunc"
-                  c:type="GtkTreeDestroyCountFunc"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+        </parameters>
+      </method>
+      <method name="get_has_frame" c:identifier="gtk_entry_get_has_frame">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_fixed_height_mode"
-              c:identifier="gtk_tree_view_set_fixed_height_mode">
+      <method name="set_inner_border"
+              c:identifier="gtk_entry_set_inner_border">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="enable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="border" allow-none="1">
+            <type name="Border" c:type="GtkBorder*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_fixed_height_mode"
-              c:identifier="gtk_tree_view_get_fixed_height_mode">
+      <method name="get_inner_border"
+              c:identifier="gtk_entry_get_inner_border">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Border" c:type="GtkBorder*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_hover_selection"
-              c:identifier="gtk_tree_view_set_hover_selection">
+      <method name="set_max_length" c:identifier="gtk_entry_set_max_length">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="hover">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="max">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_hover_selection"
-              c:identifier="gtk_tree_view_get_hover_selection">
+      <method name="get_max_length" c:identifier="gtk_entry_get_max_length">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_hover_expand"
-              c:identifier="gtk_tree_view_set_hover_expand">
+      <method name="set_activates_default"
+              c:identifier="gtk_entry_set_activates_default">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="expand">
+          <parameter name="setting">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_hover_expand"
-              c:identifier="gtk_tree_view_get_hover_expand">
+      <method name="get_activates_default"
+              c:identifier="gtk_entry_get_activates_default">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_rubber_banding"
-              c:identifier="gtk_tree_view_set_rubber_banding">
+      <method name="set_width_chars" c:identifier="gtk_entry_set_width_chars">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="enable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="n_chars">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_rubber_banding"
-              c:identifier="gtk_tree_view_get_rubber_banding">
+      <method name="get_width_chars" c:identifier="gtk_entry_get_width_chars">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="is_rubber_banding_active"
-              c:identifier="gtk_tree_view_is_rubber_banding_active">
+      <method name="set_text" c:identifier="gtk_entry_set_text">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_text" c:identifier="gtk_entry_get_text">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_row_separator_func"
-              c:identifier="gtk_tree_view_get_row_separator_func">
+      <method name="get_layout" c:identifier="gtk_entry_get_layout">
         <return-value>
-          <type name="GtkTreeViewRowSeparatorFunc"
-                c:type="GtkTreeViewRowSeparatorFunc"/>
+          <type name="Pango.Layout" c:type="PangoLayout*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_row_separator_func"
-              c:identifier="gtk_tree_view_set_row_separator_func">
+      <method name="get_layout_offsets"
+              c:identifier="gtk_entry_get_layout_offsets">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTreeViewRowSeparatorFunc"
-                  c:type="GtkTreeViewRowSeparatorFunc"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="x">
+            <type name="int" c:type="gint*"/>
           </parameter>
-          <parameter name="destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+          <parameter name="y">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_grid_lines"
-              c:identifier="gtk_tree_view_get_grid_lines">
+      <method name="set_alignment" c:identifier="gtk_entry_set_alignment">
         <return-value>
-          <type name="TreeViewGridLines" c:type="GtkTreeViewGridLines"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
+          </parameter>
+          <parameter name="xalign">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_grid_lines"
-              c:identifier="gtk_tree_view_set_grid_lines">
+      <method name="get_alignment" c:identifier="gtk_entry_get_alignment">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="float" c:type="gfloat"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="grid_lines">
-            <type name="TreeViewGridLines" c:type="GtkTreeViewGridLines"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_enable_tree_lines"
-              c:identifier="gtk_tree_view_get_enable_tree_lines">
+      <method name="set_completion" c:identifier="gtk_entry_set_completion">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
+          </parameter>
+          <parameter name="completion" allow-none="1">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_enable_tree_lines"
-              c:identifier="gtk_tree_view_set_enable_tree_lines">
+      <method name="get_completion" c:identifier="gtk_entry_get_completion">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="enabled">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_show_expanders"
-              c:identifier="gtk_tree_view_set_show_expanders">
+      <method name="layout_index_to_text_index"
+              c:identifier="gtk_entry_layout_index_to_text_index">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="enabled">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="layout_index">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_show_expanders"
-              c:identifier="gtk_tree_view_get_show_expanders">
+      <method name="text_index_to_layout_index"
+              c:identifier="gtk_entry_text_index_to_layout_index">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
+          </parameter>
+          <parameter name="text_index">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_level_indentation"
-              c:identifier="gtk_tree_view_set_level_indentation">
+      <method name="set_cursor_hadjustment"
+              c:identifier="gtk_entry_set_cursor_hadjustment">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="indentation">
-            <type name="int32" c:type="gint"/>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_level_indentation"
-              c:identifier="gtk_tree_view_get_level_indentation">
+      <method name="get_cursor_hadjustment"
+              c:identifier="gtk_entry_get_cursor_hadjustment">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tooltip_row"
-              c:identifier="gtk_tree_view_set_tooltip_row">
+      <method name="append_text" c:identifier="gtk_entry_append_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tooltip_cell"
-              c:identifier="gtk_tree_view_set_tooltip_cell">
+      <method name="prepend_text" c:identifier="gtk_entry_prepend_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_tooltip_context"
-              c:identifier="gtk_tree_view_get_tooltip_context">
+      <method name="set_position" c:identifier="gtk_entry_set_position">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </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>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tooltip_column"
-              c:identifier="gtk_tree_view_set_tooltip_column">
+      <method name="select_region" c:identifier="gtk_entry_select_region">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="column">
-            <type name="int32" c:type="gint"/>
+          <parameter name="start">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="end">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_tooltip_column"
-              c:identifier="gtk_tree_view_get_tooltip_column">
+      <method name="set_editable" c:identifier="gtk_entry_set_editable">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
+          </parameter>
+          <parameter name="editable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <property name="model">
-        <type name="TreeModel" c:type="GtkTreeModel"/>
-      </property>
-      <property name="hadjustment">
-        <type name="Adjustment" c:type="GtkAdjustment"/>
-      </property>
-      <property name="vadjustment">
-        <type name="Adjustment" c:type="GtkAdjustment"/>
+      <property name="cursor-position">
+        <type name="int" c:type="gint"/>
       </property>
-      <property name="headers-visible">
-        <type name="boolean" c:type="gboolean"/>
+      <property name="selection-bound">
+        <type name="int" c:type="gint"/>
       </property>
-      <property name="headers-clickable">
+      <property name="editable">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="expander-column">
-        <type name="TreeViewColumn" c:type="GtkTreeViewColumn"/>
-      </property>
-      <property name="reorderable">
-        <type name="boolean" c:type="gboolean"/>
+      <property name="max-length">
+        <type name="int" c:type="gint"/>
       </property>
-      <property name="rules-hint">
+      <property name="visibility">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="enable-search">
+      <property name="has-frame">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="search-column">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="fixed-height-mode">
-        <type name="boolean" c:type="gboolean"/>
+      <property name="inner-border">
+        <type name="Border" c:type="GtkBorder"/>
       </property>
-      <property name="hover-selection">
-        <type name="boolean" c:type="gboolean"/>
+      <property name="invisible-char">
+        <type name="uint" c:type="guint"/>
       </property>
-      <property name="hover-expand">
+      <property name="activates-default">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="show-expanders">
-        <type name="boolean" c:type="gboolean"/>
+      <property name="width-chars">
+        <type name="int" c:type="gint"/>
       </property>
-      <property name="level-indentation">
-        <type name="int32" c:type="gint"/>
+      <property name="scroll-offset">
+        <type name="int" c:type="gint"/>
       </property>
-      <property name="rubber-banding">
-        <type name="boolean" c:type="gboolean"/>
+      <property name="text">
+        <type name="string" c:type="gchararray"/>
       </property>
-      <property name="enable-grid-lines">
-        <type name="TreeViewGridLines" c:type="GtkTreeViewGridLines"/>
+      <property name="xalign">
+        <type name="float" c:type="gfloat"/>
       </property>
-      <property name="enable-tree-lines">
+      <property name="truncate-multiline">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="tooltip-column">
-        <type name="int32" c:type="gint"/>
+      <property name="shadow-type">
+        <type name="ShadowType" c:type="GtkShadowType"/>
       </property>
-      <callback name="set_scroll_adjustments">
+      <callback name="populate_popup" c:type="populate_popup">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="hadjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="vadjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="row_activated">
+      <callback name="activate" c:type="activate">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-          <parameter name="column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="test_expand_row">
+      <callback name="move_cursor" c:type="move_cursor">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="test_collapse_row">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="step">
+            <type name="MovementStep" c:type="GtkMovementStep"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="extend_selection">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="row_expanded">
+      <callback name="insert_at_cursor" c:type="insert_at_cursor">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="str">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="row_collapsed">
+      <callback name="delete_from_cursor" c:type="delete_from_cursor">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="type">
+            <type name="DeleteType" c:type="GtkDeleteType"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="columns_changed">
+      <callback name="backspace" c:type="backspace">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="cursor_changed">
+      <callback name="cut_clipboard" c:type="cut_clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="move_cursor">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </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="select_all">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="unselect_all">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="select_cursor_row">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="start_editing">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="toggle_cursor_row">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="expand_collapse_cursor_row">
+      <callback name="copy_clipboard" c:type="copy_clipboard">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
-          </parameter>
-          <parameter name="logical">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="expand">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="open_all">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="select_cursor_parent">
+      <callback name="paste_clipboard" c:type="paste_clipboard">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="start_interactive_search">
+      <callback name="toggle_overwrite" c:type="toggle_overwrite">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_view">
-            <type name="TreeView" c:type="GtkTreeView*"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved0">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </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="row-activated">
-        <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="TreePath" c:type="GtkTreePath"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="test-expand-row">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="TreeIter" c:type="GtkTreeIter"/>
+            <type name="MovementStep" c:type="GtkMovementStep"/>
           </parameter>
           <parameter name="p0">
-            <type name="TreePath" c:type="GtkTreePath"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="test-collapse-row">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="TreeIter" c:type="GtkTreeIter"/>
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="p0">
-            <type name="TreePath" c:type="GtkTreePath"/>
+          <parameter name="p1">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="row-expanded">
+      <glib:signal name="copy-clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="TreeIter" c:type="GtkTreeIter"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="TreePath" c:type="GtkTreePath"/>
-          </parameter>
-        </parameters>
       </glib:signal>
-      <glib:signal name="row-collapsed">
+      <glib:signal name="populate-popup">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="TreeIter" c:type="GtkTreeIter"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="TreePath" c:type="GtkTreePath"/>
+            <type name="Menu" c:type="GtkMenu"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="columns-changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="cursor-changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="select-all">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="unselect-all">
+      <glib:signal name="activate">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-      <glib:signal name="select-cursor-row">
+      <glib:signal name="insert-at-cursor">
         <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"/>
+            <type name="string" c:type="gchararray"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="toggle-cursor-row">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="expand-collapse-cursor-row">
+      <glib:signal 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="boolean" c:type="gboolean"/>
+            <type name="DeleteType" c:type="GtkDeleteType"/>
           </parameter>
           <parameter name="p0">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="boolean" c:type="gboolean"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="select-cursor-parent">
+      <glib:signal name="backspace">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-      <glib:signal name="start-interactive-search">
+      <glib:signal name="cut-clipboard">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <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>
     </class>
-    <function name="tree_view_new" c:identifier="gtk_tree_view_new">
+    <function name="entry_new" c:identifier="gtk_entry_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
-    <function name="tree_view_new_with_model"
-              c:identifier="gtk_tree_view_new_with_model">
+    <function name="entry_new_with_max_length"
+              c:identifier="gtk_entry_new_with_max_length">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        <parameter name="max">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <callback name="GtkTreeDestroyCountFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tree_view">
-          <type name="TreeView" c:type="GtkTreeView*"/>
-        </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </parameter>
-        <parameter name="children">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <record name="GtkComboBoxPrivate" c:type="GtkComboBoxPrivate"/>
-    <class name="ComboBox"
-           c:type="GtkComboBox"
-           parent="Bin"
-           glib:type-name="GtkComboBox"
-           glib:get-type="gtk_combo_box_get_type">
-      <method name="get_wrap_width"
-              c:identifier="gtk_combo_box_get_wrap_width">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_wrap_width"
-              c:identifier="gtk_combo_box_set_wrap_width">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_row_span_column"
-              c:identifier="gtk_combo_box_get_row_span_column">
+    <class name="TreeView"
+           c:type="GtkTreeView"
+           parent="Container"
+           glib:type-name="GtkTreeView"
+           glib:get-type="gtk_tree_view_get_type">
+      <method name="get_model" c:identifier="gtk_tree_view_get_model">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_row_span_column"
-              c:identifier="gtk_combo_box_set_row_span_column">
+      <method name="set_model" c:identifier="gtk_tree_view_set_model">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-          <parameter name="row_span">
-            <type name="int32" c:type="gint"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_column_span_column"
-              c:identifier="gtk_combo_box_get_column_span_column">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="model" allow-none="1">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_column_span_column"
-              c:identifier="gtk_combo_box_set_column_span_column">
+      <method name="get_selection" c:identifier="gtk_tree_view_get_selection">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TreeSelection" c:type="GtkTreeSelection*"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-          <parameter name="column_span">
-            <type name="int32" c:type="gint"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_add_tearoffs"
-              c:identifier="gtk_combo_box_get_add_tearoffs">
+      <method name="get_hadjustment"
+              c:identifier="gtk_tree_view_get_hadjustment">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_add_tearoffs"
-              c:identifier="gtk_combo_box_set_add_tearoffs">
+      <method name="set_hadjustment"
+              c:identifier="gtk_tree_view_set_hadjustment">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="add_tearoffs">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_title" c:identifier="gtk_combo_box_get_title">
+      <method name="get_vadjustment"
+              c:identifier="gtk_tree_view_get_vadjustment">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_title" c:identifier="gtk_combo_box_set_title">
+      <method name="set_vadjustment"
+              c:identifier="gtk_tree_view_set_vadjustment">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="title">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_focus_on_click"
-              c:identifier="gtk_combo_box_get_focus_on_click">
+      <method name="get_headers_visible"
+              c:identifier="gtk_tree_view_get_headers_visible">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="combo">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_focus_on_click"
-              c:identifier="gtk_combo_box_set_focus_on_click">
+      <method name="set_headers_visible"
+              c:identifier="gtk_tree_view_set_headers_visible">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="combo">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="focus_on_click">
+          <parameter name="headers_visible">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_active" c:identifier="gtk_combo_box_get_active">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_active" c:identifier="gtk_combo_box_set_active">
+      <method name="columns_autosize"
+              c:identifier="gtk_tree_view_columns_autosize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-          <parameter name="index_">
-            <type name="int32" c:type="gint"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_active_iter"
-              c:identifier="gtk_combo_box_get_active_iter">
+      <method name="get_headers_clickable"
+              c:identifier="gtk_tree_view_get_headers_clickable">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_active_iter"
-              c:identifier="gtk_combo_box_set_active_iter">
+      <method name="set_headers_clickable"
+              c:identifier="gtk_tree_view_set_headers_clickable">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_model" c:identifier="gtk_combo_box_set_model">
+      <method name="set_rules_hint"
+              c:identifier="gtk_tree_view_set_rules_hint">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="model" allow-none="1">
-            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_model" c:identifier="gtk_combo_box_get_model">
+      <method name="get_rules_hint"
+              c:identifier="gtk_tree_view_get_rules_hint">
         <return-value>
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_row_separator_func"
-              c:identifier="gtk_combo_box_get_row_separator_func">
+      <method name="append_column" c:identifier="gtk_tree_view_append_column">
         <return-value>
-          <type name="GtkTreeViewRowSeparatorFunc"
-                c:type="GtkTreeViewRowSeparatorFunc"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_row_separator_func"
-              c:identifier="gtk_combo_box_set_row_separator_func">
+      <method name="remove_column" c:identifier="gtk_tree_view_remove_column">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkTreeViewRowSeparatorFunc"
-                  c:type="GtkTreeViewRowSeparatorFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="destroy">
-            <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+          <parameter name="column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="append_text" c:identifier="gtk_combo_box_append_text">
+      <method name="insert_column" c:identifier="gtk_tree_view_insert_column">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_text" c:identifier="gtk_combo_box_insert_text">
+      <method name="insert_column_with_attributes"
+              c:identifier="gtk_tree_view_insert_column_with_attributes">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
           <parameter name="position">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="text">
+          <parameter name="title">
             <type name="string" c:type="gchar*"/>
           </parameter>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="prepend_text" c:identifier="gtk_combo_box_prepend_text">
+      <method name="insert_column_with_data_func"
+              c:identifier="gtk_tree_view_insert_column_with_data_func">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="text">
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="title">
             <type name="string" c:type="gchar*"/>
           </parameter>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="TreeCellDataFunc" c:type="GtkTreeCellDataFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="dnotify">
+            <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="remove_text" c:identifier="gtk_combo_box_remove_text">
+      <method name="get_column" c:identifier="gtk_tree_view_get_column">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
+          <parameter name="n">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_active_text"
-              c:identifier="gtk_combo_box_get_active_text">
+      <method name="get_columns" c:identifier="gtk_tree_view_get_columns">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="popup" c:identifier="gtk_combo_box_popup">
+      <method name="move_column_after"
+              c:identifier="gtk_tree_view_move_column_after">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="base_column" allow-none="1">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="popdown" c:identifier="gtk_combo_box_popdown">
+      <method name="set_expander_column"
+              c:identifier="gtk_tree_view_set_expander_column">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_popup_accessible"
-              c:identifier="gtk_combo_box_get_popup_accessible">
+      <method name="get_expander_column"
+              c:identifier="gtk_tree_view_get_expander_column">
         <return-value>
-          <type name="Atk.Object" c:type="AtkObject*"/>
+          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="model">
-        <type name="TreeModel" c:type="GtkTreeModel"/>
-      </property>
-      <property name="wrap-width">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="row-span-column">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="column-span-column">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="active">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="add-tearoffs">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="tearoff-title">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="has-frame">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="focus-on-click">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="popup-shown">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="changed">
+      <method name="set_column_drag_function"
+              c:identifier="gtk_tree_view_set_column_drag_function">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_active_text">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="combo_box">
-            <type name="ComboBox" c:type="GtkComboBox*"/>
+          <parameter name="func">
+            <type name="TreeViewColumnDropFunc"
+                  c:type="GtkTreeViewColumnDropFunc"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved0">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </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="changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="move-active">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="ScrollType" c:type="GtkScrollType"/>
+          <parameter name="user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="popup">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="popdown">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="combo_box_new" c:identifier="gtk_combo_box_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="combo_box_new_with_model"
-              c:identifier="gtk_combo_box_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>
-    <function name="combo_box_new_text" c:identifier="gtk_combo_box_new_text">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="combo_box_editing_canceled"
-              c:identifier="_gtk_combo_box_editing_canceled">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="combo_box">
-          <type name="ComboBox" c:type="GtkComboBox*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkComboBoxEntryPrivate" c:type="GtkComboBoxEntryPrivate"/>
-    <class name="ComboBoxEntry"
-           c:type="GtkComboBoxEntry"
-           parent="ComboBox"
-           glib:type-name="GtkComboBoxEntry"
-           glib:get-type="gtk_combo_box_entry_get_type">
-      <method name="set_text_column"
-              c:identifier="gtk_combo_box_entry_set_text_column">
+      </method>
+      <method name="scroll_to_point"
+              c:identifier="gtk_tree_view_scroll_to_point">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry_box">
-            <type name="ComboBoxEntry" c:type="GtkComboBoxEntry*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="text_column">
-            <type name="int32" c:type="gint"/>
+          <parameter name="tree_x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="tree_y">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_text_column"
-              c:identifier="gtk_combo_box_entry_get_text_column">
+      <method name="scroll_to_cell"
+              c:identifier="gtk_tree_view_scroll_to_cell">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="entry_box">
-            <type name="ComboBoxEntry" c:type="GtkComboBoxEntry*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="column" allow-none="1">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="use_align">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="row_align">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="col_align">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
       </method>
-      <property name="text-column">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <callback name="_gtk_reserved0">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+      <method name="row_activated" c:identifier="gtk_tree_view_row_activated">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="expand_all" c:identifier="gtk_tree_view_expand_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-    </class>
-    <function name="combo_box_entry_new"
-              c:identifier="gtk_combo_box_entry_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="combo_box_entry_new_with_model"
-              c:identifier="gtk_combo_box_entry_new_with_model">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="model">
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </parameter>
-        <parameter name="text_column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="combo_box_entry_new_text"
-              c:identifier="gtk_combo_box_entry_new_text">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <class name="HBox"
-           c:type="GtkHBox"
-           parent="Box"
-           glib:type-name="GtkHBox"
-           glib:get-type="gtk_hbox_get_type">
-    </class>
-    <function name="hbox_new" c:identifier="gtk_hbox_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="homogeneous">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="spacing">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="Combo"
-           c:type="GtkCombo"
-           parent="HBox"
-           glib:type-name="GtkCombo"
-           glib:get-type="gtk_combo_get_type">
-      <method name="set_value_in_list"
-              c:identifier="gtk_combo_set_value_in_list">
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="collapse_all" c:identifier="gtk_tree_view_collapse_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="combo">
-            <type name="Combo" c:type="GtkCombo*"/>
-          </parameter>
-          <parameter name="val">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="ok_if_empty">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_use_arrows" c:identifier="gtk_combo_set_use_arrows">
+      <method name="expand_to_path"
+              c:identifier="gtk_tree_view_expand_to_path">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="combo">
-            <type name="Combo" c:type="GtkCombo*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="val">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_use_arrows_always"
-              c:identifier="gtk_combo_set_use_arrows_always">
+      <method name="expand_row" c:identifier="gtk_tree_view_expand_row">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="combo">
-            <type name="Combo" c:type="GtkCombo*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="val">
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="open_all">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_case_sensitive"
-              c:identifier="gtk_combo_set_case_sensitive">
+      <method name="collapse_row" c:identifier="gtk_tree_view_collapse_row">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="combo">
-            <type name="Combo" c:type="GtkCombo*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="val">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_item_string" c:identifier="gtk_combo_set_item_string">
+      <method name="map_expanded_rows"
+              c:identifier="gtk_tree_view_map_expanded_rows">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="combo">
-            <type name="Combo" c:type="GtkCombo*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="item">
-            <type name="Item" c:type="GtkItem*"/>
+          <parameter name="func">
+            <type name="TreeViewMappingFunc" c:type="GtkTreeViewMappingFunc"/>
           </parameter>
-          <parameter name="item_value">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_popdown_strings"
-              c:identifier="gtk_combo_set_popdown_strings">
+      <method name="row_expanded" c:identifier="gtk_tree_view_row_expanded">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="combo">
-            <type name="Combo" c:type="GtkCombo*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="strings">
-            <type name="GLib.GList" c:type="GList*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="disable_activate"
-              c:identifier="gtk_combo_disable_activate">
+      <method name="set_reorderable"
+              c:identifier="gtk_tree_view_set_reorderable">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="combo">
-            <type name="Combo" c:type="GtkCombo*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="reorderable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <property name="enable-arrow-keys">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="enable-arrows-always">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="case-sensitive">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="allow-empty">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="value-in-list">
-        <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">
+      <method name="get_reorderable"
+              c:identifier="gtk_tree_view_get_reorderable">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_cursor" c:identifier="gtk_tree_view_set_cursor">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="focus_column" allow-none="1">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="start_editing">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_cursor_on_cell"
+              c:identifier="gtk_tree_view_set_cursor_on_cell">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-    </class>
-    <function name="combo_new" c:identifier="gtk_combo_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <record name="GtkCTree" c:type="GtkCTree">
-      <field name="clist">
-        <type name="GtkCList" c:type="GtkCList"/>
-      </field>
-      <field name="lines_gc">
-        <type name="Gdk.GC" c:type="GdkGC*"/>
-      </field>
-      <field name="tree_indent">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="tree_spacing">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="tree_column">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="line_style">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="expander_style">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="show_stub">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <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">
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="focus_column" allow-none="1">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="focus_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_tree_view_get_cursor">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ctree">
-            <type name="GtkCTree" c:type="GtkCTree*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="row">
-            <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
           </parameter>
-          <parameter name="column">
-            <type name="int32" c:type="gint"/>
+          <parameter name="focus_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn**"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="tree_unselect_row">
+      </method>
+      <method name="get_bin_window"
+              c:identifier="gtk_tree_view_get_bin_window">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
         </return-value>
         <parameters>
-          <parameter name="ctree">
-            <type name="GtkCTree" c:type="GtkCTree*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="row">
-            <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+        </parameters>
+      </method>
+      <method name="get_path_at_pos"
+              c:identifier="gtk_tree_view_get_path_at_pos">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
           </parameter>
           <parameter name="column">
-            <type name="int32" c:type="gint"/>
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn**"/>
+          </parameter>
+          <parameter name="cell_x">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="cell_y">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="tree_expand">
+      </method>
+      <method name="get_cell_area" c:identifier="gtk_tree_view_get_cell_area">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ctree">
-            <type name="GtkCTree" c:type="GtkCTree*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="node">
-            <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="column" allow-none="1">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="rect">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="tree_collapse">
+      </method>
+      <method name="get_background_area"
+              c:identifier="gtk_tree_view_get_background_area">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ctree">
-            <type name="GtkCTree" c:type="GtkCTree*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="node">
-            <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="rect">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="tree_move">
+      </method>
+      <method name="get_visible_rect"
+              c:identifier="gtk_tree_view_get_visible_rect">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ctree">
-            <type name="GtkCTree" c:type="GtkCTree*"/>
-          </parameter>
-          <parameter name="node">
-            <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-          </parameter>
-          <parameter name="new_parent">
-            <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="new_sibling">
-            <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
+          <parameter name="visible_rect">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="change_focus_row_expansion">
+      </method>
+      <method name="widget_to_tree_coords"
+              c:identifier="gtk_tree_view_widget_to_tree_coords">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ctree">
-            <type name="GtkCTree" c:type="GtkCTree*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="action">
-            <type name="CTreeExpansionType" c:type="GtkCTreeExpansionType"/>
+          <parameter name="wx">
+            <type name="int" c:type="gint"/>
           </parameter>
-        </parameters>
-      </callback>
-    </record>
-    <record name="GtkCTreeRow" c:type="GtkCTreeRow">
-      <field name="row">
-        <type name="GtkCListRow" c:type="GtkCListRow"/>
-      </field>
-      <field name="parent">
-        <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-      </field>
-      <field name="sibling">
-        <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-      </field>
-      <field name="children">
-        <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-      </field>
-      <field name="pixmap_closed">
-        <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-      </field>
-      <field name="mask_closed">
-        <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-      </field>
-      <field name="pixmap_opened">
-        <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-      </field>
-      <field name="mask_opened">
-        <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-      </field>
-      <field name="level">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="is_leaf">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="expanded">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GtkCTreeNode" c:type="GtkCTreeNode">
-      <field name="list">
-        <type name="GLib.GList" c:type="GList"/>
-      </field>
-    </record>
-    <callback name="GtkCTreeFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkCTreeGNodeFunc">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="depth">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="gnode">
-          <type name="GLib.GNode" c:type="GNode*"/>
-        </parameter>
-        <parameter name="cnode">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkCTreeCompareDragFunc">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="source_node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="new_parent">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="new_sibling">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <function name="ctree_get_type" c:identifier="gtk_ctree_get_type">
-      <return-value>
-        <type name="GtkType" c:type="GtkType"/>
-      </return-value>
-    </function>
-    <function name="ctree_new_with_titles"
-              c:identifier="gtk_ctree_new_with_titles">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="columns">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="tree_column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="titles">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_new" c:identifier="gtk_ctree_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="columns">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="tree_column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_insert_node" c:identifier="gtk_ctree_insert_node">
-      <return-value>
-        <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="parent">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="sibling">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="text">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="spacing">
-          <type name="uint8" c:type="guint8"/>
-        </parameter>
-        <parameter name="pixmap_closed" allow-none="1">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask_closed" allow-none="1">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-        <parameter name="pixmap_opened" allow-none="1">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask_opened" allow-none="1">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-        <parameter name="is_leaf">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="expanded">
+          <parameter name="wy">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="tx">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="ty">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="tree_to_widget_coords"
+              c:identifier="gtk_tree_view_tree_to_widget_coords">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="tx">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="ty">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="wx">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="wy">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_visible_range"
+              c:identifier="gtk_tree_view_get_visible_range">
+        <return-value>
           <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_remove_node" c:identifier="gtk_ctree_remove_node">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_insert_gnode" c:identifier="gtk_ctree_insert_gnode">
-      <return-value>
-        <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="parent">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="sibling">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="gnode">
-          <type name="GLib.GNode" c:type="GNode*"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GtkCTreeGNodeFunc" c:type="GtkCTreeGNodeFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_export_to_gnode"
-              c:identifier="gtk_ctree_export_to_gnode">
-      <return-value>
-        <type name="GLib.GNode" c:type="GNode*"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="parent">
-          <type name="GLib.GNode" c:type="GNode*"/>
-        </parameter>
-        <parameter name="sibling">
-          <type name="GLib.GNode" c:type="GNode*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GtkCTreeGNodeFunc" c:type="GtkCTreeGNodeFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_post_recursive"
-              c:identifier="gtk_ctree_post_recursive">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GtkCTreeFunc" c:type="GtkCTreeFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_post_recursive_to_depth"
-              c:identifier="gtk_ctree_post_recursive_to_depth">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="depth">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GtkCTreeFunc" c:type="GtkCTreeFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_pre_recursive"
-              c:identifier="gtk_ctree_pre_recursive">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GtkCTreeFunc" c:type="GtkCTreeFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_pre_recursive_to_depth"
-              c:identifier="gtk_ctree_pre_recursive_to_depth">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="depth">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GtkCTreeFunc" c:type="GtkCTreeFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_is_viewable" c:identifier="gtk_ctree_is_viewable">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_last" c:identifier="gtk_ctree_last">
-      <return-value>
-        <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_find_node_ptr"
-              c:identifier="gtk_ctree_find_node_ptr">
-      <return-value>
-        <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="ctree_row">
-          <type name="GtkCTreeRow" c:type="GtkCTreeRow*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_nth" c:identifier="gtk_ctree_node_nth">
-      <return-value>
-        <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="row">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_find" c:identifier="gtk_ctree_find">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="child">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_is_ancestor" c:identifier="gtk_ctree_is_ancestor">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="child">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_find_by_row_data"
-              c:identifier="gtk_ctree_find_by_row_data">
-      <return-value>
-        <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_find_all_by_row_data"
-              c:identifier="gtk_ctree_find_all_by_row_data">
-      <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_find_by_row_data_custom"
-              c:identifier="gtk_ctree_find_by_row_data_custom">
-      <return-value>
-        <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GLib.GCompareFunc" c:type="GCompareFunc"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_find_all_by_row_data_custom"
-              c:identifier="gtk_ctree_find_all_by_row_data_custom">
-      <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="func">
-          <type name="GLib.GCompareFunc" c:type="GCompareFunc"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_is_hot_spot" c:identifier="gtk_ctree_is_hot_spot">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_move" c:identifier="gtk_ctree_move">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="new_parent" allow-none="1">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="new_sibling" allow-none="1">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_expand" c:identifier="gtk_ctree_expand">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_expand_recursive"
-              c:identifier="gtk_ctree_expand_recursive">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_expand_to_depth"
-              c:identifier="gtk_ctree_expand_to_depth">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="depth">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_collapse" c:identifier="gtk_ctree_collapse">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_collapse_recursive"
-              c:identifier="gtk_ctree_collapse_recursive">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_collapse_to_depth"
-              c:identifier="gtk_ctree_collapse_to_depth">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="depth">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_toggle_expansion"
-              c:identifier="gtk_ctree_toggle_expansion">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_toggle_expansion_recursive"
-              c:identifier="gtk_ctree_toggle_expansion_recursive">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_select" c:identifier="gtk_ctree_select">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_select_recursive"
-              c:identifier="gtk_ctree_select_recursive">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_unselect" c:identifier="gtk_ctree_unselect">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_unselect_recursive"
-              c:identifier="gtk_ctree_unselect_recursive">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_real_select_recursive"
-              c:identifier="gtk_ctree_real_select_recursive">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="state">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_set_text"
-              c:identifier="gtk_ctree_node_set_text">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="text">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_set_pixmap"
-              c:identifier="gtk_ctree_node_set_pixmap">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask" allow-none="1">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_set_pixtext"
-              c:identifier="gtk_ctree_node_set_pixtext">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="text">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="spacing">
-          <type name="uint8" c:type="guint8"/>
-        </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask" allow-none="1">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_set_node_info"
-              c:identifier="gtk_ctree_set_node_info">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="text">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="spacing">
-          <type name="uint8" c:type="guint8"/>
-        </parameter>
-        <parameter name="pixmap_closed" allow-none="1">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask_closed" allow-none="1">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-        <parameter name="pixmap_opened" allow-none="1">
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </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="enable_model_drag_source"
+              c:identifier="gtk_tree_view_enable_model_drag_source">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="start_button_mask">
+            <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+          </parameter>
+          <parameter name="targets">
+            <type name="TargetEntry" c:type="GtkTargetEntry*"/>
+          </parameter>
+          <parameter name="n_targets">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="actions">
+            <type name="Gdk.DragAction" c:type="GdkDragAction"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="enable_model_drag_dest"
+              c:identifier="gtk_tree_view_enable_model_drag_dest">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="targets">
+            <type name="TargetEntry" c:type="GtkTargetEntry*"/>
+          </parameter>
+          <parameter name="n_targets">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="actions">
+            <type name="Gdk.DragAction" c:type="GdkDragAction"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unset_rows_drag_source"
+              c:identifier="gtk_tree_view_unset_rows_drag_source">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unset_rows_drag_dest"
+              c:identifier="gtk_tree_view_unset_rows_drag_dest">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_drag_dest_row"
+              c:identifier="gtk_tree_view_set_drag_dest_row">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="pos">
+            <type name="TreeViewDropPosition"
+                  c:type="GtkTreeViewDropPosition"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_drag_dest_row"
+              c:identifier="gtk_tree_view_get_drag_dest_row">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
+          </parameter>
+          <parameter name="pos">
+            <type name="TreeViewDropPosition"
+                  c:type="GtkTreeViewDropPosition*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_dest_row_at_pos"
+              c:identifier="gtk_tree_view_get_dest_row_at_pos">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="drag_x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="drag_y">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
+          </parameter>
+          <parameter name="pos">
+            <type name="TreeViewDropPosition"
+                  c:type="GtkTreeViewDropPosition*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="create_row_drag_icon"
+              c:identifier="gtk_tree_view_create_row_drag_icon">
+        <return-value>
           <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask_opened" allow-none="1">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-        <parameter name="is_leaf">
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_enable_search"
+              c:identifier="gtk_tree_view_set_enable_search">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="enable_search">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_enable_search"
+              c:identifier="gtk_tree_view_get_enable_search">
+        <return-value>
           <type name="boolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="expanded">
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_search_column"
+              c:identifier="gtk_tree_view_get_search_column">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_search_column"
+              c:identifier="gtk_tree_view_set_search_column">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_search_equal_func"
+              c:identifier="gtk_tree_view_get_search_equal_func">
+        <return-value>
+          <type name="TreeViewSearchEqualFunc"
+                c:type="GtkTreeViewSearchEqualFunc"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_search_equal_func"
+              c:identifier="gtk_tree_view_set_search_equal_func">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="search_equal_func">
+            <type name="TreeViewSearchEqualFunc"
+                  c:type="GtkTreeViewSearchEqualFunc"/>
+          </parameter>
+          <parameter name="search_user_data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="search_destroy">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_search_entry"
+              c:identifier="gtk_tree_view_get_search_entry">
+        <return-value>
+          <type name="Entry" c:type="GtkEntry*"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_search_entry"
+              c:identifier="gtk_tree_view_set_search_entry">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="entry" allow-none="1">
+            <type name="Entry" c:type="GtkEntry*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_search_position_func"
+              c:identifier="gtk_tree_view_get_search_position_func">
+        <return-value>
+          <type name="TreeViewSearchPositionFunc"
+                c:type="GtkTreeViewSearchPositionFunc"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_search_position_func"
+              c:identifier="gtk_tree_view_set_search_position_func">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="TreeViewSearchPositionFunc"
+                  c:type="GtkTreeViewSearchPositionFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="convert_widget_to_tree_coords"
+              c:identifier="gtk_tree_view_convert_widget_to_tree_coords">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="wx">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="wy">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="tx">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="ty">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="convert_tree_to_widget_coords"
+              c:identifier="gtk_tree_view_convert_tree_to_widget_coords">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="tx">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="ty">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="wx">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="wy">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="convert_widget_to_bin_window_coords"
+              c:identifier="gtk_tree_view_convert_widget_to_bin_window_coords">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="wx">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="wy">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="bx">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="by">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="convert_bin_window_to_widget_coords"
+              c:identifier="gtk_tree_view_convert_bin_window_to_widget_coords">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="bx">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="by">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="wx">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="wy">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="convert_tree_to_bin_window_coords"
+              c:identifier="gtk_tree_view_convert_tree_to_bin_window_coords">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="tx">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="ty">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="bx">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="by">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="convert_bin_window_to_tree_coords"
+              c:identifier="gtk_tree_view_convert_bin_window_to_tree_coords">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="bx">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="by">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="tx">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="ty">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_destroy_count_func"
+              c:identifier="gtk_tree_view_set_destroy_count_func">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="TreeDestroyCountFunc"
+                  c:type="GtkTreeDestroyCountFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_fixed_height_mode"
+              c:identifier="gtk_tree_view_set_fixed_height_mode">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="enable">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_fixed_height_mode"
+              c:identifier="gtk_tree_view_get_fixed_height_mode">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_hover_selection"
+              c:identifier="gtk_tree_view_set_hover_selection">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="hover">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_hover_selection"
+              c:identifier="gtk_tree_view_get_hover_selection">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_hover_expand"
+              c:identifier="gtk_tree_view_set_hover_expand">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_hover_expand"
+              c:identifier="gtk_tree_view_get_hover_expand">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_rubber_banding"
+              c:identifier="gtk_tree_view_set_rubber_banding">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="enable">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_rubber_banding"
+              c:identifier="gtk_tree_view_get_rubber_banding">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="is_rubber_banding_active"
+              c:identifier="gtk_tree_view_is_rubber_banding_active">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_row_separator_func"
+              c:identifier="gtk_tree_view_get_row_separator_func">
+        <return-value>
+          <type name="TreeViewRowSeparatorFunc"
+                c:type="GtkTreeViewRowSeparatorFunc"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_row_separator_func"
+              c:identifier="gtk_tree_view_set_row_separator_func">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="TreeViewRowSeparatorFunc"
+                  c:type="GtkTreeViewRowSeparatorFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_grid_lines"
+              c:identifier="gtk_tree_view_get_grid_lines">
+        <return-value>
+          <type name="TreeViewGridLines" c:type="GtkTreeViewGridLines"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_grid_lines"
+              c:identifier="gtk_tree_view_set_grid_lines">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="grid_lines">
+            <type name="TreeViewGridLines" c:type="GtkTreeViewGridLines"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_enable_tree_lines"
+              c:identifier="gtk_tree_view_get_enable_tree_lines">
+        <return-value>
           <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_set_shift"
-              c:identifier="gtk_ctree_node_set_shift">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="vertical">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="horizontal">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_set_selectable"
-              c:identifier="gtk_ctree_node_set_selectable">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="selectable">
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_enable_tree_lines"
+              c:identifier="gtk_tree_view_set_enable_tree_lines">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="enabled">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_show_expanders"
+              c:identifier="gtk_tree_view_set_show_expanders">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="enabled">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_show_expanders"
+              c:identifier="gtk_tree_view_get_show_expanders">
+        <return-value>
           <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_get_selectable"
-              c:identifier="gtk_ctree_node_get_selectable">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_get_cell_type"
-              c:identifier="gtk_ctree_node_get_cell_type">
-      <return-value>
-        <type name="CellType" c:type="GtkCellType"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_get_text"
-              c:identifier="gtk_ctree_node_get_text">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="text">
-          <type name="GLib.gchar" c:type="gchar**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_get_pixmap"
-              c:identifier="gtk_ctree_node_get_pixmap">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
-        </parameter>
-        <parameter name="mask">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_get_pixtext"
-              c:identifier="gtk_ctree_node_get_pixtext">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="text">
-          <type name="GLib.gchar" c:type="gchar**"/>
-        </parameter>
-        <parameter name="spacing">
-          <type name="guint8" c:type="guint8*"/>
-        </parameter>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
-        </parameter>
-        <parameter name="mask">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_get_node_info"
-              c:identifier="gtk_ctree_get_node_info">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="text">
-          <type name="GLib.gchar" c:type="gchar**"/>
-        </parameter>
-        <parameter name="spacing">
-          <type name="guint8" c:type="guint8*"/>
-        </parameter>
-        <parameter name="pixmap_closed">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
-        </parameter>
-        <parameter name="mask_closed">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap**"/>
-        </parameter>
-        <parameter name="pixmap_opened">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
-        </parameter>
-        <parameter name="mask_opened">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap**"/>
-        </parameter>
-        <parameter name="is_leaf">
-          <type name="GLib.gboolean" c:type="gboolean*"/>
-        </parameter>
-        <parameter name="expanded">
-          <type name="GLib.gboolean" c:type="gboolean*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_set_row_style"
-              c:identifier="gtk_ctree_node_set_row_style">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_get_row_style"
-              c:identifier="gtk_ctree_node_get_row_style">
-      <return-value>
-        <type name="Style" c:type="GtkStyle*"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_set_cell_style"
-              c:identifier="gtk_ctree_node_set_cell_style">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_get_cell_style"
-              c:identifier="gtk_ctree_node_get_cell_style">
-      <return-value>
-        <type name="Style" c:type="GtkStyle*"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_set_foreground"
-              c:identifier="gtk_ctree_node_set_foreground">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="color">
-          <type name="GdkColor" c:type="GdkColor*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_set_background"
-              c:identifier="gtk_ctree_node_set_background">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="color">
-          <type name="GdkColor" c:type="GdkColor*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_set_row_data"
-              c:identifier="gtk_ctree_node_set_row_data">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_set_row_data_full"
-              c:identifier="gtk_ctree_node_set_row_data_full">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="destroy">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_get_row_data"
-              c:identifier="gtk_ctree_node_get_row_data">
-      <return-value>
-        <type name="any" c:type="gpointer"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_moveto" c:identifier="gtk_ctree_node_moveto">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-        <parameter name="column">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="row_align">
-          <type name="float" c:type="gfloat"/>
-        </parameter>
-        <parameter name="col_align">
-          <type name="float" c:type="gfloat"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_node_is_visible"
-              c:identifier="gtk_ctree_node_is_visible">
-      <return-value>
-        <type name="Visibility" c:type="GtkVisibility"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_set_indent" c:identifier="gtk_ctree_set_indent">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="indent">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_set_spacing" c:identifier="gtk_ctree_set_spacing">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="spacing">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_set_show_stub"
-              c:identifier="gtk_ctree_set_show_stub">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="show_stub">
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_level_indentation"
+              c:identifier="gtk_tree_view_set_level_indentation">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="indentation">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_level_indentation"
+              c:identifier="gtk_tree_view_get_level_indentation">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_tooltip_row"
+              c:identifier="gtk_tree_view_set_tooltip_row">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_tooltip_cell"
+              c:identifier="gtk_tree_view_set_tooltip_cell">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_tooltip_context"
+              c:identifier="gtk_tree_view_get_tooltip_context">
+        <return-value>
           <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_set_line_style"
-              c:identifier="gtk_ctree_set_line_style">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="line_style">
-          <type name="CTreeLineStyle" c:type="GtkCTreeLineStyle"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_set_expander_style"
-              c:identifier="gtk_ctree_set_expander_style">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="expander_style">
-          <type name="CTreeExpanderStyle" c:type="GtkCTreeExpanderStyle"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_set_drag_compare_func"
-              c:identifier="gtk_ctree_set_drag_compare_func">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="cmp_func">
-          <type name="GtkCTreeCompareDragFunc"
-                c:type="GtkCTreeCompareDragFunc"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_sort_node" c:identifier="gtk_ctree_sort_node">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="ctree_sort_recursive"
-              c:identifier="gtk_ctree_sort_recursive">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="ctree">
-          <type name="GtkCTree" c:type="GtkCTree*"/>
-        </parameter>
-        <parameter name="node">
-          <type name="GtkCTreeNode" c:type="GtkCTreeNode*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="DrawingArea"
-           c:type="GtkDrawingArea"
-           parent="Widget"
-           glib:type-name="GtkDrawingArea"
-           glib:get-type="gtk_drawing_area_get_type">
-      <method name="size" c:identifier="gtk_drawing_area_size">
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" 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>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_tooltip_column"
+              c:identifier="gtk_tree_view_set_tooltip_column">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="darea">
-            <type name="DrawingArea" c:type="GtkDrawingArea*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="width">
-            <type name="int32" c:type="gint"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="height">
-            <type name="int32" c:type="gint"/>
+        </parameters>
+      </method>
+      <method name="get_tooltip_column"
+              c:identifier="gtk_tree_view_get_tooltip_column">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </method>
-      <callback name="_gtk_reserved1">
+      <property name="model">
+        <type name="TreeModel" c:type="GtkTreeModel"/>
+      </property>
+      <property name="hadjustment">
+        <type name="Adjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="vadjustment">
+        <type name="Adjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="headers-visible">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="headers-clickable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="expander-column">
+        <type name="TreeViewColumn" c:type="GtkTreeViewColumn"/>
+      </property>
+      <property name="reorderable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="rules-hint">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="enable-search">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="search-column">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="fixed-height-mode">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="hover-selection">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="hover-expand">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="show-expanders">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="level-indentation">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="rubber-banding">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="enable-grid-lines">
+        <type name="TreeViewGridLines" c:type="GtkTreeViewGridLines"/>
+      </property>
+      <property name="enable-tree-lines">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="tooltip-column">
+        <type name="int" c:type="gint"/>
+      </property>
+      <callback name="set_scroll_adjustments" c:type="set_scroll_adjustments">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </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_reserved2">
+      <callback name="row_activated" c:type="row_activated">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="test_expand_row" c:type="test_expand_row">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="test_collapse_row" c:type="test_collapse_row">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+        </parameters>
       </callback>
-    </class>
-    <function name="drawing_area_new" c:identifier="gtk_drawing_area_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <class name="Curve"
-           c:type="GtkCurve"
-           parent="DrawingArea"
-           glib:type-name="GtkCurve"
-           glib:get-type="gtk_curve_get_type">
-      <method name="reset" c:identifier="gtk_curve_reset">
+      <callback name="row_expanded" c:type="row_expanded">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="curve">
-            <type name="Curve" c:type="GtkCurve*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_gamma" c:identifier="gtk_curve_set_gamma">
+      </callback>
+      <callback name="row_collapsed" c:type="row_collapsed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="curve">
-            <type name="Curve" c:type="GtkCurve*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="gamma_">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_range" c:identifier="gtk_curve_set_range">
+      </callback>
+      <callback name="columns_changed" c:type="columns_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="curve">
-            <type name="Curve" c:type="GtkCurve*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="min_x">
-            <type name="float" c:type="gfloat"/>
+        </parameters>
+      </callback>
+      <callback name="cursor_changed" c:type="cursor_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="max_x">
-            <type name="float" c:type="gfloat"/>
+        </parameters>
+      </callback>
+      <callback name="move_cursor" c:type="move_cursor">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="min_y">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="step">
+            <type name="MovementStep" c:type="GtkMovementStep"/>
           </parameter>
-          <parameter name="max_y">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_vector" c:identifier="gtk_curve_get_vector">
+      </callback>
+      <callback name="select_all" c:type="select_all">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="curve">
-            <type name="Curve" c:type="GtkCurve*"/>
-          </parameter>
-          <parameter name="veclen">
-            <type name="int32" c:type="int"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="vector">
-            <type name="float" c:type="gfloat"/>
+        </parameters>
+      </callback>
+      <callback name="unselect_all" c:type="unselect_all">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_vector" c:identifier="gtk_curve_set_vector">
+      </callback>
+      <callback name="select_cursor_row" c:type="select_cursor_row">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="curve">
-            <type name="Curve" c:type="GtkCurve*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="veclen">
-            <type name="int32" c:type="int"/>
+          <parameter name="start_editing">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="vector">
-            <type name="float" c:type="gfloat"/>
+        </parameters>
+      </callback>
+      <callback name="toggle_cursor_row" c:type="toggle_cursor_row">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_curve_type" c:identifier="gtk_curve_set_curve_type">
+      </callback>
+      <callback name="expand_collapse_cursor_row"
+                c:type="expand_collapse_cursor_row">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="curve">
-            <type name="Curve" c:type="GtkCurve*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
-          <parameter name="type">
-            <type name="CurveType" c:type="GtkCurveType"/>
+          <parameter name="logical">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="open_all">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="curve-type">
-        <type name="CurveType" c:type="GtkCurveType"/>
-      </property>
-      <property name="min-x">
-        <type name="float" c:type="gfloat"/>
-      </property>
-      <property name="max-x">
-        <type name="float" c:type="gfloat"/>
-      </property>
-      <property name="min-y">
-        <type name="float" c:type="gfloat"/>
-      </property>
-      <property name="max-y">
-        <type name="float" c:type="gfloat"/>
-      </property>
-      <callback name="curve_type_changed">
+      </callback>
+      <callback name="select_cursor_parent" c:type="select_cursor_parent">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="curve">
-            <type name="Curve" c:type="GtkCurve*"/>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="start_interactive_search"
+                c:type="start_interactive_search">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_view">
+            <type name="TreeView" c:type="GtkTreeView*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved0" c:type="_gtk_reserved0">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="curve-type-changed">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-    </class>
-    <function name="curve_new" c:identifier="gtk_curve_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <class name="EventBox"
-           c:type="GtkEventBox"
-           parent="Bin"
-           glib:type-name="GtkEventBox"
-           glib:get-type="gtk_event_box_get_type">
-      <method name="get_visible_window"
-              c:identifier="gtk_event_box_get_visible_window">
+      </callback>
+      <glib:signal name="move-cursor">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="event_box">
-            <type name="EventBox" c:type="GtkEventBox*"/>
+          <parameter name="object">
+            <type name="MovementStep" c:type="GtkMovementStep"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_visible_window"
-              c:identifier="gtk_event_box_set_visible_window">
+      </glib:signal>
+      <glib:signal name="set-scroll-adjustments">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="event_box">
-            <type name="EventBox" c:type="GtkEventBox*"/>
+          <parameter name="object">
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
-          <parameter name="visible_window">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="p0">
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_above_child"
-              c:identifier="gtk_event_box_get_above_child">
+      </glib:signal>
+      <glib:signal name="select-all">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
-        <parameters>
-          <parameter name="event_box">
-            <type name="EventBox" c:type="GtkEventBox*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_above_child"
-              c:identifier="gtk_event_box_set_above_child">
+      </glib:signal>
+      <glib:signal name="unselect-all">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="row-activated">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="event_box">
-            <type name="EventBox" c:type="GtkEventBox*"/>
+          <parameter name="object">
+            <type name="TreePath" c:type="GtkTreePath"/>
           </parameter>
-          <parameter name="above_child">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="p0">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="visible-window">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="above-child">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-    </class>
-    <function name="event_box_new" c:identifier="gtk_event_box_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <record name="GtkExpanderPrivate" c:type="GtkExpanderPrivate"/>
-    <class name="Expander"
-           c:type="GtkExpander"
-           parent="Bin"
-           glib:type-name="GtkExpander"
-           glib:get-type="gtk_expander_get_type">
-      <method name="set_expanded" c:identifier="gtk_expander_set_expanded">
+      </glib:signal>
+      <glib:signal name="test-expand-row">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
+          <parameter name="object">
+            <type name="TreeIter" c:type="GtkTreeIter"/>
           </parameter>
-          <parameter name="expanded">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="p0">
+            <type name="TreePath" c:type="GtkTreePath"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_expanded" c:identifier="gtk_expander_get_expanded">
+      </glib:signal>
+      <glib:signal name="test-collapse-row">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
+          <parameter name="object">
+            <type name="TreeIter" c:type="GtkTreeIter"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="TreePath" c:type="GtkTreePath"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_spacing" c:identifier="gtk_expander_set_spacing">
+      </glib:signal>
+      <glib:signal name="row-expanded">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
+          <parameter name="object">
+            <type name="TreeIter" c:type="GtkTreeIter"/>
           </parameter>
-          <parameter name="spacing">
-            <type name="int32" c:type="gint"/>
+          <parameter name="p0">
+            <type name="TreePath" c:type="GtkTreePath"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_spacing" c:identifier="gtk_expander_get_spacing">
+      </glib:signal>
+      <glib:signal name="row-collapsed">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
+          <parameter name="object">
+            <type name="TreeIter" c:type="GtkTreeIter"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="TreePath" c:type="GtkTreePath"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_label" c:identifier="gtk_expander_set_label">
+      </glib:signal>
+      <glib:signal name="columns-changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+      </glib:signal>
+      <glib:signal name="cursor-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="select-cursor-row">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
         <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
-          </parameter>
-          <parameter name="label" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="object">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_label" c:identifier="gtk_expander_get_label">
+      </glib:signal>
+      <glib:signal name="toggle-cursor-row">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="expand-collapse-cursor-row">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
+          <parameter name="object">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_use_underline"
-              c:identifier="gtk_expander_set_use_underline">
+      </glib:signal>
+      <glib:signal name="select-cursor-parent">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="start-interactive-search">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <record name="TreeViewPrivate" c:type="GtkTreeViewPrivate"/>
+    <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="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
-          <parameter name="use_underline">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="type">
+            <type name="SelectionMode" c:type="GtkSelectionMode"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_use_underline"
-              c:identifier="gtk_expander_get_use_underline">
+      <method name="get_mode" c:identifier="gtk_tree_selection_get_mode">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="SelectionMode" c:type="GtkSelectionMode"/>
         </return-value>
         <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_use_markup" c:identifier="gtk_expander_set_use_markup">
+      <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="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
-          <parameter name="use_markup">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="func">
+            <type name="TreeSelectionFunc" c:type="GtkTreeSelectionFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_use_markup" c:identifier="gtk_expander_get_use_markup">
+      <method name="get_user_data"
+              c:identifier="gtk_tree_selection_get_user_data">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="any" c:type="gpointer"/>
         </return-value>
         <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_label_widget"
-              c:identifier="gtk_expander_set_label_widget">
+      <method name="get_tree_view"
+              c:identifier="gtk_tree_selection_get_tree_view">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="TreeView" c:type="GtkTreeView*"/>
         </return-value>
         <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
-          </parameter>
-          <parameter name="label_widget" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_label_widget"
-              c:identifier="gtk_expander_get_label_widget">
+      <method name="get_selected"
+              c:identifier="gtk_tree_selection_get_selected">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
+          <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>
-      <property name="expanded">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="label">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="use-underline">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="use-markup">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="spacing">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="label-widget">
-        <type name="Widget" c:type="GtkWidget"/>
-      </property>
-      <callback name="activate">
+      <method name="get_selected_rows"
+              c:identifier="gtk_tree_selection_get_selected_rows">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="expander">
-            <type name="Expander" c:type="GtkExpander*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="model">
+            <type name="TreeModel" c:type="GtkTreeModel**"/>
           </parameter>
         </parameters>
-      </callback>
-      <glib:signal name="activate">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <function name="expander_new" c:identifier="gtk_expander_new">
-      <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="expander_new_with_mnemonic"
-              c:identifier="gtk_expander_new_with_mnemonic">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="label" allow-none="1">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkFileFilterInfo" c:type="GtkFileFilterInfo">
-      <field name="contains">
-        <type name="FileFilterFlags" c:type="GtkFileFilterFlags"/>
-      </field>
-      <field name="filename">
-        <type name="string" c:type="gchar*"/>
-      </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>
-    </record>
-    <callback name="GtkFileFilterFunc">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="filter_info">
-          <type name="GtkFileFilterInfo" c:type="GtkFileFilterInfo*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <class name="FileFilter"
-           c:type="GtkFileFilter"
-           parent="GtkObject"
-           glib:type-name="GtkFileFilter"
-           glib:get-type="gtk_file_filter_get_type">
-      <constructor name="new" c:identifier="gtk_file_filter_new">
-        <return-value>
-          <type name="FileFilter" c:type="GtkFileFilter*"/>
-        </return-value>
-      </constructor>
-      <method name="set_name" c:identifier="gtk_file_filter_set_name">
+      </method>
+      <method name="count_selected_rows"
+              c:identifier="gtk_tree_selection_count_selected_rows">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="FileFilter" c:type="GtkFileFilter*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_name" c:identifier="gtk_file_filter_get_name">
+      <method name="selected_foreach"
+              c:identifier="gtk_tree_selection_selected_foreach">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="FileFilter" c:type="GtkFileFilter*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="TreeSelectionForeachFunc"
+                  c:type="GtkTreeSelectionForeachFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_mime_type"
-              c:identifier="gtk_file_filter_add_mime_type">
+      <method name="select_path" c:identifier="gtk_tree_selection_select_path">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="FileFilter" c:type="GtkFileFilter*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
-          <parameter name="mime_type">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_pattern" c:identifier="gtk_file_filter_add_pattern">
+      <method name="unselect_path"
+              c:identifier="gtk_tree_selection_unselect_path">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="FileFilter" c:type="GtkFileFilter*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
-          <parameter name="pattern">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_pixbuf_formats"
-              c:identifier="gtk_file_filter_add_pixbuf_formats">
+      <method name="select_iter" c:identifier="gtk_tree_selection_select_iter">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="FileFilter" c:type="GtkFileFilter*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_custom" c:identifier="gtk_file_filter_add_custom">
+      <method name="unselect_iter"
+              c:identifier="gtk_tree_selection_unselect_iter">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="FileFilter" c:type="GtkFileFilter*"/>
-          </parameter>
-          <parameter name="needed">
-            <type name="FileFilterFlags" c:type="GtkFileFilterFlags"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkFileFilterFunc" c:type="GtkFileFilterFunc"/>
-          </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
-          <parameter name="notify">
-            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_needed" c:identifier="gtk_file_filter_get_needed">
+      <method name="path_is_selected"
+              c:identifier="gtk_tree_selection_path_is_selected">
         <return-value>
-          <type name="FileFilterFlags" c:type="GtkFileFilterFlags"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="FileFilter" c:type="GtkFileFilter*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="filter" c:identifier="gtk_file_filter_filter">
+      <method name="iter_is_selected"
+              c:identifier="gtk_tree_selection_iter_is_selected">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="FileFilter" c:type="GtkFileFilter*"/>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
           </parameter>
-          <parameter name="filter_info">
-            <type name="GtkFileFilterInfo" c:type="GtkFileFilterInfo*"/>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-    </class>
-    <record name="GtkFileChooser" c:type="GtkFileChooser"/>
-    <interface name="FileChooser"
-               c:type="GtkFileChooser"
-               glib:type-name="GtkFileChooser"
-               glib:get-type="gtk_file_chooser_get_type">
-      <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="use-preview-label">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="filter">
-        <type name="FileFilter" c:type="GtkFileFilter"/>
-      </property>
-      <property name="extra-widget">
-        <type name="Widget" c:type="GtkWidget"/>
-      </property>
-      <property name="action">
-        <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
-      </property>
-      <property name="file-system-backend">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="show-hidden">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <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="preview-widget">
-        <type name="Widget" c:type="GtkWidget"/>
-      </property>
-      <glib:signal name="current-folder-changed">
+      <method name="select_all" c:identifier="gtk_tree_selection_select_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="selection-changed">
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unselect_all"
+              c:identifier="gtk_tree_selection_unselect_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="update-preview">
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="select_range"
+              c:identifier="gtk_tree_selection_select_range">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="file-activated">
+        <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>
+        </parameters>
+      </method>
+      <method name="unselect_range"
+              c:identifier="gtk_tree_selection_unselect_range">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="confirm-overwrite">
-        <return-value>
-          <type name="FileChooserConfirmation"
-                c:type="GtkFileChooserConfirmation"/>
-        </return-value>
-      </glib:signal>
-    </interface>
-    <function name="file_chooser_error_quark"
-              c:identifier="gtk_file_chooser_error_quark">
-      <return-value>
-        <type name="GLib.GQuark" c:type="GQuark"/>
-      </return-value>
-    </function>
-    <function name="file_chooser_set_action"
-              c:identifier="gtk_file_chooser_set_action">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="action">
-          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_action"
-              c:identifier="gtk_file_chooser_get_action">
-      <return-value>
-        <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_local_only"
-              c:identifier="gtk_file_chooser_set_local_only">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="local_only">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_local_only"
-              c:identifier="gtk_file_chooser_get_local_only">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_select_multiple"
-              c:identifier="gtk_file_chooser_set_select_multiple">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="select_multiple">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_select_multiple"
-              c:identifier="gtk_file_chooser_get_select_multiple">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_show_hidden"
-              c:identifier="gtk_file_chooser_set_show_hidden">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="show_hidden">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_show_hidden"
-              c:identifier="gtk_file_chooser_get_show_hidden">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_do_overwrite_confirmation"
-              c:identifier="gtk_file_chooser_set_do_overwrite_confirmation">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="do_overwrite_confirmation">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_do_overwrite_confirmation"
-              c:identifier="gtk_file_chooser_get_do_overwrite_confirmation">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_current_name"
-              c:identifier="gtk_file_chooser_set_current_name">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_filename"
-              c:identifier="gtk_file_chooser_get_filename">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_filename"
-              c:identifier="gtk_file_chooser_set_filename">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="filename">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_select_filename"
-              c:identifier="gtk_file_chooser_select_filename">
+        <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>
+        </parameters>
+      </method>
+      <callback name="changed" c:type="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_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>
+    <callback name="TreeViewColumnDropFunc" c:type="GtkTreeViewColumnDropFunc">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        <parameter name="tree_view">
+          <type name="TreeView" c:type="GtkTreeView*"/>
         </parameter>
-        <parameter name="filename">
-          <type name="string" c:type="char*"/>
+        <parameter name="column">
+          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_unselect_filename"
-              c:identifier="gtk_file_chooser_unselect_filename">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        <parameter name="prev_column">
+          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
         </parameter>
-        <parameter name="filename">
-          <type name="string" c:type="char*"/>
+        <parameter name="next_column">
+          <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_select_all"
-              c:identifier="gtk_file_chooser_select_all">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="file_chooser_unselect_all"
-              c:identifier="gtk_file_chooser_unselect_all">
+    </callback>
+    <callback name="TreeViewMappingFunc" c:type="GtkTreeViewMappingFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_filenames"
-              c:identifier="gtk_file_chooser_get_filenames">
-      <return-value>
-        <type name="GLib.GSList" c:type="GSList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_current_folder"
-              c:identifier="gtk_file_chooser_set_current_folder">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="filename">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_current_folder"
-              c:identifier="gtk_file_chooser_get_current_folder">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_uri"
-              c:identifier="gtk_file_chooser_get_uri">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        <parameter name="tree_view">
+          <type name="TreeView" c:type="GtkTreeView*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_uri"
-              c:identifier="gtk_file_chooser_set_uri">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
-        <parameter name="uri">
-          <type name="string" c:type="char*"/>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="file_chooser_select_uri"
-              c:identifier="gtk_file_chooser_select_uri">
+    </callback>
+    <callback name="TreeViewSearchEqualFunc"
+              c:type="GtkTreeViewSearchEqualFunc">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="uri">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_unselect_uri"
-              c:identifier="gtk_file_chooser_unselect_uri">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="uri">
-          <type name="string" c:type="char*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_uris"
-              c:identifier="gtk_file_chooser_get_uris">
-      <return-value>
-        <type name="GLib.GSList" c:type="GSList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        <parameter name="model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_current_folder_uri"
-              c:identifier="gtk_file_chooser_set_current_folder_uri">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        <parameter name="column">
+          <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="uri">
+        <parameter name="key">
           <type name="string" c:type="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_current_folder_uri"
-              c:identifier="gtk_file_chooser_get_current_folder_uri">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_preview_widget"
-              c:identifier="gtk_file_chooser_set_preview_widget">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="preview_widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_preview_widget"
-              c:identifier="gtk_file_chooser_get_preview_widget">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_preview_widget_active"
-              c:identifier="gtk_file_chooser_set_preview_widget_active">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="active">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_preview_widget_active"
-              c:identifier="gtk_file_chooser_get_preview_widget_active">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_set_use_preview_label"
-              c:identifier="gtk_file_chooser_set_use_preview_label">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
-        <parameter name="use_label">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="search_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="file_chooser_get_use_preview_label"
-              c:identifier="gtk_file_chooser_get_use_preview_label">
+    </callback>
+    <callback name="TreeViewRowSeparatorFunc"
+              c:type="GtkTreeViewRowSeparatorFunc">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        <parameter name="model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_preview_filename"
-              c:identifier="gtk_file_chooser_get_preview_filename">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        <parameter name="iter">
+          <type name="TreeIter" c:type="GtkTreeIter*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_preview_uri"
-              c:identifier="gtk_file_chooser_get_preview_uri">
-      <return-value>
-        <type name="string" c:type="char*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="file_chooser_set_extra_widget"
-              c:identifier="gtk_file_chooser_set_extra_widget">
+    </callback>
+    <callback name="TreeViewSearchPositionFunc"
+              c:type="GtkTreeViewSearchPositionFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        <parameter name="tree_view">
+          <type name="TreeView" c:type="GtkTreeView*"/>
         </parameter>
-        <parameter name="extra_widget">
+        <parameter name="search_dialog">
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_extra_widget"
-              c:identifier="gtk_file_chooser_get_extra_widget">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_add_filter"
-              c:identifier="gtk_file_chooser_add_filter">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="filter">
-          <type name="FileFilter" c:type="GtkFileFilter*"/>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="file_chooser_remove_filter"
-              c:identifier="gtk_file_chooser_remove_filter">
+    </callback>
+    <function name="tree_view_new" c:identifier="gtk_tree_view_new">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="filter">
-          <type name="FileFilter" c:type="GtkFileFilter*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="file_chooser_list_filters"
-              c:identifier="gtk_file_chooser_list_filters">
+    <function name="tree_view_new_with_model"
+              c:identifier="gtk_tree_view_new_with_model">
       <return-value>
-        <type name="GLib.GSList" c:type="GSList*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        <parameter name="model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_chooser_set_filter"
-              c:identifier="gtk_file_chooser_set_filter">
+    <callback name="TreeDestroyCountFunc" c:type="GtkTreeDestroyCountFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="filter">
-          <type name="FileFilter" c:type="GtkFileFilter*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_get_filter"
-              c:identifier="gtk_file_chooser_get_filter">
-      <return-value>
-        <type name="FileFilter" c:type="GtkFileFilter*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_add_shortcut_folder"
-              c:identifier="gtk_file_chooser_add_shortcut_folder">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="folder">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_remove_shortcut_folder"
-              c:identifier="gtk_file_chooser_remove_shortcut_folder">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="folder">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_list_shortcut_folders"
-              c:identifier="gtk_file_chooser_list_shortcut_folders">
-      <return-value>
-        <type name="GLib.GSList" c:type="GSList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_add_shortcut_folder_uri"
-              c:identifier="gtk_file_chooser_add_shortcut_folder_uri">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
-        </parameter>
-        <parameter name="uri">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_remove_shortcut_folder_uri"
-              c:identifier="gtk_file_chooser_remove_shortcut_folder_uri">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        <parameter name="tree_view">
+          <type name="TreeView" c:type="GtkTreeView*"/>
         </parameter>
-        <parameter name="uri">
-          <type name="string" c:type="char*"/>
+        <parameter name="path">
+          <type name="TreePath" c:type="GtkTreePath*"/>
         </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+        <parameter name="children">
+          <type name="int" c:type="gint"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="file_chooser_list_shortcut_folder_uris"
-              c:identifier="gtk_file_chooser_list_shortcut_folder_uris">
-      <return-value>
-        <type name="GLib.GSList" c:type="GSList*"/>
-      </return-value>
-      <parameters>
-        <parameter name="chooser">
-          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <record name="GtkFileChooserButtonPrivate"
-            c:type="GtkFileChooserButtonPrivate"/>
-    <class name="FileChooserButton"
-           c:type="GtkFileChooserButton"
-           parent="HBox"
-           glib:type-name="GtkFileChooserButton"
-           glib:get-type="gtk_file_chooser_button_get_type">
-      <method name="get_title"
-              c:identifier="gtk_file_chooser_button_get_title">
+    </callback>
+    <class name="ComboBox"
+           c:type="GtkComboBox"
+           parent="Bin"
+           glib:type-name="GtkComboBox"
+           glib:get-type="gtk_combo_box_get_type">
+      <method name="get_wrap_width"
+              c:identifier="gtk_combo_box_get_wrap_width">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_wrap_width"
+              c:identifier="gtk_combo_box_set_wrap_width">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+          <parameter name="width">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_row_span_column"
+              c:identifier="gtk_combo_box_get_row_span_column">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_row_span_column"
+              c:identifier="gtk_combo_box_set_row_span_column">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+          <parameter name="row_span">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_title"
-              c:identifier="gtk_file_chooser_button_set_title">
+      <method name="get_column_span_column"
+              c:identifier="gtk_combo_box_get_column_span_column">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_column_span_column"
+              c:identifier="gtk_combo_box_set_column_span_column">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
-          <parameter name="title">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="column_span">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_width_chars"
-              c:identifier="gtk_file_chooser_button_get_width_chars">
+      <method name="get_add_tearoffs"
+              c:identifier="gtk_combo_box_get_add_tearoffs">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_width_chars"
-              c:identifier="gtk_file_chooser_button_set_width_chars">
+      <method name="set_add_tearoffs"
+              c:identifier="gtk_combo_box_set_add_tearoffs">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
-          <parameter name="n_chars">
-            <type name="int32" c:type="gint"/>
+          <parameter name="add_tearoffs">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_title" c:identifier="gtk_combo_box_get_title">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_title" c:identifier="gtk_combo_box_set_title">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+          <parameter name="title">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_focus_on_click"
-              c:identifier="gtk_file_chooser_button_get_focus_on_click">
+              c:identifier="gtk_combo_box_get_focus_on_click">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
+          <parameter name="combo">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_focus_on_click"
-              c:identifier="gtk_file_chooser_button_set_focus_on_click">
+              c:identifier="gtk_combo_box_set_focus_on_click">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
+          <parameter name="combo">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </parameter>
           <parameter name="focus_on_click">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <property name="dialog">
-        <type name="FileChooser" c:type="GtkFileChooser"/>
+      <method name="get_active" c:identifier="gtk_combo_box_get_active">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_active" c:identifier="gtk_combo_box_set_active">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+          <parameter name="index_">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_active_iter"
+              c:identifier="gtk_combo_box_get_active_iter">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_active_iter"
+              c:identifier="gtk_combo_box_set_active_iter">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_model" c:identifier="gtk_combo_box_set_model">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+          <parameter name="model" allow-none="1">
+            <type name="TreeModel" c:type="GtkTreeModel*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_model" c:identifier="gtk_combo_box_get_model">
+        <return-value>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_row_separator_func"
+              c:identifier="gtk_combo_box_get_row_separator_func">
+        <return-value>
+          <type name="TreeViewRowSeparatorFunc"
+                c:type="GtkTreeViewRowSeparatorFunc"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_row_separator_func"
+              c:identifier="gtk_combo_box_set_row_separator_func">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="TreeViewRowSeparatorFunc"
+                  c:type="GtkTreeViewRowSeparatorFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="append_text" c:identifier="gtk_combo_box_append_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="insert_text" c:identifier="gtk_combo_box_insert_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="prepend_text" c:identifier="gtk_combo_box_prepend_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_text" c:identifier="gtk_combo_box_remove_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_active_text"
+              c:identifier="gtk_combo_box_get_active_text">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="popup" c:identifier="gtk_combo_box_popup">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="popdown" c:identifier="gtk_combo_box_popdown">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_popup_accessible"
+              c:identifier="gtk_combo_box_get_popup_accessible">
+        <return-value>
+          <type name="Atk.Object" c:type="AtkObject*"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="model">
+        <type name="TreeModel" c:type="GtkTreeModel"/>
       </property>
-      <property name="focus-on-click">
+      <property name="wrap-width">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="row-span-column">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="column-span-column">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="active">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="add-tearoffs">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="title">
+      <property name="tearoff-title">
         <type name="string" c:type="gchararray"/>
       </property>
-      <property name="width-chars">
-        <type name="int32" c:type="gint"/>
+      <property name="has-frame">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="focus-on-click">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="popup-shown">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <callback name="file_set">
+      <callback name="changed" c:type="changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="fc">
-            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
           </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>
-      <field name="__gtk_reserved7">
-        <type name="any" c:type="void*"/>
-      </field>
-      <glib:signal name="file-set">
+      <callback name="get_active_text" c:type="get_active_text">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved0" c:type="_gtk_reserved0">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <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="move-active">
+        <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="popup">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
+      <glib:signal name="popdown">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+      </glib:signal>
     </class>
-    <function name="file_chooser_button_new"
-              c:identifier="gtk_file_chooser_button_new">
+    <record name="ComboBoxPrivate" c:type="GtkComboBoxPrivate"/>
+    <function name="combo_box_new" c:identifier="gtk_combo_box_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="title">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="action">
-          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="file_chooser_button_new_with_backend"
-              c:identifier="gtk_file_chooser_button_new_with_backend">
+    <function name="combo_box_new_with_model"
+              c:identifier="gtk_combo_box_new_with_model">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="title">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="action">
-          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
-        </parameter>
-        <parameter name="backend">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="file_chooser_button_new_with_dialog"
-              c:identifier="gtk_file_chooser_button_new_with_dialog">
+    <function name="combo_box_new_text" c:identifier="gtk_combo_box_new_text">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
+    </function>
+    <function name="combo_box_editing_canceled"
+              c:identifier="_gtk_combo_box_editing_canceled">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
       <parameters>
-        <parameter name="dialog">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="combo_box">
+          <type name="ComboBox" c:type="GtkComboBox*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkFileChooserDialogPrivate"
-            c:type="GtkFileChooserDialogPrivate"/>
-    <class name="FileChooserDialog"
-           c:type="GtkFileChooserDialog"
-           parent="Dialog"
-           glib:type-name="GtkFileChooserDialog"
-           glib:get-type="gtk_file_chooser_dialog_get_type">
+    <class name="ComboBoxEntry"
+           c:type="GtkComboBoxEntry"
+           parent="ComboBox"
+           glib:type-name="GtkComboBoxEntry"
+           glib:get-type="gtk_combo_box_entry_get_type">
+      <method name="set_text_column"
+              c:identifier="gtk_combo_box_entry_set_text_column">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="entry_box">
+            <type name="ComboBoxEntry" c:type="GtkComboBoxEntry*"/>
+          </parameter>
+          <parameter name="text_column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_text_column"
+              c:identifier="gtk_combo_box_entry_get_text_column">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="entry_box">
+            <type name="ComboBoxEntry" c:type="GtkComboBoxEntry*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="text-column">
+        <type name="int" c:type="gint"/>
+      </property>
+      <callback name="gtk_reserved0" c:type="_gtk_reserved0">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
     </class>
-    <function name="file_chooser_dialog_new"
-              c:identifier="gtk_file_chooser_dialog_new">
+    <record name="ComboBoxEntryPrivate" c:type="GtkComboBoxEntryPrivate"/>
+    <function name="combo_box_entry_new"
+              c:identifier="gtk_combo_box_entry_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="action">
-          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
-        </parameter>
-        <parameter name="first_button_text">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="file_chooser_dialog_new_with_backend"
-              c:identifier="gtk_file_chooser_dialog_new_with_backend">
+    <function name="combo_box_entry_new_with_model"
+              c:identifier="gtk_combo_box_entry_new_with_model">
       <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="action">
-          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
-        </parameter>
-        <parameter name="backend">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="model">
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
         </parameter>
-        <parameter name="first_button_text">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="text_column">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
-    </function>
-    <record name="GtkFileChooserWidgetPrivate"
-            c:type="GtkFileChooserWidgetPrivate"/>
-    <class name="FileChooserWidget"
-           c:type="GtkFileChooserWidget"
-           parent="VBox"
-           glib:type-name="GtkFileChooserWidget"
-           glib:get-type="gtk_file_chooser_widget_get_type">
-    </class>
-    <function name="file_chooser_widget_new"
-              c:identifier="gtk_file_chooser_widget_new">
+    </function>
+    <function name="combo_box_entry_new_text"
+              c:identifier="gtk_combo_box_entry_new_text">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="action">
-          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="file_chooser_widget_new_with_backend"
-              c:identifier="gtk_file_chooser_widget_new_with_backend">
+    <class name="HBox"
+           c:type="GtkHBox"
+           parent="Box"
+           glib:type-name="GtkHBox"
+           glib:get-type="gtk_hbox_get_type">
+    </class>
+    <function name="hbox_new" c:identifier="gtk_hbox_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="action">
-          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
+        <parameter name="homogeneous">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
-        <parameter name="backend">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="spacing">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <class name="FileSelection"
-           c:type="GtkFileSelection"
-           parent="Dialog"
-           glib:type-name="GtkFileSelection"
-           glib:get-type="gtk_file_selection_get_type">
-      <method name="set_filename"
-              c:identifier="gtk_file_selection_set_filename">
+    <class name="Combo"
+           c:type="GtkCombo"
+           parent="HBox"
+           glib:type-name="GtkCombo"
+           glib:get-type="gtk_combo_get_type">
+      <method name="set_value_in_list"
+              c:identifier="gtk_combo_set_value_in_list">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          <parameter name="combo">
+            <type name="Combo" c:type="GtkCombo*"/>
           </parameter>
-          <parameter name="filename">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="val">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_filename"
-              c:identifier="gtk_file_selection_get_filename">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          <parameter name="ok_if_empty">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="complete" c:identifier="gtk_file_selection_complete">
+      <method name="set_use_arrows" c:identifier="gtk_combo_set_use_arrows">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          <parameter name="combo">
+            <type name="Combo" c:type="GtkCombo*"/>
           </parameter>
-          <parameter name="pattern">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="val">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="show_fileop_buttons"
-              c:identifier="gtk_file_selection_show_fileop_buttons">
+      <method name="set_use_arrows_always"
+              c:identifier="gtk_combo_set_use_arrows_always">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          <parameter name="combo">
+            <type name="Combo" c:type="GtkCombo*"/>
+          </parameter>
+          <parameter name="val">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="hide_fileop_buttons"
-              c:identifier="gtk_file_selection_hide_fileop_buttons">
+      <method name="set_case_sensitive"
+              c:identifier="gtk_combo_set_case_sensitive">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          <parameter name="combo">
+            <type name="Combo" c:type="GtkCombo*"/>
+          </parameter>
+          <parameter name="val">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_selections"
-              c:identifier="gtk_file_selection_get_selections">
+      <method name="set_item_string" c:identifier="gtk_combo_set_item_string">
         <return-value>
-          <type name="GLib.gchar" c:type="gchar**"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          <parameter name="combo">
+            <type name="Combo" c:type="GtkCombo*"/>
+          </parameter>
+          <parameter name="item">
+            <type name="Item" c:type="GtkItem*"/>
+          </parameter>
+          <parameter name="item_value">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_select_multiple"
-              c:identifier="gtk_file_selection_set_select_multiple">
+      <method name="set_popdown_strings"
+              c:identifier="gtk_combo_set_popdown_strings">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          <parameter name="combo">
+            <type name="Combo" c:type="GtkCombo*"/>
           </parameter>
-          <parameter name="select_multiple">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="strings">
+            <type name="GLib.List" c:type="GList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_select_multiple"
-              c:identifier="gtk_file_selection_get_select_multiple">
+      <method name="disable_activate"
+              c:identifier="gtk_combo_disable_activate">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filesel">
-            <type name="FileSelection" c:type="GtkFileSelection*"/>
+          <parameter name="combo">
+            <type name="Combo" c:type="GtkCombo*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="show-fileops">
+      <property name="enable-arrow-keys">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="filename">
-        <type name="string" c:type="gchararray"/>
+      <property name="enable-arrows-always">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="select-multiple">
+      <property name="case-sensitive">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="allow-empty">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <callback name="_gtk_reserved1">
+      <property name="value-in-list">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
-    <function name="file_selection_new" c:identifier="gtk_file_selection_new">
+    <function name="combo_new" c:identifier="gtk_combo_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="title">
-          <type name="string" c:type="gchar*"/>
-        </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">
+    <class name="CTree"
+           c:type="GtkCTree"
+           parent="CList"
+           glib:type-name="GtkCTree"
+           glib:get-type="gtk_ctree_get_type">
+      <method name="insert_node" c:identifier="gtk_ctree_insert_node">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="CTreeNode" c:type="GtkCTreeNode*"/>
         </return-value>
         <parameters>
-          <parameter name="fixed">
-            <type name="Fixed" c:type="GtkFixed*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="parent">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
+          <parameter name="sibling">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="move" c:identifier="gtk_fixed_move">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="fixed">
-            <type name="Fixed" c:type="GtkFixed*"/>
+          <parameter name="spacing">
+            <type name="uint8" c:type="guint8"/>
           </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="pixmap_closed" allow-none="1">
+            <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
           </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
+          <parameter name="mask_closed" allow-none="1">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
           </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="pixmap_opened" allow-none="1">
+            <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
           </parameter>
-        </parameters>
-      </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="fixed">
-            <type name="Fixed" c:type="GtkFixed*"/>
+          <parameter name="mask_opened" allow-none="1">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
           </parameter>
-          <parameter name="has_window">
+          <parameter name="is_leaf">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_has_window" c:identifier="gtk_fixed_get_has_window">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="fixed">
-            <type name="Fixed" c:type="GtkFixed*"/>
-          </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">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="expanded">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_title" c:identifier="gtk_font_button_set_title">
+      <method name="remove_node" c:identifier="gtk_ctree_remove_node">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="title">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_use_font" c:identifier="gtk_font_button_get_use_font">
+      <method name="insert_gnode" c:identifier="gtk_ctree_insert_gnode">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="CTreeNode" c:type="GtkCTreeNode*"/>
         </return-value>
         <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-        </parameters>
-      </method>
-      <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="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="parent">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
-          <parameter name="use_font">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="sibling">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
-        </parameters>
-      </method>
-      <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="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="gnode">
+            <type name="GLib.Node" c:type="GNode*"/>
           </parameter>
-        </parameters>
-      </method>
-      <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="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="func">
+            <type name="CTreeGNodeFunc" c:type="GtkCTreeGNodeFunc"/>
           </parameter>
-          <parameter name="use_size">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_font_name"
-              c:identifier="gtk_font_button_get_font_name">
+      <method name="export_to_gnode" c:identifier="gtk_ctree_export_to_gnode">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="GLib.Node" c:type="GNode*"/>
         </return-value>
         <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="set_font_name"
-              c:identifier="gtk_font_button_set_font_name">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="parent">
+            <type name="GLib.Node" c:type="GNode*"/>
           </parameter>
-          <parameter name="fontname">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="sibling">
+            <type name="GLib.Node" c:type="GNode*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_show_style"
-              c:identifier="gtk_font_button_get_show_style">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="func">
+            <type name="CTreeGNodeFunc" c:type="GtkCTreeGNodeFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_show_style"
-              c:identifier="gtk_font_button_set_show_style">
+      <method name="post_recursive" c:identifier="gtk_ctree_post_recursive">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="show_style">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_show_size"
-              c:identifier="gtk_font_button_get_show_size">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="func">
+            <type name="CTreeFunc" c:type="GtkCTreeFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_show_size"
-              c:identifier="gtk_font_button_set_show_size">
+      <method name="post_recursive_to_depth"
+              c:identifier="gtk_ctree_post_recursive_to_depth">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="font_button">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="show_size">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="depth">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="func">
+            <type name="CTreeFunc" c:type="GtkCTreeFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <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">
+      <method name="pre_recursive" c:identifier="gtk_ctree_pre_recursive">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="gfp">
-            <type name="FontButton" c:type="GtkFontButton*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </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="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="fontsel">
-            <type name="FontSelection" c:type="GtkFontSelection*"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_font" c:identifier="gtk_font_selection_get_font">
-        <return-value>
-          <type name="GdkFont" c:type="GdkFont*"/>
-        </return-value>
-        <parameters>
-          <parameter name="fontsel">
-            <type name="FontSelection" c:type="GtkFontSelection*"/>
+          <parameter name="func">
+            <type name="CTreeFunc" c:type="GtkCTreeFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_font_name"
-              c:identifier="gtk_font_selection_set_font_name">
+      <method name="pre_recursive_to_depth"
+              c:identifier="gtk_ctree_pre_recursive_to_depth">
         <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="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="fontname">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="depth">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="func">
+            <type name="CTreeFunc" c:type="GtkCTreeFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_preview_text"
-              c:identifier="gtk_font_selection_get_preview_text">
+      <method name="is_viewable" c:identifier="gtk_ctree_is_viewable">
         <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="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_preview_text"
-              c:identifier="gtk_font_selection_set_preview_text">
+      <method name="last" c:identifier="gtk_ctree_last">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="CTreeNode" c:type="GtkCTreeNode*"/>
         </return-value>
         <parameters>
-          <parameter name="fontsel">
-            <type name="FontSelection" c:type="GtkFontSelection*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </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>
+      <method name="find_node_ptr" c:identifier="gtk_ctree_find_node_ptr">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="CTreeNode" c:type="GtkCTreeNode*"/>
         </return-value>
         <parameters>
-          <parameter name="fsd">
-            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="ctree_row">
+            <type name="CTreeRow" c:type="GtkCTreeRow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_font"
-              c:identifier="gtk_font_selection_dialog_get_font">
+      <method name="node_nth" c:identifier="gtk_ctree_node_nth">
         <return-value>
-          <type name="GdkFont" c:type="GdkFont*"/>
+          <type name="CTreeNode" c:type="GtkCTreeNode*"/>
         </return-value>
         <parameters>
-          <parameter name="fsd">
-            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_font_name"
-              c:identifier="gtk_font_selection_dialog_set_font_name">
+      <method name="find" c:identifier="gtk_ctree_find">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="fsd">
-            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="fontname">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_preview_text"
-              c:identifier="gtk_font_selection_dialog_get_preview_text">
+      <method name="is_ancestor" c:identifier="gtk_ctree_is_ancestor">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="fsd">
-            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_preview_text"
-              c:identifier="gtk_font_selection_dialog_set_preview_text">
+      <method name="find_by_row_data"
+              c:identifier="gtk_ctree_find_by_row_data">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="CTreeNode" c:type="GtkCTreeNode*"/>
         </return-value>
         <parameters>
-          <parameter name="fsd">
-            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </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="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>
-      </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">
+      <method name="find_all_by_row_data"
+              c:identifier="gtk_ctree_find_all_by_row_data">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.List" c:type="GList*"/>
         </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">
+        <parameters>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="find_by_row_data_custom"
+              c:identifier="gtk_ctree_find_by_row_data_custom">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="CTreeNode" c:type="GtkCTreeNode*"/>
         </return-value>
         <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="type">
-            <type name="ShadowType" c:type="GtkShadowType"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="func">
+            <type name="GLib.CompareFunc" c:type="GCompareFunc"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_shadow_type"
-              c:identifier="gtk_handle_box_get_shadow_type">
+      <method name="find_all_by_row_data_custom"
+              c:identifier="gtk_ctree_find_all_by_row_data_custom">
         <return-value>
-          <type name="ShadowType" c:type="GtkShadowType"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="func">
+            <type name="GLib.CompareFunc" c:type="GCompareFunc"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_handle_position"
-              c:identifier="gtk_handle_box_set_handle_position">
+      <method name="is_hot_spot" c:identifier="gtk_ctree_is_hot_spot">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="position">
-            <type name="PositionType" c:type="GtkPositionType"/>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_handle_position"
-              c:identifier="gtk_handle_box_get_handle_position">
+      <method name="move" c:identifier="gtk_ctree_move">
         <return-value>
-          <type name="PositionType" c:type="GtkPositionType"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="new_parent" allow-none="1">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="new_sibling" allow-none="1">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_snap_edge" c:identifier="gtk_handle_box_set_snap_edge">
+      <method name="expand" c:identifier="gtk_ctree_expand">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="edge">
-            <type name="PositionType" c:type="GtkPositionType"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_snap_edge" c:identifier="gtk_handle_box_get_snap_edge">
+      <method name="expand_recursive"
+              c:identifier="gtk_ctree_expand_recursive">
         <return-value>
-          <type name="PositionType" c:type="GtkPositionType"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </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="expand_to_depth" c:identifier="gtk_ctree_expand_to_depth">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="depth">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="child_detached">
+      </method>
+      <method name="collapse" c:identifier="gtk_ctree_collapse">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="handle_box">
-            <type name="HandleBox" c:type="GtkHandleBox*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
+      </method>
+      <method name="collapse_recursive"
+              c:identifier="gtk_ctree_collapse_recursive">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+        <parameters>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="collapse_to_depth"
+              c:identifier="gtk_ctree_collapse_to_depth">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="depth">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="toggle_expansion"
+              c:identifier="gtk_ctree_toggle_expansion">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="toggle_expansion_recursive"
+              c:identifier="gtk_ctree_toggle_expansion_recursive">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <glib:signal name="child-attached">
+        <parameters>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="select" c:identifier="gtk_ctree_select">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Widget" c:type="GtkWidget"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="child-detached">
+      </method>
+      <method name="select_recursive"
+              c:identifier="gtk_ctree_select_recursive">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Widget" c:type="GtkWidget"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <function name="handle_box_new" c:identifier="gtk_handle_box_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </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">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="hbutton_box_get_spacing_default"
-              c:identifier="gtk_hbutton_box_get_spacing_default">
-      <return-value>
-        <type name="int32" c:type="gint"/>
-      </return-value>
-    </function>
-    <function name="hbutton_box_get_layout_default"
-              c:identifier="gtk_hbutton_box_get_layout_default">
-      <return-value>
-        <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
-      </return-value>
-    </function>
-    <function name="hbutton_box_set_spacing_default"
-              c:identifier="gtk_hbutton_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="hbutton_box_set_layout_default"
-              c:identifier="gtk_hbutton_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>
-    <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">
+      </method>
+      <method name="unselect" c:identifier="gtk_ctree_unselect">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add2" c:identifier="gtk_paned_add2">
+      <method name="unselect_recursive"
+              c:identifier="gtk_ctree_unselect_recursive">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="pack1" c:identifier="gtk_paned_pack1">
+      <method name="real_select_recursive"
+              c:identifier="gtk_ctree_real_select_recursive">
         <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 name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="resize">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
-          <parameter name="shrink">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="state">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="pack2" c:identifier="gtk_paned_pack2">
+      <method name="node_set_text" c:identifier="gtk_ctree_node_set_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
-          <parameter name="resize">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="shrink">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_position" c:identifier="gtk_paned_get_position">
+      <method name="node_set_pixmap" c:identifier="gtk_ctree_node_set_pixmap">
         <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="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="pixmap">
+            <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+          </parameter>
+          <parameter name="mask" allow-none="1">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_position" c:identifier="gtk_paned_set_position">
+      <method name="node_set_pixtext"
+              c:identifier="gtk_ctree_node_set_pixtext">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="spacing">
+            <type name="uint8" c:type="guint8"/>
+          </parameter>
+          <parameter name="pixmap">
+            <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+          </parameter>
+          <parameter name="mask" allow-none="1">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_child1" c:identifier="gtk_paned_get_child1">
+      <method name="set_node_info" c:identifier="gtk_ctree_set_node_info">
         <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="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="spacing">
+            <type name="uint8" c:type="guint8"/>
+          </parameter>
+          <parameter name="pixmap_closed" allow-none="1">
+            <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+          </parameter>
+          <parameter name="mask_closed" allow-none="1">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
+          </parameter>
+          <parameter name="pixmap_opened" allow-none="1">
+            <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+          </parameter>
+          <parameter name="mask_opened" allow-none="1">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
+          </parameter>
+          <parameter name="is_leaf">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="expanded">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_child2" c:identifier="gtk_paned_get_child2">
+      <method name="node_set_shift" c:identifier="gtk_ctree_node_set_shift">
         <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="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="vertical">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="horizontal">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="compute_position"
-              c:identifier="gtk_paned_compute_position">
+      <method name="node_set_selectable"
+              c:identifier="gtk_ctree_node_set_selectable">
         <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 name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="child1_req">
-            <type name="int32" c:type="gint"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
-          <parameter name="child2_req">
-            <type name="int32" c:type="gint"/>
+          <parameter name="selectable">
+            <type name="boolean" c:type="gboolean"/>
           </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="node_get_selectable"
+              c:identifier="gtk_ctree_node_get_selectable">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="reverse">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="toggle_handle_focus">
+      </method>
+      <method name="node_get_cell_type"
+              c:identifier="gtk_ctree_node_get_cell_type">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="CellType" c:type="GtkCellType"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="move_handle">
+      </method>
+      <method name="node_get_text" c:identifier="gtk_ctree_node_get_text">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="scroll">
-            <type name="ScrollType" c:type="GtkScrollType"/>
+          <parameter name="text">
+            <type name="GLib.char" c:type="gchar**"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="cycle_handle_focus">
+      </method>
+      <method name="node_get_pixmap" c:identifier="gtk_ctree_node_get_pixmap">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="reverse">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="pixmap">
+            <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
+          </parameter>
+          <parameter name="mask">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap**"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="accept_position">
+      </method>
+      <method name="node_get_pixtext"
+              c:identifier="gtk_ctree_node_get_pixtext">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="text">
+            <type name="GLib.char" c:type="gchar**"/>
+          </parameter>
+          <parameter name="spacing">
+            <type name="uint8" c:type="guint8*"/>
+          </parameter>
+          <parameter name="pixmap">
+            <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
+          </parameter>
+          <parameter name="mask">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap**"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="cancel_position">
+      </method>
+      <method name="get_node_info" c:identifier="gtk_ctree_get_node_info">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="paned">
-            <type name="Paned" c:type="GtkPaned*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="GLib.char" c:type="gchar**"/>
+          </parameter>
+          <parameter name="spacing">
+            <type name="uint8" c:type="guint8*"/>
+          </parameter>
+          <parameter name="pixmap_closed">
+            <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
+          </parameter>
+          <parameter name="mask_closed">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap**"/>
+          </parameter>
+          <parameter name="pixmap_opened">
+            <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
+          </parameter>
+          <parameter name="mask_opened">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap**"/>
+          </parameter>
+          <parameter name="is_leaf">
+            <type name="boolean" c:type="gboolean*"/>
+          </parameter>
+          <parameter name="expanded">
+            <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">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+      </method>
+      <method name="node_set_row_style"
+              c:identifier="gtk_ctree_node_set_row_style">
         <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 name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </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="node_get_row_style"
+              c:identifier="gtk_ctree_node_get_row_style">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Style" c:type="GtkStyle*"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="ScrollType" c:type="GtkScrollType"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="cycle-handle-focus">
+      </method>
+      <method name="node_set_cell_style"
+              c:identifier="gtk_ctree_node_set_cell_style">
         <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="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </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="node_get_cell_style"
+              c:identifier="gtk_ctree_node_get_cell_style">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Style" c:type="GtkStyle*"/>
         </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="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="node_set_foreground"
+              c:identifier="gtk_ctree_node_set_foreground">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ruler">
-            <type name="Ruler" c:type="GtkRuler*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="metric">
-            <type name="MetricType" c:type="GtkMetricType"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="color">
+            <type name="Gdk.Color" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_range" c:identifier="gtk_ruler_set_range">
+      <method name="node_set_background"
+              c:identifier="gtk_ctree_node_set_background">
         <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 name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="position">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
-          <parameter name="max_size">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="color">
+            <type name="Gdk.Color" c:type="GdkColor*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="draw_ticks" c:identifier="gtk_ruler_draw_ticks">
+      <method name="node_set_row_data"
+              c:identifier="gtk_ctree_node_set_row_data">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ruler">
-            <type name="Ruler" c:type="GtkRuler*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="draw_pos" c:identifier="gtk_ruler_draw_pos">
+      <method name="node_set_row_data_full"
+              c:identifier="gtk_ctree_node_set_row_data_full">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ruler">
-            <type name="Ruler" c:type="GtkRuler*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_metric" c:identifier="gtk_ruler_get_metric">
+      <method name="node_get_row_data"
+              c:identifier="gtk_ctree_node_get_row_data">
         <return-value>
-          <type name="MetricType" c:type="GtkMetricType"/>
+          <type name="any" c:type="gpointer"/>
         </return-value>
         <parameters>
-          <parameter name="ruler">
-            <type name="Ruler" c:type="GtkRuler*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_range" c:identifier="gtk_ruler_get_range">
+      <method name="node_moveto" c:identifier="gtk_ctree_node_moveto">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="ruler">
-            <type name="Ruler" c:type="GtkRuler*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="lower">
-            <type name="GLib.gdouble" c:type="gdouble*"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
-          <parameter name="upper">
-            <type name="GLib.gdouble" c:type="gdouble*"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="position">
-            <type name="GLib.gdouble" c:type="gdouble*"/>
+          <parameter name="row_align">
+            <type name="float" c:type="gfloat"/>
           </parameter>
-          <parameter name="max_size">
-            <type name="GLib.gdouble" c:type="gdouble*"/>
+          <parameter name="col_align">
+            <type name="float" c:type="gfloat"/>
           </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">
+      <method name="node_is_visible" c:identifier="gtk_ctree_node_is_visible">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Visibility" c:type="GtkVisibility"/>
         </return-value>
         <parameters>
-          <parameter name="ruler">
-            <type name="Ruler" c:type="GtkRuler*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </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 name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </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>
-    </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">
+      </method>
+      <method name="set_indent" c:identifier="gtk_ctree_set_indent">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="digits">
-            <type name="int32" c:type="gint"/>
+          <parameter name="indent">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_digits" c:identifier="gtk_scale_get_digits">
+      <method name="set_spacing" c:identifier="gtk_ctree_set_spacing">
         <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="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="spacing">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_draw_value" c:identifier="gtk_scale_set_draw_value">
+      <method name="set_show_stub" c:identifier="gtk_ctree_set_show_stub">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="draw_value">
+          <parameter name="show_stub">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_draw_value" c:identifier="gtk_scale_get_draw_value">
+      <method name="set_line_style" c:identifier="gtk_ctree_set_line_style">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="line_style">
+            <type name="CTreeLineStyle" c:type="GtkCTreeLineStyle"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_value_pos" c:identifier="gtk_scale_set_value_pos">
+      <method name="set_expander_style"
+              c:identifier="gtk_ctree_set_expander_style">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="pos">
-            <type name="PositionType" c:type="GtkPositionType"/>
+          <parameter name="expander_style">
+            <type name="CTreeExpanderStyle" c:type="GtkCTreeExpanderStyle"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_value_pos" c:identifier="gtk_scale_get_value_pos">
+      <method name="set_drag_compare_func"
+              c:identifier="gtk_ctree_set_drag_compare_func">
         <return-value>
-          <type name="PositionType" c:type="GtkPositionType"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="cmp_func">
+            <type name="CTreeCompareDragFunc"
+                  c:type="GtkCTreeCompareDragFunc"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_layout" c:identifier="gtk_scale_get_layout">
+      <method name="sort_node" c:identifier="gtk_ctree_sort_node">
         <return-value>
-          <type name="Pango.Layout" c:type="PangoLayout*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_layout_offsets"
-              c:identifier="gtk_scale_get_layout_offsets">
+      <method name="sort_recursive" c:identifier="gtk_ctree_sort_recursive">
         <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 name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="y">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="digits">
-        <type name="int32" c:type="gint"/>
+      <property name="n-columns">
+        <type name="uint" c:type="guint"/>
       </property>
-      <property name="draw-value">
+      <property name="tree-column">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="indent">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="spacing">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="show-stub">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="value-pos">
-        <type name="PositionType" c:type="GtkPositionType"/>
+      <property name="line-style">
+        <type name="CTreeLineStyle" c:type="GtkCTreeLineStyle"/>
       </property>
-      <callback name="format_value">
+      <property name="expander-style">
+        <type name="CTreeExpanderStyle" c:type="GtkCTreeExpanderStyle"/>
+      </property>
+      <callback name="tree_select_row" c:type="tree_select_row">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="value">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="row">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="draw_value">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_layout_offsets">
+      <callback name="tree_unselect_row" c:type="tree_unselect_row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scale">
-            <type name="Scale" c:type="GtkScale*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="x">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="row">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
-          <parameter name="y">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </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">
+      <callback name="tree_expand" c:type="tree_expand">
         <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 name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </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">
-      <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>
-        <parameter name="value">
-          <type name="double" c:type="gdouble"/>
-        </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>
-      </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">
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="tree_collapse" c:type="tree_collapse">
         <return-value>
-          <type name="IconFactory" c:type="GtkIconFactory*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </constructor>
-      <method name="add" c:identifier="gtk_icon_factory_add">
+        <parameters>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="tree_move" c:type="tree_move">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="factory">
-            <type name="IconFactory" c:type="GtkIconFactory*"/>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="stock_id">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
-          <parameter name="icon_set">
-            <type name="IconSet" c:type="GtkIconSet*"/>
+          <parameter name="new_parent">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="new_sibling">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="lookup" c:identifier="gtk_icon_factory_lookup">
+      </callback>
+      <callback name="change_focus_row_expansion"
+                c:type="change_focus_row_expansion">
         <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="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
           </parameter>
-          <parameter name="stock_id">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="action">
+            <type name="CTreeExpansionType" c:type="GtkCTreeExpansionType"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="add_default" c:identifier="gtk_icon_factory_add_default">
+      </callback>
+      <glib:signal name="tree-select-row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="factory">
-            <type name="IconFactory" c:type="GtkIconFactory*"/>
+          <parameter name="object">
+            <type name="CTreeNode" c:type="GtkCTreeNode"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="remove_default"
-              c:identifier="gtk_icon_factory_remove_default">
+      </glib:signal>
+      <glib:signal name="tree-unselect-row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="factory">
-            <type name="IconFactory" c:type="GtkIconFactory*"/>
+          <parameter name="object">
+            <type name="CTreeNode" c:type="GtkCTreeNode"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <callback name="_gtk_reserved1">
+      </glib:signal>
+      <glib:signal name="tree-expand">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+        <parameters>
+          <parameter name="object">
+            <type name="CTreeNode" c:type="GtkCTreeNode"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="tree-collapse">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="object">
+            <type name="CTreeNode" c:type="GtkCTreeNode"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="tree-move">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="object">
+            <type name="CTreeNode" c:type="GtkCTreeNode"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="CTreeNode" c:type="GtkCTreeNode"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="CTreeNode" c:type="GtkCTreeNode"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="change-focus-row-expansion">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
+        <parameters>
+          <parameter name="object">
+            <type name="CTreeExpansionType" c:type="GtkCTreeExpansionType"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
     </class>
-    <function name="icon_factory_lookup_default"
-              c:identifier="gtk_icon_factory_lookup_default">
-      <return-value>
-        <type name="IconSet" c:type="GtkIconSet*"/>
-      </return-value>
-      <parameters>
-        <parameter name="stock_id">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="icon_size_lookup" c:identifier="gtk_icon_size_lookup">
+    <record name="CTreeRow" c:type="GtkCTreeRow">
+      <field name="row">
+        <type name="CListRow" c:type="GtkCListRow"/>
+      </field>
+      <field name="parent">
+        <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+      </field>
+      <field name="sibling">
+        <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+      </field>
+      <field name="children">
+        <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+      </field>
+      <field name="pixmap_closed">
+        <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+      </field>
+      <field name="mask_closed">
+        <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
+      </field>
+      <field name="pixmap_opened">
+        <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+      </field>
+      <field name="mask_opened">
+        <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
+      </field>
+      <field name="level">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="is_leaf">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="expanded">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </record>
+    <record name="CTreeNode" c:type="GtkCTreeNode">
+      <field name="list">
+        <type name="GLib.List" c:type="GList"/>
+      </field>
+    </record>
+    <callback name="CTreeFunc" c:type="GtkCTreeFunc">
       <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 name="ctree">
+          <type name="CTree" c:type="GtkCTree*"/>
         </parameter>
-        <parameter name="width">
-          <type name="GLib.gint" c:type="gint*"/>
+        <parameter name="node">
+          <type name="CTreeNode" c:type="GtkCTreeNode*"/>
         </parameter>
-        <parameter name="height">
-          <type name="GLib.gint" c:type="gint*"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="icon_size_lookup_for_settings"
-              c:identifier="gtk_icon_size_lookup_for_settings">
+    </callback>
+    <callback name="CTreeGNodeFunc" c:type="GtkCTreeGNodeFunc">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="settings">
-          <type name="Settings" c:type="GtkSettings*"/>
+        <parameter name="ctree">
+          <type name="CTree" c:type="GtkCTree*"/>
         </parameter>
-        <parameter name="size">
-          <type name="IconSize" c:type="GtkIconSize"/>
+        <parameter name="depth">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="width">
-          <type name="GLib.gint" c:type="gint*"/>
+        <parameter name="gnode">
+          <type name="GLib.Node" c:type="GNode*"/>
         </parameter>
-        <parameter name="height">
-          <type name="GLib.gint" c:type="gint*"/>
+        <parameter name="cnode">
+          <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="icon_size_register" c:identifier="gtk_icon_size_register">
+    </callback>
+    <callback name="CTreeCompareDragFunc" c:type="GtkCTreeCompareDragFunc">
       <return-value>
-        <type name="IconSize" c:type="GtkIconSize"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="ctree">
+          <type name="CTree" c:type="GtkCTree*"/>
         </parameter>
-        <parameter name="width">
-          <type name="int32" c:type="gint"/>
+        <parameter name="source_node">
+          <type name="CTreeNode" c:type="GtkCTreeNode*"/>
         </parameter>
-        <parameter name="height">
-          <type name="int32" c:type="gint"/>
+        <parameter name="new_parent">
+          <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+        </parameter>
+        <parameter name="new_sibling">
+          <type name="CTreeNode" c:type="GtkCTreeNode*"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="icon_size_register_alias"
-              c:identifier="gtk_icon_size_register_alias">
+    </callback>
+    <function name="ctree_new_with_titles"
+              c:identifier="gtk_ctree_new_with_titles">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="alias">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="columns">
+          <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="target">
-          <type name="IconSize" c:type="GtkIconSize"/>
+        <parameter name="tree_column">
+          <type name="int" c:type="gint"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="icon_size_from_name"
-              c:identifier="gtk_icon_size_from_name">
-      <return-value>
-        <type name="IconSize" c:type="GtkIconSize"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
+        <parameter name="titles">
           <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="icon_size_get_name" c:identifier="gtk_icon_size_get_name">
+    <function name="ctree_new" c:identifier="gtk_ctree_new">
       <return-value>
-        <type name="string" c:type="gchar*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="size">
-          <type name="IconSize" c:type="GtkIconSize"/>
+        <parameter name="columns">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="tree_column">
+          <type name="int" c:type="gint"/>
         </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">
+    <class name="DrawingArea"
+           c:type="GtkDrawingArea"
+           parent="Widget"
+           glib:type-name="GtkDrawingArea"
+           glib:get-type="gtk_drawing_area_get_type">
+      <method name="size" c:identifier="gtk_drawing_area_size">
         <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="darea">
+            <type name="DrawingArea" c:type="GtkDrawingArea*"/>
+          </parameter>
+          <parameter name="width">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="height">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="ref" c:identifier="gtk_icon_set_ref">
+      </method>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
-          <type name="IconSet" c:type="GtkIconSet*"/>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="drawing_area_new" c:identifier="gtk_drawing_area_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="Curve"
+           c:type="GtkCurve"
+           parent="DrawingArea"
+           glib:type-name="GtkCurve"
+           glib:get-type="gtk_curve_get_type">
+      <method name="reset" c:identifier="gtk_curve_reset">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_set">
-            <type name="IconSet" c:type="GtkIconSet*"/>
+          <parameter name="curve">
+            <type name="Curve" c:type="GtkCurve*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="copy" c:identifier="gtk_icon_set_copy">
+      </method>
+      <method name="set_gamma" c:identifier="gtk_curve_set_gamma">
         <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="curve">
+            <type name="Curve" c:type="GtkCurve*"/>
+          </parameter>
+          <parameter name="gamma_">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="unref" c:identifier="gtk_icon_set_unref">
+      </method>
+      <method name="set_range" c:identifier="gtk_curve_set_range">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_set">
-            <type name="IconSet" c:type="GtkIconSet*"/>
+          <parameter name="curve">
+            <type name="Curve" c:type="GtkCurve*"/>
+          </parameter>
+          <parameter name="min_x">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="max_x">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="min_y">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="max_y">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
       </method>
-      <method name="render_icon" c:identifier="gtk_icon_set_render_icon">
+      <method name="get_vector" c:identifier="gtk_curve_get_vector">
         <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="curve">
+            <type name="Curve" c:type="GtkCurve*"/>
           </parameter>
-          <parameter name="direction">
-            <type name="TextDirection" c:type="GtkTextDirection"/>
+          <parameter name="veclen">
+            <type name="int" c:type="int"/>
           </parameter>
-          <parameter name="state">
-            <type name="StateType" c:type="GtkStateType"/>
+          <parameter name="vector">
+            <type name="float" c:type="gfloat"/>
           </parameter>
-          <parameter name="size">
-            <type name="IconSize" c:type="GtkIconSize"/>
+        </parameters>
+      </method>
+      <method name="set_vector" c:identifier="gtk_curve_set_vector">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="curve">
+            <type name="Curve" c:type="GtkCurve*"/>
           </parameter>
-          <parameter name="widget" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="veclen">
+            <type name="int" c:type="int"/>
           </parameter>
-          <parameter name="detail" allow-none="1">
-            <type name="string" c:type="char*"/>
+          <parameter name="vector">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_source" c:identifier="gtk_icon_set_add_source">
+      <method name="set_curve_type" c:identifier="gtk_curve_set_curve_type">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_set">
-            <type name="IconSet" c:type="GtkIconSet*"/>
+          <parameter name="curve">
+            <type name="Curve" c:type="GtkCurve*"/>
           </parameter>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="type">
+            <type name="CurveType" c:type="GtkCurveType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_sizes" c:identifier="gtk_icon_set_get_sizes">
+      <property name="curve-type">
+        <type name="CurveType" c:type="GtkCurveType"/>
+      </property>
+      <property name="min-x">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="max-x">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="min-y">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="max-y">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <callback name="curve_type_changed" c:type="curve_type_changed">
         <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="curve">
+            <type name="Curve" c:type="GtkCurve*"/>
           </parameter>
-          <parameter name="n_sizes">
-            <type name="GLib.gint" c:type="gint*"/>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="curve-type-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="curve_new" c:identifier="gtk_curve_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="EventBox"
+           c:type="GtkEventBox"
+           parent="Bin"
+           glib:type-name="GtkEventBox"
+           glib:get-type="gtk_event_box_get_type">
+      <method name="get_visible_window"
+              c:identifier="gtk_event_box_get_visible_window">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="event_box">
+            <type name="EventBox" c:type="GtkEventBox*"/>
           </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">
+      <method name="set_visible_window"
+              c:identifier="gtk_event_box_set_visible_window">
         <return-value>
-          <type name="IconSource" c:type="GtkIconSource*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </constructor>
-      <constructor name="copy" c:identifier="gtk_icon_source_copy">
+        <parameters>
+          <parameter name="event_box">
+            <type name="EventBox" c:type="GtkEventBox*"/>
+          </parameter>
+          <parameter name="visible_window">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_above_child"
+              c:identifier="gtk_event_box_get_above_child">
         <return-value>
-          <type name="IconSource" c:type="GtkIconSource*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="event_box">
+            <type name="EventBox" c:type="GtkEventBox*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="free" c:identifier="gtk_icon_source_free">
+      </method>
+      <method name="set_above_child"
+              c:identifier="gtk_event_box_set_above_child">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="event_box">
+            <type name="EventBox" c:type="GtkEventBox*"/>
+          </parameter>
+          <parameter name="above_child">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_filename" c:identifier="gtk_icon_source_set_filename">
+      <property name="visible-window">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="above-child">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+    </class>
+    <function name="event_box_new" c:identifier="gtk_event_box_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="Expander"
+           c:type="GtkExpander"
+           parent="Bin"
+           glib:type-name="GtkExpander"
+           glib:get-type="gtk_expander_get_type">
+      <method name="set_expanded" c:identifier="gtk_expander_set_expanded">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
           </parameter>
-          <parameter name="filename">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="expanded">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_icon_name"
-              c:identifier="gtk_icon_source_set_icon_name">
+      <method name="get_expanded" c:identifier="gtk_expander_get_expanded">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_spacing" c:identifier="gtk_expander_set_spacing">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
           </parameter>
-          <parameter name="icon_name" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="spacing">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_pixbuf" c:identifier="gtk_icon_source_set_pixbuf">
+      <method name="get_spacing" c:identifier="gtk_expander_get_spacing">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_label" c:identifier="gtk_expander_set_label">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
           </parameter>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="label" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_filename" c:identifier="gtk_icon_source_get_filename">
+      <method name="get_label" c:identifier="gtk_expander_get_label">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_icon_name"
-              c:identifier="gtk_icon_source_get_icon_name">
+      <method name="set_use_underline"
+              c:identifier="gtk_expander_set_use_underline">
         <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="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
+          </parameter>
+          <parameter name="use_underline">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_pixbuf" c:identifier="gtk_icon_source_get_pixbuf">
+      <method name="get_use_underline"
+              c:identifier="gtk_expander_get_use_underline">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_direction_wildcarded"
-              c:identifier="gtk_icon_source_set_direction_wildcarded">
+      <method name="set_use_markup" c:identifier="gtk_expander_set_use_markup">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
           </parameter>
-          <parameter name="setting">
+          <parameter name="use_markup">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_state_wildcarded"
-              c:identifier="gtk_icon_source_set_state_wildcarded">
+      <method name="get_use_markup" c:identifier="gtk_expander_get_use_markup">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_size_wildcarded"
-              c:identifier="gtk_icon_source_set_size_wildcarded">
+      <method name="set_label_widget"
+              c:identifier="gtk_expander_set_label_widget">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
           </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="label_widget" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_size_wildcarded"
-              c:identifier="gtk_icon_source_get_size_wildcarded">
+      <method name="get_label_widget"
+              c:identifier="gtk_expander_get_label_widget">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_state_wildcarded"
-              c:identifier="gtk_icon_source_get_state_wildcarded">
+      <property name="expanded">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="label">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="use-underline">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="use-markup">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="spacing">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="label-widget">
+        <type name="Widget" c:type="GtkWidget"/>
+      </property>
+      <callback name="activate" c:type="activate">
         <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="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <glib:signal name="activate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <record name="ExpanderPrivate" c:type="GtkExpanderPrivate"/>
+    <function name="expander_new" c:identifier="gtk_expander_new">
+      <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="expander_new_with_mnemonic"
+              c:identifier="gtk_expander_new_with_mnemonic">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="label" allow-none="1">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="FileFilter"
+           c:type="GtkFileFilter"
+           parent="Object"
+           glib:type-name="GtkFileFilter"
+           glib:get-type="gtk_file_filter_get_type">
+      <constructor name="new" c:identifier="gtk_file_filter_new">
+        <return-value>
+          <type name="FileFilter" c:type="GtkFileFilter*"/>
+        </return-value>
+      </constructor>
+      <method name="set_name" c:identifier="gtk_file_filter_set_name">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="FileFilter" c:type="GtkFileFilter*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_direction_wildcarded"
-              c:identifier="gtk_icon_source_get_direction_wildcarded">
+      <method name="get_name" c:identifier="gtk_file_filter_get_name">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="filter">
+            <type name="FileFilter" c:type="GtkFileFilter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_direction"
-              c:identifier="gtk_icon_source_set_direction">
+      <method name="add_mime_type"
+              c:identifier="gtk_file_filter_add_mime_type">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="filter">
+            <type name="FileFilter" c:type="GtkFileFilter*"/>
           </parameter>
-          <parameter name="direction">
-            <type name="TextDirection" c:type="GtkTextDirection"/>
+          <parameter name="mime_type">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_state" c:identifier="gtk_icon_source_set_state">
+      <method name="add_pattern" c:identifier="gtk_file_filter_add_pattern">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="filter">
+            <type name="FileFilter" c:type="GtkFileFilter*"/>
           </parameter>
-          <parameter name="state">
-            <type name="StateType" c:type="GtkStateType"/>
+          <parameter name="pattern">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_size" c:identifier="gtk_icon_source_set_size">
+      <method name="add_pixbuf_formats"
+              c:identifier="gtk_file_filter_add_pixbuf_formats">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
-          </parameter>
-          <parameter name="size">
-            <type name="IconSize" c:type="GtkIconSize"/>
+          <parameter name="filter">
+            <type name="FileFilter" c:type="GtkFileFilter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_direction"
-              c:identifier="gtk_icon_source_get_direction">
+      <method name="add_custom" c:identifier="gtk_file_filter_add_custom">
         <return-value>
-          <type name="TextDirection" c:type="GtkTextDirection"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="filter">
+            <type name="FileFilter" c:type="GtkFileFilter*"/>
+          </parameter>
+          <parameter name="needed">
+            <type name="FileFilterFlags" c:type="GtkFileFilterFlags"/>
+          </parameter>
+          <parameter name="func">
+            <type name="FileFilterFunc" c:type="GtkFileFilterFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="notify">
+            <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_state" c:identifier="gtk_icon_source_get_state">
+      <method name="get_needed" c:identifier="gtk_file_filter_get_needed">
         <return-value>
-          <type name="StateType" c:type="GtkStateType"/>
+          <type name="FileFilterFlags" c:type="GtkFileFilterFlags"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="filter">
+            <type name="FileFilter" c:type="GtkFileFilter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_size" c:identifier="gtk_icon_source_get_size">
+      <method name="filter" c:identifier="gtk_file_filter_filter">
         <return-value>
-          <type name="IconSize" c:type="GtkIconSize"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="filter">
+            <type name="FileFilter" c:type="GtkFileFilter*"/>
+          </parameter>
+          <parameter name="filter_info">
+            <type name="FileFilterInfo" c:type="GtkFileFilterInfo*"/>
           </parameter>
         </parameters>
       </method>
-    </glib:boxed>
-    <function name="icon_set_invalidate_caches"
-              c:identifier="_gtk_icon_set_invalidate_caches">
+    </class>
+    <record name="FileFilterInfo" c:type="GtkFileFilterInfo">
+      <field name="contains">
+        <type name="FileFilterFlags" c:type="GtkFileFilterFlags"/>
+      </field>
+      <field name="filename">
+        <type name="string" c:type="gchar*"/>
+      </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>
+    </record>
+    <callback name="FileFilterFunc" c:type="GtkFileFilterFunc">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="filter_info">
+          <type name="FileFilterInfo" c:type="GtkFileFilterInfo*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <interface name="FileChooser"
+               c:type="GtkFileChooser"
+               glib:type-name="GtkFileChooser"
+               glib:get-type="gtk_file_chooser_get_type">
+      <property name="local-only">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="filter">
+        <type name="FileFilter" c:type="GtkFileFilter"/>
+      </property>
+      <property name="extra-widget">
+        <type name="Widget" c:type="GtkWidget"/>
+      </property>
+      <property name="preview-widget">
+        <type name="Widget" c:type="GtkWidget"/>
+      </property>
+      <property name="do-overwrite-confirmation">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="action">
+        <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
+      </property>
+      <property name="use-preview-label">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="preview-widget-active">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="select-multiple">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="show-hidden">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="file-system-backend">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <glib:signal name="current-folder-changed">
+        <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="update-preview">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="file-activated">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="confirm-overwrite">
+        <return-value>
+          <type name="FileChooserConfirmation"
+                c:type="GtkFileChooserConfirmation"/>
+        </return-value>
+      </glib:signal>
+    </interface>
+    <function name="file_chooser_error_quark"
+              c:identifier="gtk_file_chooser_error_quark">
+      <return-value>
+        <type name="GLib.Quark" c:type="GQuark"/>
+      </return-value>
+    </function>
+    <function name="file_chooser_set_action"
+              c:identifier="gtk_file_chooser_set_action">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="action">
+          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_action"
+              c:identifier="gtk_file_chooser_get_action">
+      <return-value>
+        <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_local_only"
+              c:identifier="gtk_file_chooser_set_local_only">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="local_only">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_local_only"
+              c:identifier="gtk_file_chooser_get_local_only">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_select_multiple"
+              c:identifier="gtk_file_chooser_set_select_multiple">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="select_multiple">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_select_multiple"
+              c:identifier="gtk_file_chooser_get_select_multiple">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_show_hidden"
+              c:identifier="gtk_file_chooser_set_show_hidden">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="show_hidden">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_show_hidden"
+              c:identifier="gtk_file_chooser_get_show_hidden">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_do_overwrite_confirmation"
+              c:identifier="gtk_file_chooser_set_do_overwrite_confirmation">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="do_overwrite_confirmation">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_do_overwrite_confirmation"
+              c:identifier="gtk_file_chooser_get_do_overwrite_confirmation">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_current_name"
+              c:identifier="gtk_file_chooser_set_current_name">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_filename"
+              c:identifier="gtk_file_chooser_get_filename">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_filename"
+              c:identifier="gtk_file_chooser_set_filename">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="filename">
+          <type name="string" c:type="char*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_select_filename"
+              c:identifier="gtk_file_chooser_select_filename">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="filename">
+          <type name="string" c:type="char*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_unselect_filename"
+              c:identifier="gtk_file_chooser_unselect_filename">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="filename">
+          <type name="string" c:type="char*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_select_all"
+              c:identifier="gtk_file_chooser_select_all">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="icon_factory_list_ids"
-              c:identifier="_gtk_icon_factory_list_ids">
+    <function name="file_chooser_unselect_all"
+              c:identifier="gtk_file_chooser_unselect_all">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_filenames"
+              c:identifier="gtk_file_chooser_get_filenames">
       <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
+        <type name="GLib.SList" c:type="GSList*"/>
       </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="icon_factory_ensure_default_icons"
-              c:identifier="_gtk_icon_factory_ensure_default_icons">
+    <function name="file_chooser_set_current_folder"
+              c:identifier="gtk_file_chooser_set_current_folder">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="filename">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_current_folder"
+              c:identifier="gtk_file_chooser_get_current_folder">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_uri"
+              c:identifier="gtk_file_chooser_get_uri">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_uri"
+              c:identifier="gtk_file_chooser_set_uri">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="uri">
+          <type name="string" c:type="char*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_select_uri"
+              c:identifier="gtk_file_chooser_select_uri">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="uri">
+          <type name="string" c:type="char*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_unselect_uri"
+              c:identifier="gtk_file_chooser_unselect_uri">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="uri">
+          <type name="string" c:type="char*"/>
+        </parameter>
+      </parameters>
     </function>
-    <record name="GtkIconThemePrivate" c:type="GtkIconThemePrivate"/>
-    <function name="icon_theme_error_quark"
-              c:identifier="gtk_icon_theme_error_quark">
+    <function name="file_chooser_get_uris"
+              c:identifier="gtk_file_chooser_get_uris">
       <return-value>
-        <type name="GLib.GQuark" c:type="GQuark"/>
+        <type name="GLib.SList" c:type="GSList*"/>
       </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
     </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">
-        <return-value>
-          <type name="IconTheme" c:type="GtkIconTheme*"/>
-        </return-value>
-        <parameters>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
-          </parameter>
-        </parameters>
-      </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="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_search_path"
-              c:identifier="gtk_icon_theme_set_search_path">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <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>
-        <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="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="prepend_search_path"
-              c:identifier="gtk_icon_theme_prepend_search_path">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <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_custom_theme"
-              c:identifier="gtk_icon_theme_set_custom_theme">
-        <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>
-        </parameters>
-      </method>
-      <method name="has_icon" c:identifier="gtk_icon_theme_has_icon">
-        <return-value>
+    <function name="file_chooser_set_current_folder_uri"
+              c:identifier="gtk_file_chooser_set_current_folder_uri">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="uri">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_current_folder_uri"
+              c:identifier="gtk_file_chooser_get_current_folder_uri">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_preview_widget"
+              c:identifier="gtk_file_chooser_set_preview_widget">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="preview_widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_preview_widget"
+              c:identifier="gtk_file_chooser_get_preview_widget">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_preview_widget_active"
+              c:identifier="gtk_file_chooser_set_preview_widget_active">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="active">
           <type name="boolean" c:type="gboolean"/>
-        </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>
-        </parameters>
-      </method>
-      <method name="get_icon_sizes"
-              c:identifier="gtk_icon_theme_get_icon_sizes">
-        <return-value>
-          <type name="GLib.gint" c:type="gint*"/>
-        </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>
-        </parameters>
-      </method>
-      <method name="lookup_icon" c:identifier="gtk_icon_theme_lookup_icon">
-        <return-value>
-          <type name="IconInfo" c:type="GtkIconInfo*"/>
-        </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>
-          <parameter name="size">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="IconLookupFlags" c:type="GtkIconLookupFlags"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="choose_icon" c:identifier="gtk_icon_theme_choose_icon">
-        <return-value>
-          <type name="IconInfo" c:type="GtkIconInfo*"/>
-        </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>
-          <parameter name="size">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="flags">
-            <type name="IconLookupFlags" c:type="GtkIconLookupFlags"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="load_icon" c:identifier="gtk_icon_theme_load_icon">
-        <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </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>
-          <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>
-      <method name="list_icons" c:identifier="gtk_icon_theme_list_icons">
-        <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_theme">
-            <type name="IconTheme" c:type="GtkIconTheme*"/>
-          </parameter>
-          <parameter name="context">
-            <type name="string" c:type="gchar*"/>
-          </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>
-        </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>
-        </parameters>
-      </method>
-      <method name="rescan_if_needed"
-              c:identifier="gtk_icon_theme_rescan_if_needed">
-        <return-value>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_preview_widget_active"
+              c:identifier="gtk_file_chooser_get_preview_widget_active">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_use_preview_label"
+              c:identifier="gtk_file_chooser_set_use_preview_label">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="use_label">
           <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <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>
-      <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">
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_use_preview_label"
+              c:identifier="gtk_file_chooser_get_use_preview_label">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_preview_filename"
+              c:identifier="gtk_file_chooser_get_preview_filename">
+      <return-value>
+        <type name="string" c:type="char*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_preview_uri"
+              c:identifier="gtk_file_chooser_get_preview_uri">
+      <return-value>
+        <type name="string" c:type="char*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_extra_widget"
+              c:identifier="gtk_file_chooser_set_extra_widget">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="extra_widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_extra_widget"
+              c:identifier="gtk_file_chooser_get_extra_widget">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_add_filter"
+              c:identifier="gtk_file_chooser_add_filter">
       <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 name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
         </parameter>
-        <parameter name="pixbuf">
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+        <parameter name="filter">
+          <type name="FileFilter" c:type="GtkFileFilter*"/>
         </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>
-        </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">
+    <function name="file_chooser_remove_filter"
+              c:identifier="gtk_file_chooser_remove_filter">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="display">
-          <type name="Gdk.Display" c:type="GdkDisplay*"/>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="filter">
+          <type name="FileFilter" c:type="GtkFileFilter*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="icon_theme_ensure_builtin_cache"
-              c:identifier="_gtk_icon_theme_ensure_builtin_cache">
+    <function name="file_chooser_list_filters"
+              c:identifier="gtk_file_chooser_list_filters">
+      <return-value>
+        <type name="GLib.SList" c:type="GSList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_set_filter"
+              c:identifier="gtk_file_chooser_set_filter">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="filter">
+          <type name="FileFilter" c:type="GtkFileFilter*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_get_filter"
+              c:identifier="gtk_file_chooser_get_filter">
+      <return-value>
+        <type name="FileFilter" c:type="GtkFileFilter*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
     </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">
+    <function name="file_chooser_add_shortcut_folder"
+              c:identifier="gtk_file_chooser_add_shortcut_folder">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="folder">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_remove_shortcut_folder"
+              c:identifier="gtk_file_chooser_remove_shortcut_folder">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="folder">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_list_shortcut_folders"
+              c:identifier="gtk_file_chooser_list_shortcut_folders">
+      <return-value>
+        <type name="GLib.SList" c:type="GSList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_add_shortcut_folder_uri"
+              c:identifier="gtk_file_chooser_add_shortcut_folder_uri">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="uri">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_remove_shortcut_folder_uri"
+              c:identifier="gtk_file_chooser_remove_shortcut_folder_uri">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+        <parameter name="uri">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_list_shortcut_folder_uris"
+              c:identifier="gtk_file_chooser_list_shortcut_folder_uris">
+      <return-value>
+        <type name="GLib.SList" c:type="GSList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="FileChooser" c:type="GtkFileChooser*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="FileChooserButton"
+           c:type="GtkFileChooserButton"
+           parent="HBox"
+           glib:type-name="GtkFileChooserButton"
+           glib:get-type="gtk_file_chooser_button_get_type">
+      <method name="get_title"
+              c:identifier="gtk_file_chooser_button_get_title">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
-          </parameter>
-          <parameter name="markup">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="button">
+            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_text" c:identifier="gtk_tooltip_set_text">
+      <method name="set_title"
+              c:identifier="gtk_file_chooser_button_set_title">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
+          <parameter name="button">
+            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
           </parameter>
-          <parameter name="text">
+          <parameter name="title">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_icon" c:identifier="gtk_tooltip_set_icon">
+      <method name="get_width_chars"
+              c:identifier="gtk_file_chooser_button_get_width_chars">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
-          </parameter>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="button">
+            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_icon_from_stock"
-              c:identifier="gtk_tooltip_set_icon_from_stock">
+      <method name="set_width_chars"
+              c:identifier="gtk_file_chooser_button_set_width_chars">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
+          <parameter name="button">
+            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
           </parameter>
-          <parameter name="stock_id">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="n_chars">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="size">
-            <type name="IconSize" c:type="GtkIconSize"/>
+        </parameters>
+      </method>
+      <method name="get_focus_on_click"
+              c:identifier="gtk_file_chooser_button_get_focus_on_click">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="button">
+            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_custom" c:identifier="gtk_tooltip_set_custom">
+      <method name="set_focus_on_click"
+              c:identifier="gtk_file_chooser_button_set_focus_on_click">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
+          <parameter name="button">
+            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
           </parameter>
-          <parameter name="custom_widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="focus_on_click">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tip_area" c:identifier="gtk_tooltip_set_tip_area">
+      <property name="dialog">
+        <type name="FileChooser" c:type="GtkFileChooser"/>
+      </property>
+      <property name="focus-on-click">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="title">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="width-chars">
+        <type name="int" c:type="gint"/>
+      </property>
+      <callback name="file_set" c:type="file_set">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
-          </parameter>
-          <parameter name="rect">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <parameter name="fc">
+            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
           </parameter>
         </parameters>
-      </method>
+      </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>
+      <field name="__gtk_reserved7">
+        <type name="any" c:type="void*"/>
+      </field>
+      <glib:signal name="file-set">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
     </class>
-    <function name="tooltip_trigger_tooltip_query"
-              c:identifier="gtk_tooltip_trigger_tooltip_query">
+    <record name="FileChooserButtonPrivate"
+            c:type="GtkFileChooserButtonPrivate"/>
+    <function name="file_chooser_button_new"
+              c:identifier="gtk_file_chooser_button_new">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="display">
-          <type name="Gdk.Display" c:type="GdkDisplay*"/>
+        <parameter name="title">
+          <type name="string" c:type="gchar*"/>
         </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 name="action">
+          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tooltip_focus_out" c:identifier="_gtk_tooltip_focus_out">
+    <function name="file_chooser_button_new_with_backend"
+              c:identifier="gtk_file_chooser_button_new_with_backend">
       <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="title">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="action">
+          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
+        </parameter>
+        <parameter name="backend">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tooltip_toggle_keyboard_mode"
-              c:identifier="_gtk_tooltip_toggle_keyboard_mode">
+    <function name="file_chooser_button_new_with_dialog"
+              c:identifier="gtk_file_chooser_button_new_with_dialog">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
+        <parameter name="dialog">
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="tooltip_handle_event"
-              c:identifier="_gtk_tooltip_handle_event">
+    <class name="FileChooserDialog"
+           c:type="GtkFileChooserDialog"
+           parent="Dialog"
+           glib:type-name="GtkFileChooserDialog"
+           glib:get-type="gtk_file_chooser_dialog_get_type">
+    </class>
+    <record name="FileChooserDialogPrivate"
+            c:type="GtkFileChooserDialogPrivate"/>
+    <function name="file_chooser_dialog_new"
+              c:identifier="gtk_file_chooser_dialog_new">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="event">
-          <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
+        <parameter name="title">
+          <type name="string" c:type="gchar*"/>
         </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 name="parent">
+          <type name="Window" c:type="GtkWindow*"/>
+        </parameter>
+        <parameter name="action">
+          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
+        </parameter>
+        <parameter name="first_button_text">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkIconViewPrivate" c:type="GtkIconViewPrivate"/>
-    <callback name="GtkIconViewForeachFunc">
+    <function name="file_chooser_dialog_new_with_backend"
+              c:identifier="gtk_file_chooser_dialog_new_with_backend">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="icon_view">
-          <type name="IconView" c:type="GtkIconView*"/>
+        <parameter name="title">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="path">
-          <type name="TreePath" c:type="GtkTreePath*"/>
+        <parameter name="parent">
+          <type name="Window" c:type="GtkWindow*"/>
         </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="action">
+          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
+        </parameter>
+        <parameter name="backend">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="first_button_text">
+          <type name="string" c:type="gchar*"/>
         </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">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <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>
-      </method>
-      <method name="get_model" c:identifier="gtk_icon_view_get_model">
-        <return-value>
-          <type name="TreeModel" c:type="GtkTreeModel*"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_text_column"
-              c:identifier="gtk_icon_view_set_text_column">
+    </function>
+    <class name="FileChooserWidget"
+           c:type="GtkFileChooserWidget"
+           parent="VBox"
+           glib:type-name="GtkFileChooserWidget"
+           glib:get-type="gtk_file_chooser_widget_get_type">
+    </class>
+    <record name="FileChooserWidgetPrivate"
+            c:type="GtkFileChooserWidgetPrivate"/>
+    <function name="file_chooser_widget_new"
+              c:identifier="gtk_file_chooser_widget_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="action">
+          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="file_chooser_widget_new_with_backend"
+              c:identifier="gtk_file_chooser_widget_new_with_backend">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="action">
+          <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
+        </parameter>
+        <parameter name="backend">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="FileSelection"
+           c:type="GtkFileSelection"
+           parent="Dialog"
+           glib:type-name="GtkFileSelection"
+           glib:get-type="gtk_file_selection_get_type">
+      <method name="set_filename"
+              c:identifier="gtk_file_selection_set_filename">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
           </parameter>
-          <parameter name="column">
-            <type name="int32" c:type="gint"/>
+          <parameter name="filename">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_text_column"
-              c:identifier="gtk_icon_view_get_text_column">
+      <method name="get_filename"
+              c:identifier="gtk_file_selection_get_filename">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_markup_column"
-              c:identifier="gtk_icon_view_set_markup_column">
+      <method name="complete" c:identifier="gtk_file_selection_complete">
         <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">
-            <type name="int32" c:type="gint"/>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_markup_column"
-              c:identifier="gtk_icon_view_get_markup_column">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="pattern">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_pixbuf_column"
-              c:identifier="gtk_icon_view_set_pixbuf_column">
+      <method name="show_fileop_buttons"
+              c:identifier="gtk_file_selection_show_fileop_buttons">
         <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">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_pixbuf_column"
-              c:identifier="gtk_icon_view_get_pixbuf_column">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_orientation"
-              c:identifier="gtk_icon_view_set_orientation">
+      <method name="hide_fileop_buttons"
+              c:identifier="gtk_file_selection_hide_fileop_buttons">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="orientation">
-            <type name="Orientation" c:type="GtkOrientation"/>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_orientation"
-              c:identifier="gtk_icon_view_get_orientation">
+      <method name="get_selections"
+              c:identifier="gtk_file_selection_get_selections">
         <return-value>
-          <type name="Orientation" c:type="GtkOrientation"/>
+          <type name="GLib.char" c:type="gchar**"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_columns" c:identifier="gtk_icon_view_set_columns">
+      <method name="set_select_multiple"
+              c:identifier="gtk_file_selection_set_select_multiple">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
           </parameter>
-          <parameter name="columns">
-            <type name="int32" c:type="gint"/>
+          <parameter name="select_multiple">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_columns" c:identifier="gtk_icon_view_get_columns">
+      <method name="get_select_multiple"
+              c:identifier="gtk_file_selection_get_select_multiple">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="filesel">
+            <type name="FileSelection" c:type="GtkFileSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_item_width"
-              c:identifier="gtk_icon_view_set_item_width">
+      <property name="show-fileops">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="filename">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="select-multiple">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <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_item_width"
-              c:identifier="gtk_icon_view_get_item_width">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_spacing" c:identifier="gtk_icon_view_set_spacing">
+      </callback>
+      <callback name="gtk_reserved2" c:type="_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="spacing">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_spacing" c:identifier="gtk_icon_view_get_spacing">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_row_spacing"
-              c:identifier="gtk_icon_view_set_row_spacing">
+      </callback>
+      <callback name="gtk_reserved3" c:type="_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="row_spacing">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_row_spacing"
-              c:identifier="gtk_icon_view_get_row_spacing">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_column_spacing"
-              c:identifier="gtk_icon_view_set_column_spacing">
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <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>
-        </parameters>
-      </method>
-      <method name="get_column_spacing"
-              c:identifier="gtk_icon_view_get_column_spacing">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_margin" c:identifier="gtk_icon_view_set_margin">
+      </callback>
+    </class>
+    <function name="file_selection_new" c:identifier="gtk_file_selection_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="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="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="margin">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_margin" c:identifier="gtk_icon_view_get_margin">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_path_at_pos"
-              c:identifier="gtk_icon_view_get_path_at_pos">
-        <return-value>
-          <type name="TreePath" c:type="GtkTreePath*"/>
-        </return-value>
-        <parameters>
-          <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 name="fixed">
+            <type name="Fixed" c:type="GtkFixed*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_item_at_pos"
-              c:identifier="gtk_icon_view_get_item_at_pos">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" 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_visible_range"
-              c:identifier="gtk_icon_view_get_visible_range">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <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="selected_foreach"
-              c:identifier="gtk_icon_view_selected_foreach">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <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"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_selection_mode"
-              c:identifier="gtk_icon_view_set_selection_mode">
+      <method name="move" c:identifier="gtk_fixed_move">
         <return-value>
           <type name="none" c:type="void"/>
         </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="fixed">
+            <type name="Fixed" c:type="GtkFixed*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_selection_mode"
-              c:identifier="gtk_icon_view_get_selection_mode">
-        <return-value>
-          <type name="SelectionMode" c:type="GtkSelectionMode"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-        </parameters>
-      </method>
-      <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_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unselect_path" c:identifier="gtk_icon_view_unselect_path">
+      <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="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="fixed">
+            <type name="Fixed" c:type="GtkFixed*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="has_window">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="path_is_selected"
-              c:identifier="gtk_icon_view_path_is_selected">
+      <method name="get_has_window" c:identifier="gtk_fixed_get_has_window">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </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="fixed">
+            <type name="Fixed" c:type="GtkFixed*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_selected_items"
-              c:identifier="gtk_icon_view_get_selected_items">
+    </class>
+    <record name="FixedChild" c:type="GtkFixedChild">
+      <field name="widget">
+        <type name="Widget" c:type="GtkWidget*"/>
+      </field>
+      <field name="x">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="y">
+        <type name="int" c:type="gint"/>
+      </field>
+    </record>
+    <function name="fixed_new" c:identifier="gtk_fixed_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <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="GLib.GList" c:type="GList*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="select_all" c:identifier="gtk_icon_view_select_all">
+      <method name="set_title" c:identifier="gtk_font_button_set_title">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="unselect_all" c:identifier="gtk_icon_view_unselect_all">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="title">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="item_activated"
-              c:identifier="gtk_icon_view_item_activated">
+      <method name="get_use_font" c:identifier="gtk_font_button_get_use_font">
         <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="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_cursor" c:identifier="gtk_icon_view_set_cursor">
+      <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="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 name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
-          <parameter name="start_editing">
+          <parameter name="use_font">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_cursor" c:identifier="gtk_icon_view_get_cursor">
+      <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="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 name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="scroll_to_path"
-              c:identifier="gtk_icon_view_scroll_to_path">
+      <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="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
-          <parameter name="use_align">
+          <parameter name="use_size">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="row_align">
-            <type name="float" c:type="gfloat"/>
-          </parameter>
-          <parameter name="col_align">
-            <type name="float" c:type="gfloat"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="enable_model_drag_source"
-              c:identifier="gtk_icon_view_enable_model_drag_source">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </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>
         </parameters>
       </method>
-      <method name="enable_model_drag_dest"
-              c:identifier="gtk_icon_view_enable_model_drag_dest">
+      <method name="get_font_name"
+              c:identifier="gtk_font_button_get_font_name">
         <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="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="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="unset_model_drag_source"
-              c:identifier="gtk_icon_view_unset_model_drag_source">
+      </method>
+      <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="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
+          </parameter>
+          <parameter name="fontname">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unset_model_drag_dest"
-              c:identifier="gtk_icon_view_unset_model_drag_dest">
+      <method name="get_show_style"
+              c:identifier="gtk_font_button_get_show_style">
         <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 name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_reorderable"
-              c:identifier="gtk_icon_view_set_reorderable">
+      <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="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
-          <parameter name="reorderable">
+          <parameter name="show_style">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_reorderable"
-              c:identifier="gtk_icon_view_get_reorderable">
+      <method name="get_show_size"
+              c:identifier="gtk_font_button_get_show_size">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_drag_dest_item"
-              c:identifier="gtk_icon_view_set_drag_dest_item">
+      <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="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
-          </parameter>
-          <parameter name="path" allow-none="1">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="font_button">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
-          <parameter name="pos">
-            <type name="IconViewDropPosition"
-                  c:type="GtkIconViewDropPosition"/>
+          <parameter name="show_size">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_drag_dest_item"
-              c:identifier="gtk_icon_view_get_drag_dest_item">
+      <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" c:type="font_set">
         <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 name="gfp">
+            <type name="FontButton" c:type="GtkFontButton*"/>
           </parameter>
-          <parameter name="pos">
-            <type name="IconViewDropPosition"
-                  c:type="GtkIconViewDropPosition*"/>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_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>
+    <record name="FontButtonPrivate" c:type="GtkFontButtonPrivate"/>
+    <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="fontsel">
+            <type name="FontSelection" c:type="GtkFontSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_dest_item_at_pos"
-              c:identifier="gtk_icon_view_get_dest_item_at_pos">
+      <method name="get_font" c:identifier="gtk_font_selection_get_font">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Gdk.Font" c:type="GdkFont*"/>
         </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="fontsel">
+            <type name="FontSelection" c:type="GtkFontSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="create_drag_icon"
-              c:identifier="gtk_icon_view_create_drag_icon">
+      <method name="set_font_name"
+              c:identifier="gtk_font_selection_set_font_name">
         <return-value>
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="fontsel">
+            <type name="FontSelection" c:type="GtkFontSelection*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="fontname">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="convert_widget_to_bin_window_coords"
-              c:identifier="gtk_icon_view_convert_widget_to_bin_window_coords">
+      <method name="get_preview_text"
+              c:identifier="gtk_font_selection_get_preview_text">
         <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="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="fontsel">
+            <type name="FontSelection" c:type="GtkFontSelection*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tooltip_item"
-              c:identifier="gtk_icon_view_set_tooltip_item">
+      <method name="set_preview_text"
+              c:identifier="gtk_font_selection_set_preview_text">
         <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 name="fontsel">
+            <type name="FontSelection" c:type="GtkFontSelection*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tooltip_cell"
-              c:identifier="gtk_icon_view_set_tooltip_cell">
+      <property name="font-name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="font">
+        <type name="Gdk.Font" c:type="GdkFont"/>
+      </property>
+      <property name="preview-text">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+      </callback>
+    </class>
+    <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="string" c:type="gchar*"/>
+        </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>
-          <parameter name="cell">
-            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          <parameter name="fsd">
+            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_tooltip_context"
-              c:identifier="gtk_icon_view_get_tooltip_context">
+      <method name="get_font"
+              c:identifier="gtk_font_selection_dialog_get_font">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Gdk.Font" c:type="GdkFont*"/>
         </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>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath**"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          <parameter name="fsd">
+            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tooltip_column"
-              c:identifier="gtk_icon_view_set_tooltip_column">
+      <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="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="fsd">
+            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
           </parameter>
-          <parameter name="column">
-            <type name="int32" c:type="gint"/>
+          <parameter name="fontname">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_tooltip_column"
-              c:identifier="gtk_icon_view_get_tooltip_column">
+      <method name="get_preview_text"
+              c:identifier="gtk_font_selection_dialog_get_preview_text">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="fsd">
+            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
           </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">
+      <method name="set_preview_text"
+              c:identifier="gtk_font_selection_dialog_set_preview_text">
         <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 name="fsd">
+            <type name="FontSelectionDialog" c:type="GtkFontSelectionDialog*"/>
           </parameter>
-          <parameter name="vadjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
+      </method>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_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>
+    <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" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
       </callback>
-      <callback name="item_activated">
+    </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="int" c:type="gint"/>
+        </parameter>
+        <parameter name="colormap">
+          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
+        </parameter>
+        <parameter name="values">
+          <type name="Gdk.GCValues" c:type="GdkGCValues*"/>
+        </parameter>
+        <parameter name="values_mask">
+          <type name="Gdk.GCValuesMask" 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="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
+          <parameter name="type">
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="selection_changed">
+      </method>
+      <method name="get_shadow_type"
+              c:identifier="gtk_handle_box_get_shadow_type">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="ShadowType" c:type="GtkShadowType"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="select_all">
+      </method>
+      <method name="set_handle_position"
+              c:identifier="gtk_handle_box_set_handle_position">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="PositionType" c:type="GtkPositionType"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="unselect_all">
+      </method>
+      <method name="get_handle_position"
+              c:identifier="gtk_handle_box_get_handle_position">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="PositionType" c:type="GtkPositionType"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="select_cursor_item">
+      </method>
+      <method name="set_snap_edge" c:identifier="gtk_handle_box_set_snap_edge">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
+          </parameter>
+          <parameter name="edge">
+            <type name="PositionType" c:type="GtkPositionType"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="toggle_cursor_item">
+      </method>
+      <method name="get_snap_edge" c:identifier="gtk_handle_box_get_snap_edge">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="PositionType" c:type="GtkPositionType"/>
         </return-value>
         <parameters>
-          <parameter name="icon_view">
-            <type name="IconView" c:type="GtkIconView*"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="move_cursor">
+      </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" c:type="child_attached">
         <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="step">
-            <type name="MovementStep" c:type="GtkMovementStep"/>
-          </parameter>
-          <parameter name="count">
-            <type name="int32" c:type="gint"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </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="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </callback>
-      <glib:signal name="move-cursor">
+      <callback name="child_detached" c:type="child_detached">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="MovementStep" c:type="GtkMovementStep"/>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="int32" c:type="gint"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="set-scroll-adjustments">
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <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">
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="unselect-all">
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="selection-changed">
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="item-activated">
+      </callback>
+      <glib:signal name="child-attached">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="TreePath" c:type="GtkTreePath"/>
+            <type name="Widget" c:type="GtkWidget"/>
           </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">
+      <glib:signal name="child-detached">
         <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>
+        <parameters>
+          <parameter name="object">
+            <type name="Widget" c:type="GtkWidget"/>
+          </parameter>
+        </parameters>
       </glib:signal>
     </class>
-    <function name="icon_view_new" c:identifier="gtk_icon_view_new">
+    <function name="handle_box_new" c:identifier="gtk_handle_box_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">
+    <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="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_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="hbutton_box_get_spacing_default"
+              c:identifier="gtk_hbutton_box_get_spacing_default">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="int" c:type="gint"/>
       </return-value>
     </function>
-    <function name="image_menu_item_new_with_label"
-              c:identifier="gtk_image_menu_item_new_with_label">
+    <function name="hbutton_box_get_layout_default"
+              c:identifier="gtk_hbutton_box_get_layout_default">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
       </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">
+    <function name="hbutton_box_set_spacing_default"
+              c:identifier="gtk_hbutton_box_set_spacing_default">
       <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="spacing">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="image_menu_item_new_from_stock"
-              c:identifier="gtk_image_menu_item_new_from_stock">
+    <function name="hbutton_box_set_layout_default"
+              c:identifier="gtk_hbutton_box_set_layout_default">
       <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="layout">
+          <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
         </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">
+    <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="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 name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
-          <parameter name="n_seqs">
-            <type name="int32" c:type="gint"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </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">
+      <method name="add2" c:identifier="gtk_paned_add2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="IMMulticontext" c:type="GtkIMMulticontext*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
-          <parameter name="menushell">
-            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+      <method name="pack1" c:identifier="gtk_paned_pack1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <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>
+        </parameters>
+      </method>
+      <method name="pack2" c:identifier="gtk_paned_pack2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <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>
+        </parameters>
+      </method>
+      <method name="get_position" c:identifier="gtk_paned_get_position">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </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">
+        <parameters>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_position" c:identifier="gtk_paned_set_position">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="inputd">
-            <type name="InputDialog" c:type="GtkInputDialog*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
-          <parameter name="device">
-            <type name="Gdk.Device" c:type="GdkDevice*"/>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="disable_device">
+      </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="inputd">
-            <type name="InputDialog" c:type="GtkInputDialog*"/>
-          </parameter>
-          <parameter name="device">
-            <type name="Gdk.Device" c:type="GdkDevice*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
+      </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>
-      </callback>
-      <callback name="_gtk_reserved2">
+        <parameters>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="compute_position"
+              c:identifier="gtk_paned_compute_position">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
+          </parameter>
+          <parameter name="allocation">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="child1_req">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="child2_req">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="position">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="position-set">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="min-position">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="max-position">
+        <type name="int" c:type="gint"/>
+      </property>
+      <callback name="cycle_child_focus" c:type="cycle_child_focus">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
+          </parameter>
+          <parameter name="reverse">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="toggle_handle_focus" c:type="toggle_handle_focus">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <glib:signal name="enable-device">
+      <callback name="move_handle" c:type="move_handle">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Device" c:type="GdkDevice"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
+          </parameter>
+          <parameter name="scroll">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="disable-device">
+      </callback>
+      <callback name="cycle_handle_focus" c:type="cycle_handle_focus">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Device" c:type="GdkDevice"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
+          </parameter>
+          <parameter name="reverse">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </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">
+      </callback>
+      <callback name="accept_position" c:type="accept_position">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="invisible">
-            <type name="Invisible" c:type="GtkInvisible*"/>
-          </parameter>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_screen" c:identifier="gtk_invisible_get_screen">
+      </callback>
+      <callback name="cancel_position" c:type="cancel_position">
         <return-value>
-          <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="invisible">
-            <type name="Invisible" c:type="GtkInvisible*"/>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="screen">
-        <type name="Gdk.Screen" c:type="GdkScreen"/>
-      </property>
-      <callback name="_gtk_reserved1">
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_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">
+      <glib:signal name="cycle-child-focus">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </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 name="object">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="move" c:identifier="gtk_layout_move">
+      </glib:signal>
+      <glib:signal name="toggle-handle-focus">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </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">
+      </glib:signal>
+      <glib:signal name="move-handle">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </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 name="object">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_size" c:identifier="gtk_layout_get_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="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 name="object">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_hadjustment" c:identifier="gtk_layout_get_hadjustment">
+      </glib:signal>
+      <glib:signal name="accept-position">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <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>
+    <record name="PanedPrivate" c:type="GtkPanedPrivate"/>
+    <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>
+    <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="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
+          <parameter name="ruler">
+            <type name="Ruler" c:type="GtkRuler*"/>
+          </parameter>
+          <parameter name="metric">
+            <type name="MetricType" c:type="GtkMetricType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_vadjustment" c:identifier="gtk_layout_get_vadjustment">
+      <method name="set_range" c:identifier="gtk_ruler_set_range">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
+          <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>
+          <parameter name="max_size">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_hadjustment" c:identifier="gtk_layout_set_hadjustment">
+      <method name="draw_ticks" c:identifier="gtk_ruler_draw_ticks">
         <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 name="ruler">
+            <type name="Ruler" c:type="GtkRuler*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_vadjustment" c:identifier="gtk_layout_set_vadjustment">
+      <method name="draw_pos" c:identifier="gtk_ruler_draw_pos">
         <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 name="ruler">
+            <type name="Ruler" c:type="GtkRuler*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="freeze" c:identifier="gtk_layout_freeze">
+      <method name="get_metric" c:identifier="gtk_ruler_get_metric">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="MetricType" c:type="GtkMetricType"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
+          <parameter name="ruler">
+            <type name="Ruler" c:type="GtkRuler*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="thaw" c:identifier="gtk_layout_thaw">
+      <method name="get_range" c:identifier="gtk_ruler_get_range">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="layout">
-            <type name="Layout" c:type="GtkLayout*"/>
+          <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>
+          <parameter name="max_size">
+            <type name="double" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="hadjustment">
-        <type name="Adjustment" c:type="GtkAdjustment"/>
+      <property name="lower">
+        <type name="double" c:type="gdouble"/>
       </property>
-      <property name="vadjustment">
-        <type name="Adjustment" c:type="GtkAdjustment"/>
+      <property name="upper">
+        <type name="double" c:type="gdouble"/>
       </property>
-      <property name="width">
-        <type name="uint32" c:type="guint"/>
+      <property name="position">
+        <type name="double" c:type="gdouble"/>
       </property>
-      <property name="height">
-        <type name="uint32" c:type="guint"/>
+      <property name="max-size">
+        <type name="double" c:type="gdouble"/>
       </property>
-      <callback name="set_scroll_adjustments">
+      <property name="metric">
+        <type name="MetricType" c:type="GtkMetricType"/>
+      </property>
+      <callback name="draw_ticks" c:type="draw_ticks">
         <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 name="ruler">
+            <type name="Ruler" c:type="GtkRuler*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="draw_pos" c:type="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>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="set-scroll-adjustments">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <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>
+      </callback>
     </class>
-    <function name="layout_new" c:identifier="gtk_layout_new">
+    <record name="RulerMetric" 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="int" c:type="gint"/>
+      </field>
+    </record>
+    <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="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">
+    <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="link_button">
-            <type name="LinkButton" c:type="GtkLinkButton*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
+          </parameter>
+          <parameter name="digits">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_uri" c:identifier="gtk_link_button_set_uri">
+      <method name="get_digits" c:identifier="gtk_scale_get_digits">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="link_button">
-            <type name="LinkButton" c:type="GtkLinkButton*"/>
-          </parameter>
-          <parameter name="uri">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </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">
-      <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">
+      <method name="set_draw_value" c:identifier="gtk_scale_set_draw_value">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem" c:type="GtkListItem*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
+          </parameter>
+          <parameter name="draw_value">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="select_all">
+      </method>
+      <method name="get_draw_value" c:identifier="gtk_scale_get_draw_value">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem" c:type="GtkListItem*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="unselect_all">
+      </method>
+      <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="list_item">
-            <type name="GtkListItem" c:type="GtkListItem*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
+          </parameter>
+          <parameter name="pos">
+            <type name="PositionType" c:type="GtkPositionType"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="undo_selection">
+      </method>
+      <method name="get_value_pos" c:identifier="gtk_scale_get_value_pos">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="PositionType" c:type="GtkPositionType"/>
         </return-value>
         <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem" c:type="GtkListItem*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="start_selection">
+      </method>
+      <method name="get_layout" c:identifier="gtk_scale_get_layout">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Pango.Layout" c:type="PangoLayout*"/>
         </return-value>
         <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem" c:type="GtkListItem*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="end_selection">
+      </method>
+      <method name="get_layout_offsets"
+              c:identifier="gtk_scale_get_layout_offsets">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem" c:type="GtkListItem*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="extend_selection">
+      </method>
+      <property name="digits">
+        <type name="int" 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" c:type="format_value">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </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 name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
-          <parameter name="auto_start_selection">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="scroll_horizontal">
+      <callback name="draw_value" c:type="draw_value">
         <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 name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="scroll_vertical">
+      <callback name="get_layout_offsets" c:type="get_layout_offsets">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="list_item">
-            <type name="GtkListItem" c:type="GtkListItem*"/>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
           </parameter>
-          <parameter name="scroll_type">
-            <type name="ScrollType" c:type="GtkScrollType"/>
+          <parameter name="x">
+            <type name="int" c:type="gint*"/>
           </parameter>
-          <parameter name="position">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="y">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="toggle_add_mode">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <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">
-      <return-value>
-        <type name="GtkType" c:type="GtkType"/>
-      </return-value>
-    </function>
-    <function name="list_item_new" c:identifier="gtk_list_item_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <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>
-      <parameters>
-        <parameter name="label">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_item_select" c:identifier="gtk_list_item_select">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list_item">
-          <type name="GtkListItem" c:type="GtkListItem*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="list_item_deselect" c:identifier="gtk_list_item_deselect">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </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>
-    </record>
-    <record name="GtkListClass" c:type="GtkListClass">
-      <field name="parent_class">
-        <type name="GtkContainerClass" c:type="GtkContainerClass"/>
-      </field>
-      <callback name="selection_changed">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <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">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <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">
+      <glib:signal name="format-value">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchararray"/>
         </return-value>
         <parameters>
-          <parameter name="list">
-            <type name="GtkList" c:type="GtkList*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="object">
+            <type name="double" c:type="gdouble"/>
           </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">
+        </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="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="child">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="scale">
+          <type name="Scale" c:type="GtkScale*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="list_unselect_child"
-              c:identifier="gtk_list_unselect_child">
+    <function name="scale_get_value_size"
+              c:identifier="_gtk_scale_get_value_size">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
+        <parameter name="scale">
+          <type name="Scale" c:type="GtkScale*"/>
         </parameter>
-        <parameter name="child">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="width">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="list_child_position"
-              c:identifier="gtk_list_child_position">
+    <function name="scale_format_value" c:identifier="_gtk_scale_format_value">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
+        <parameter name="scale">
+          <type name="Scale" c:type="GtkScale*"/>
         </parameter>
-        <parameter name="child">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="value">
+          <type name="double" c:type="gdouble"/>
         </parameter>
       </parameters>
     </function>
-    <function name="list_set_selection_mode"
-              c:identifier="gtk_list_set_selection_mode">
+    <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="none" c:type="void"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="mode">
-          <type name="SelectionMode" c:type="GtkSelectionMode"/>
+        <parameter name="adjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="list_extend_selection"
-              c:identifier="gtk_list_extend_selection">
+    <function name="hscale_new_with_range"
+              c:identifier="gtk_hscale_new_with_range">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="scroll_type">
-          <type name="ScrollType" c:type="GtkScrollType"/>
+        <parameter name="min">
+          <type name="double" c:type="gdouble"/>
         </parameter>
-        <parameter name="position">
-          <type name="float" c:type="gfloat"/>
+        <parameter name="max">
+          <type name="double" c:type="gdouble"/>
         </parameter>
-        <parameter name="auto_start_selection">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="step">
+          <type name="double" c:type="gdouble"/>
         </parameter>
       </parameters>
     </function>
-    <function name="list_start_selection"
-              c:identifier="gtk_list_start_selection">
+    <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="none" c:type="void"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="list_end_selection" c:identifier="gtk_list_end_selection">
+    <function name="icon_factory_lookup_default"
+              c:identifier="gtk_icon_factory_lookup_default">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="IconSet" c:type="GtkIconSet*"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="list_select_all" c:identifier="gtk_list_select_all">
+    <function name="icon_size_lookup" c:identifier="gtk_icon_size_lookup">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
+        <parameter name="size">
+          <type name="IconSize" c:type="GtkIconSize"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="list_unselect_all" c:identifier="gtk_list_unselect_all">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
+        <parameter name="width">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="list_scroll_horizontal"
-              c:identifier="gtk_list_scroll_horizontal">
+    <function name="icon_size_lookup_for_settings"
+              c:identifier="gtk_icon_size_lookup_for_settings">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
+        <parameter name="settings">
+          <type name="Settings" c:type="GtkSettings*"/>
         </parameter>
-        <parameter name="scroll_type">
-          <type name="ScrollType" c:type="GtkScrollType"/>
+        <parameter name="size">
+          <type name="IconSize" c:type="GtkIconSize"/>
         </parameter>
-        <parameter name="position">
-          <type name="float" c:type="gfloat"/>
+        <parameter name="width">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="list_scroll_vertical"
-              c:identifier="gtk_list_scroll_vertical">
+    <function name="icon_size_register" c:identifier="gtk_icon_size_register">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="IconSize" c:type="GtkIconSize"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="scroll_type">
-          <type name="ScrollType" c:type="GtkScrollType"/>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="position">
-          <type name="float" c:type="gfloat"/>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="list_toggle_add_mode"
-              c:identifier="gtk_list_toggle_add_mode">
+    <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="list">
-          <type name="GtkList" c:type="GtkList*"/>
+        <parameter name="alias">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="list_toggle_focus_row"
-              c:identifier="gtk_list_toggle_focus_row">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
+        <parameter name="target">
+          <type name="IconSize" c:type="GtkIconSize"/>
         </parameter>
       </parameters>
     </function>
-    <function name="list_toggle_row" c:identifier="gtk_list_toggle_row">
+    <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="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-        <parameter name="item">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="list_undo_selection"
-              c:identifier="gtk_list_undo_selection">
+    <function name="icon_size_get_name" c:identifier="gtk_icon_size_get_name">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
+        <parameter name="size">
+          <type name="IconSize" c:type="GtkIconSize"/>
         </parameter>
       </parameters>
     </function>
-    <function name="list_end_drag_selection"
-              c:identifier="gtk_list_end_drag_selection">
+    <function name="icon_set_invalidate_caches"
+              c:identifier="_gtk_icon_set_invalidate_caches">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
-      <parameters>
-        <parameter name="list">
-          <type name="GtkList" c:type="GtkList*"/>
-        </parameter>
-      </parameters>
     </function>
-    <callback name="GtkKeySnoopFunc">
+    <function name="icon_factory_list_ids"
+              c:identifier="_gtk_icon_factory_list_ids">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="GLib.List" c:type="GList*"/>
       </return-value>
-      <parameters>
-        <parameter name="grab_widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="event">
-          <type name="Gdk.GdkEventKey" c:type="GdkEventKey*"/>
-        </parameter>
-        <parameter name="func_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <function name="check_version" c:identifier="gtk_check_version">
+    </function>
+    <function name="icon_factory_ensure_default_icons"
+              c:identifier="_gtk_icon_factory_ensure_default_icons">
       <return-value>
-        <type name="string" c:type="gchar*"/>
+        <type name="none" c:type="void"/>
       </return-value>
-      <parameters>
-        <parameter name="required_major">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="required_minor">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="required_micro">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="parse_args" c:identifier="gtk_parse_args">
+    <glib:boxed c:type="GtkIconInfo"
+                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="int" 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="Pixbuf.Pixbuf" 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="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_info">
+            <type name="IconInfo" c:type="GtkIconInfo*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" 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="Gdk.Rectangle" 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.Point" c:type="GdkPoint**"/>
+          </parameter>
+          <parameter name="n_points">
+            <type name="int" 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>
+    <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">
+        <return-value>
+          <type name="IconTheme" c:type="GtkIconTheme*"/>
+        </return-value>
+        <parameters>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          </parameter>
+        </parameters>
+      </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="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          </parameter>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_search_path"
+              c:identifier="gtk_icon_theme_set_search_path">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <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="int" 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>
+        <parameters>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="GLib.char" c:type="gchar**"/>
+          </parameter>
+          <parameter name="n_elements">
+            <type name="int" 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="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="prepend_search_path"
+              c:identifier="gtk_icon_theme_prepend_search_path">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <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_custom_theme"
+              c:identifier="gtk_icon_theme_set_custom_theme">
+        <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>
+        </parameters>
+      </method>
+      <method name="has_icon" c:identifier="gtk_icon_theme_has_icon">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </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>
+        </parameters>
+      </method>
+      <method name="get_icon_sizes"
+              c:identifier="gtk_icon_theme_get_icon_sizes">
+        <return-value>
+          <type name="int" c:type="gint*"/>
+        </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>
+        </parameters>
+      </method>
+      <method name="lookup_icon" c:identifier="gtk_icon_theme_lookup_icon">
+        <return-value>
+          <type name="IconInfo" c:type="GtkIconInfo*"/>
+        </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>
+          <parameter name="size">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="IconLookupFlags" c:type="GtkIconLookupFlags"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="choose_icon" c:identifier="gtk_icon_theme_choose_icon">
+        <return-value>
+          <type name="IconInfo" c:type="GtkIconInfo*"/>
+        </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>
+          <parameter name="size">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="IconLookupFlags" c:type="GtkIconLookupFlags"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="load_icon" c:identifier="gtk_icon_theme_load_icon">
+        <return-value>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+        </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>
+          <parameter name="size">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="flags">
+            <type name="IconLookupFlags" c:type="GtkIconLookupFlags"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="list_icons" c:identifier="gtk_icon_theme_list_icons">
+        <return-value>
+          <type name="GLib.List" c:type="GList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="list_contexts" c:identifier="gtk_icon_theme_list_contexts">
+        <return-value>
+          <type name="GLib.List" c:type="GList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_theme">
+            <type name="IconTheme" c:type="GtkIconTheme*"/>
+          </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>
+        </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>
+        </parameters>
+      </method>
+      <callback name="changed" c:type="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>
+      <glib:signal name="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <record name="IconThemePrivate" c:type="GtkIconThemePrivate"/>
+    <function name="icon_theme_error_quark"
+              c:identifier="gtk_icon_theme_error_quark">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="GLib.Quark" c:type="GQuark"/>
       </return-value>
-      <parameters>
-        <parameter name="argc">
-          <type name="int" c:type="int*"/>
-        </parameter>
-        <parameter name="argv">
-          <type name="char" c:type="char***"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="init" c:identifier="gtk_init">
+    <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="argc">
-          <type name="int" c:type="int*"/>
-        </parameter>
-        <parameter name="argv">
-          <type name="char" c:type="char***"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="init_check" c:identifier="gtk_init_check">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="argc">
-          <type name="int" c:type="int*"/>
-        </parameter>
-        <parameter name="argv">
-          <type name="char" c:type="char***"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="init_with_args" c:identifier="gtk_init_with_args">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="argc">
-          <type name="int" c:type="int*"/>
-        </parameter>
-        <parameter name="argv">
-          <type name="char" c:type="char***"/>
-        </parameter>
-        <parameter name="parameter_string">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="entries">
-          <type name="GLib.GOptionEntry" c:type="GOptionEntry*"/>
-        </parameter>
-        <parameter name="translation_domain">
-          <type name="string" c:type="char*"/>
-        </parameter>
-        <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+        <parameter name="icon_name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="get_option_group" c:identifier="gtk_get_option_group">
-      <return-value>
-        <type name="GOptionGroup" c:type="GOptionGroup*"/>
-      </return-value>
-      <parameters>
-        <parameter name="open_default_display">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="size">
+          <type name="int" c:type="gint"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="exit" c:identifier="gtk_exit">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="error_code">
-          <type name="int32" c:type="gint"/>
+        <parameter name="pixbuf">
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="disable_setlocale" c:identifier="gtk_disable_setlocale">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="set_locale" c:identifier="gtk_set_locale">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-    </function>
-    <function name="get_default_language"
-              c:identifier="gtk_get_default_language">
-      <return-value>
-        <type name="PangoLanguage" c:type="PangoLanguage*"/>
-      </return-value>
-    </function>
-    <function name="events_pending" c:identifier="gtk_events_pending">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-    </function>
-    <function name="main_do_event" c:identifier="gtk_main_do_event">
+    <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="event">
-          <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
+        <parameter name="display">
+          <type name="Gdk.Display" c:type="GdkDisplay*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="main" c:identifier="gtk_main">
+    <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>
-    <function name="main_level" c:identifier="gtk_main_level">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-    </function>
-    <function name="main_quit" c:identifier="gtk_main_quit">
+    <function name="tooltip_trigger_tooltip_query"
+              c:identifier="gtk_tooltip_trigger_tooltip_query">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
-    </function>
-    <function name="main_iteration" c:identifier="gtk_main_iteration">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-    </function>
-    <function name="main_iteration_do" c:identifier="gtk_main_iteration_do">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
       <parameters>
-        <parameter name="blocking">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="display">
+          <type name="Gdk.Display" c:type="GdkDisplay*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="true" c:identifier="gtk_true">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-    </function>
-    <function name="false" c:identifier="gtk_false">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-    </function>
-    <function name="grab_add" c:identifier="gtk_grab_add">
+    <function name="tooltip_focus_in" c:identifier="_gtk_tooltip_focus_in">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -46741,12 +46335,7 @@
         </parameter>
       </parameters>
     </function>
-    <function name="grab_get_current" c:identifier="gtk_grab_get_current">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="grab_remove" c:identifier="gtk_grab_remove">
+    <function name="tooltip_focus_out" c:identifier="_gtk_tooltip_focus_out">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -46756,303 +46345,29 @@
         </parameter>
       </parameters>
     </function>
-    <function name="init_add" c:identifier="gtk_init_add">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="function">
-          <type name="GtkFunction" c:type="GtkFunction"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="quit_add_destroy" c:identifier="gtk_quit_add_destroy">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="main_level">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="object">
-          <type name="GtkObject" c:type="GtkObject*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="quit_add" c:identifier="gtk_quit_add">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="main_level">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="function">
-          <type name="GtkFunction" c:type="GtkFunction"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="quit_add_full" c:identifier="gtk_quit_add_full">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="main_level">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="function">
-          <type name="GtkFunction" c:type="GtkFunction"/>
-        </parameter>
-        <parameter name="marshal">
-          <type name="GtkCallbackMarshal" c:type="GtkCallbackMarshal"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="destroy">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="quit_remove" c:identifier="gtk_quit_remove">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="quit_handler_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="quit_remove_by_data"
-              c:identifier="gtk_quit_remove_by_data">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="timeout_add" c:identifier="gtk_timeout_add">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="interval">
-          <type name="uint32" c:type="guint32"/>
-        </parameter>
-        <parameter name="function">
-          <type name="GtkFunction" c:type="GtkFunction"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="timeout_add_full" c:identifier="gtk_timeout_add_full">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="interval">
-          <type name="uint32" c:type="guint32"/>
-        </parameter>
-        <parameter name="function">
-          <type name="GtkFunction" c:type="GtkFunction"/>
-        </parameter>
-        <parameter name="marshal">
-          <type name="GtkCallbackMarshal" c:type="GtkCallbackMarshal"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="destroy">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="timeout_remove" c:identifier="gtk_timeout_remove">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="timeout_handler_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="idle_add" c:identifier="gtk_idle_add">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="function">
-          <type name="GtkFunction" c:type="GtkFunction"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="idle_add_priority" c:identifier="gtk_idle_add_priority">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="priority">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="function">
-          <type name="GtkFunction" c:type="GtkFunction"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="idle_add_full" c:identifier="gtk_idle_add_full">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="priority">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="function">
-          <type name="GtkFunction" c:type="GtkFunction"/>
-        </parameter>
-        <parameter name="marshal">
-          <type name="GtkCallbackMarshal" c:type="GtkCallbackMarshal"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="destroy">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="idle_remove" c:identifier="gtk_idle_remove">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="idle_handler_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="idle_remove_by_data"
-              c:identifier="gtk_idle_remove_by_data">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="input_add_full" c:identifier="gtk_input_add_full">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="source">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="condition">
-          <type name="GdkInputCondition" c:type="GdkInputCondition"/>
-        </parameter>
-        <parameter name="function">
-          <type name="Gdk.GdkInputFunction" c:type="GdkInputFunction"/>
-        </parameter>
-        <parameter name="marshal">
-          <type name="GtkCallbackMarshal" c:type="GtkCallbackMarshal"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="destroy">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="input_remove" c:identifier="gtk_input_remove">
+    <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="input_handler_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="key_snooper_install"
-              c:identifier="gtk_key_snooper_install">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="snooper">
-          <type name="GtkKeySnoopFunc" c:type="GtkKeySnoopFunc"/>
-        </parameter>
-        <parameter name="func_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="key_snooper_remove" c:identifier="gtk_key_snooper_remove">
+    <function name="tooltip_handle_event"
+              c:identifier="_gtk_tooltip_handle_event">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="snooper_handler_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="get_current_event" c:identifier="gtk_get_current_event">
-      <return-value>
-        <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
-      </return-value>
-    </function>
-    <function name="get_current_event_time"
-              c:identifier="gtk_get_current_event_time">
-      <return-value>
-        <type name="uint32" c:type="guint32"/>
-      </return-value>
-    </function>
-    <function name="get_current_event_state"
-              c:identifier="gtk_get_current_event_state">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="state">
-          <type name="GdkModifierType" c:type="GdkModifierType*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="get_event_widget" c:identifier="gtk_get_event_widget">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
         <parameter name="event">
-          <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
+          <type name="Gdk.Event" c:type="GdkEvent*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="propagate_event" c:identifier="gtk_propagate_event">
+    <function name="tooltip_hide" c:identifier="_gtk_tooltip_hide">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -47060,12756 +46375,13882 @@
         <parameter name="widget">
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
-        <parameter name="event">
-          <type name="Gdk.GdkEvent" c:type="GdkEvent*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="boolean_handled_accumulator"
-              c:identifier="_gtk_boolean_handled_accumulator">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="ihint">
-          <type name="GObject.GSignalInvocationHint"
-                c:type="GSignalInvocationHint*"/>
-        </parameter>
-        <parameter name="return_accu">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="handler_return">
-          <type name="GObject.GValue" c:type="GValue*"/>
-        </parameter>
-        <parameter name="dummy">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="get_lc_ctype" c:identifier="_gtk_get_lc_ctype">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-    </function>
-    <class name="MenuBar"
-           c:type="GtkMenuBar"
-           parent="MenuShell"
-           glib:type-name="GtkMenuBar"
-           glib:get-type="gtk_menu_bar_get_type">
-      <method name="get_pack_direction"
-              c:identifier="gtk_menu_bar_get_pack_direction">
+    <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="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <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>
+      </method>
+      <method name="get_model" c:identifier="gtk_icon_view_get_model">
+        <return-value>
+          <type name="TreeModel" c:type="GtkTreeModel*"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_text_column"
+              c:identifier="gtk_icon_view_set_text_column">
+        <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">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_text_column"
+              c:identifier="gtk_icon_view_get_text_column">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_markup_column"
+              c:identifier="gtk_icon_view_set_markup_column">
         <return-value>
-          <type name="PackDirection" c:type="GtkPackDirection"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menubar">
-            <type name="MenuBar" c:type="GtkMenuBar*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_pack_direction"
-              c:identifier="gtk_menu_bar_set_pack_direction">
+      <method name="get_markup_column"
+              c:identifier="gtk_icon_view_get_markup_column">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </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">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menubar">
-            <type name="MenuBar" c:type="GtkMenuBar*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="pack_dir">
-            <type name="PackDirection" c:type="GtkPackDirection"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_child_pack_direction"
-              c:identifier="gtk_menu_bar_get_child_pack_direction">
+      <method name="get_pixbuf_column"
+              c:identifier="gtk_icon_view_get_pixbuf_column">
         <return-value>
-          <type name="PackDirection" c:type="GtkPackDirection"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="menubar">
-            <type name="MenuBar" c:type="GtkMenuBar*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_child_pack_direction"
-              c:identifier="gtk_menu_bar_set_child_pack_direction">
+      <method name="set_orientation"
+              c:identifier="gtk_icon_view_set_orientation">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menubar">
-            <type name="MenuBar" c:type="GtkMenuBar*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="child_pack_dir">
-            <type name="PackDirection" c:type="GtkPackDirection"/>
+          <parameter name="orientation">
+            <type name="Orientation" c:type="GtkOrientation"/>
           </parameter>
         </parameters>
       </method>
-      <property name="pack-direction">
-        <type name="PackDirection" c:type="GtkPackDirection"/>
-      </property>
-      <property name="child-pack-direction">
-        <type name="PackDirection" c:type="GtkPackDirection"/>
-      </property>
-      <callback name="_gtk_reserved1">
+      <method name="get_orientation"
+              c:identifier="gtk_icon_view_get_orientation">
+        <return-value>
+          <type name="Orientation" c:type="GtkOrientation"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_columns" c:identifier="gtk_icon_view_set_columns">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="columns">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_columns" c:identifier="gtk_icon_view_get_columns">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_item_width"
+              c:identifier="gtk_icon_view_set_item_width">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="item_width">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_item_width"
+              c:identifier="gtk_icon_view_get_item_width">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_spacing" c:identifier="gtk_icon_view_set_spacing">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="spacing">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_spacing" c:identifier="gtk_icon_view_get_spacing">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_row_spacing"
+              c:identifier="gtk_icon_view_set_row_spacing">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-    </class>
-    <function name="menu_bar_new" c:identifier="gtk_menu_bar_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="menu_bar_cycle_focus"
-              c:identifier="_gtk_menu_bar_cycle_focus">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="menubar">
-          <type name="MenuBar" c:type="GtkMenuBar*"/>
-        </parameter>
-        <parameter name="dir">
-          <type name="DirectionType" c:type="GtkDirectionType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkTooltipsData" c:type="GtkTooltipsData">
-      <field name="tooltips">
-        <type name="Tooltips" c:type="GtkTooltips*"/>
-      </field>
-      <field name="widget">
-        <type name="Widget" c:type="GtkWidget*"/>
-      </field>
-      <field name="tip_text">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="tip_private">
-        <type name="string" c:type="gchar*"/>
-      </field>
-    </record>
-    <class name="Tooltips"
-           c:type="GtkTooltips"
-           parent="GtkObject"
-           glib:type-name="GtkTooltips"
-           glib:get-type="gtk_tooltips_get_type">
-      <constructor name="new" c:identifier="gtk_tooltips_new">
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="row_spacing">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_row_spacing"
+              c:identifier="gtk_icon_view_get_row_spacing">
         <return-value>
-          <type name="Tooltips" c:type="GtkTooltips*"/>
+          <type name="int" c:type="gint"/>
         </return-value>
-      </constructor>
-      <method name="enable" c:identifier="gtk_tooltips_enable">
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_column_spacing"
+              c:identifier="gtk_icon_view_set_column_spacing">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tooltips">
-            <type name="Tooltips" c:type="GtkTooltips*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="column_spacing">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="disable" c:identifier="gtk_tooltips_disable">
+      <method name="get_column_spacing"
+              c:identifier="gtk_icon_view_get_column_spacing">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_margin" c:identifier="gtk_icon_view_set_margin">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tooltips">
-            <type name="Tooltips" c:type="GtkTooltips*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="margin">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_delay" c:identifier="gtk_tooltips_set_delay">
+      <method name="get_margin" c:identifier="gtk_icon_view_get_margin">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_path_at_pos"
+              c:identifier="gtk_icon_view_get_path_at_pos">
+        <return-value>
+          <type name="TreePath" c:type="GtkTreePath*"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_item_at_pos"
+              c:identifier="gtk_icon_view_get_item_at_pos">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" 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">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <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="selected_foreach"
+              c:identifier="gtk_icon_view_selected_foreach">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tooltips">
-            <type name="Tooltips" c:type="GtkTooltips*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="delay">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="func">
+            <type name="IconViewForeachFunc" c:type="GtkIconViewForeachFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tip" c:identifier="gtk_tooltips_set_tip">
+      <method name="set_selection_mode"
+              c:identifier="gtk_icon_view_set_selection_mode">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tooltips">
-            <type name="Tooltips" c:type="GtkTooltips*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="mode">
+            <type name="SelectionMode" c:type="GtkSelectionMode"/>
           </parameter>
-          <parameter name="tip_text" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+        </parameters>
+      </method>
+      <method name="get_selection_mode"
+              c:identifier="gtk_icon_view_get_selection_mode">
+        <return-value>
+          <type name="SelectionMode" c:type="GtkSelectionMode"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="tip_private" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+        </parameters>
+      </method>
+      <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_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="force_window" c:identifier="gtk_tooltips_force_window">
+      <method name="unselect_path" c:identifier="gtk_icon_view_unselect_path">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tooltips">
-            <type name="Tooltips" c:type="GtkTooltips*"/>
+          <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="path_is_selected"
+              c:identifier="gtk_icon_view_path_is_selected">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </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="get_selected_items"
+              c:identifier="gtk_icon_view_get_selected_items">
+        <return-value>
+          <type name="GLib.List" c:type="GList*"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <callback name="_gtk_reserved1">
+      <method name="select_all" c:identifier="gtk_icon_view_select_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unselect_all" c:identifier="gtk_icon_view_unselect_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <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">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <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">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-    </class>
-    <function name="tooltips_data_get" c:identifier="gtk_tooltips_data_get">
-      <return-value>
-        <type name="GtkTooltipsData" c:type="GtkTooltipsData*"/>
-      </return-value>
-      <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tooltips_get_info_from_tip_window"
-              c:identifier="gtk_tooltips_get_info_from_tip_window">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="tip_window">
-          <type name="Window" c:type="GtkWindow*"/>
-        </parameter>
-        <parameter name="tooltips">
-          <type name="Tooltips" c:type="GtkTooltips**"/>
-        </parameter>
-        <parameter name="current_widget">
-          <type name="Widget" c:type="GtkWidget**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkToolItemPrivate" c:type="GtkToolItemPrivate"/>
-    <class name="ToolItem"
-           c:type="GtkToolItem"
-           parent="Bin"
-           glib:type-name="GtkToolItem"
-           glib:get-type="gtk_tool_item_get_type">
-      <constructor name="new" c:identifier="gtk_tool_item_new">
+        <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">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </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">
+        <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>
+          <parameter name="col_align">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="enable_model_drag_source"
+              c:identifier="gtk_icon_view_enable_model_drag_source">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="start_button_mask">
+            <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+          </parameter>
+          <parameter name="targets">
+            <type name="TargetEntry" c:type="GtkTargetEntry*"/>
+          </parameter>
+          <parameter name="n_targets">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="actions">
+            <type name="Gdk.DragAction" c:type="GdkDragAction"/>
+          </parameter>
+        </parameters>
+      </method>
+      <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_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="targets">
+            <type name="TargetEntry" c:type="GtkTargetEntry*"/>
+          </parameter>
+          <parameter name="n_targets">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="actions">
+            <type name="Gdk.DragAction" c:type="GdkDragAction"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="unset_model_drag_source"
+              c:identifier="gtk_icon_view_unset_model_drag_source">
         <return-value>
-          <type name="ToolItem" c:type="GtkToolItem*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </constructor>
-      <method name="set_homogeneous"
-              c:identifier="gtk_tool_item_set_homogeneous">
+        <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">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="homogeneous">
+        </parameters>
+      </method>
+      <method name="set_reorderable"
+              c:identifier="gtk_icon_view_set_reorderable">
+        <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_homogeneous"
-              c:identifier="gtk_tool_item_get_homogeneous">
+      <method name="get_reorderable"
+              c:identifier="gtk_icon_view_get_reorderable">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_expand" c:identifier="gtk_tool_item_set_expand">
+      <method name="set_drag_dest_item"
+              c:identifier="gtk_icon_view_set_drag_dest_item">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="expand">
-            <type name="boolean" c:type="gboolean"/>
+          <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="get_expand" c:identifier="gtk_tool_item_get_expand">
+      <method name="get_drag_dest_item"
+              c:identifier="gtk_icon_view_get_drag_dest_item">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <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>
         </parameters>
       </method>
-      <method name="set_tooltip" c:identifier="gtk_tool_item_set_tooltip">
+      <method name="get_dest_item_at_pos"
+              c:identifier="gtk_icon_view_get_dest_item_at_pos">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="tooltips">
-            <type name="Tooltips" c:type="GtkTooltips*"/>
+          <parameter name="drag_x">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="tip_text" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="drag_y">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="tip_private" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
+          </parameter>
+          <parameter name="pos">
+            <type name="IconViewDropPosition"
+                  c:type="GtkIconViewDropPosition*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tooltip_text"
-              c:identifier="gtk_tool_item_set_tooltip_text">
+      <method name="create_drag_icon"
+              c:identifier="gtk_icon_view_create_drag_icon">
+        <return-value>
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+        </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="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="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="wx">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="wy">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="bx">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="by">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tooltip_markup"
-              c:identifier="gtk_tool_item_set_tooltip_markup">
+      <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="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="markup">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_use_drag_window"
-              c:identifier="gtk_tool_item_set_use_drag_window">
+      <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="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="use_drag_window">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
+          </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_use_drag_window"
-              c:identifier="gtk_tool_item_get_use_drag_window">
+      <method name="get_tooltip_context"
+              c:identifier="gtk_icon_view_get_tooltip_context">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" 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>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath**"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_visible_horizontal"
-              c:identifier="gtk_tool_item_set_visible_horizontal">
+      <method name="set_tooltip_column"
+              c:identifier="gtk_icon_view_set_tooltip_column">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="visible_horizontal">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_visible_horizontal"
-              c:identifier="gtk_tool_item_get_visible_horizontal">
+      <method name="get_tooltip_column"
+              c:identifier="gtk_icon_view_get_tooltip_column">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_visible_vertical"
-              c:identifier="gtk_tool_item_set_visible_vertical">
+      <property name="pixbuf-column">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="text-column">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="markup-column">
+        <type name="int" 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="int" c:type="gint"/>
+      </property>
+      <property name="item-width">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="spacing">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="row-spacing">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="column-spacing">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="margin">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="reorderable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="tooltip-column">
+        <type name="int" c:type="gint"/>
+      </property>
+      <callback name="set_scroll_adjustments" c:type="set_scroll_adjustments">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
-          <parameter name="visible_vertical">
-            <type name="boolean" c:type="gboolean"/>
+          <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_visible_vertical"
-              c:identifier="gtk_tool_item_get_visible_vertical">
+      </callback>
+      <callback name="item_activated" c:type="item_activated">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <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="get_is_important"
-              c:identifier="gtk_tool_item_get_is_important">
+      </callback>
+      <callback name="selection_changed" c:type="selection_changed">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_is_important"
-              c:identifier="gtk_tool_item_set_is_important">
+      </callback>
+      <callback name="select_all" c:type="select_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
-          </parameter>
-          <parameter name="is_important">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_icon_size" c:identifier="gtk_tool_item_get_icon_size">
+      </callback>
+      <callback name="unselect_all" c:type="unselect_all">
         <return-value>
-          <type name="IconSize" c:type="GtkIconSize"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_orientation"
-              c:identifier="gtk_tool_item_get_orientation">
+      </callback>
+      <callback name="select_cursor_item" c:type="select_cursor_item">
         <return-value>
-          <type name="Orientation" c:type="GtkOrientation"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_toolbar_style"
-              c:identifier="gtk_tool_item_get_toolbar_style">
+      </callback>
+      <callback name="toggle_cursor_item" c:type="toggle_cursor_item">
         <return-value>
-          <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_relief_style"
-              c:identifier="gtk_tool_item_get_relief_style">
+      </callback>
+      <callback name="move_cursor" c:type="move_cursor">
         <return-value>
-          <type name="ReliefStyle" c:type="GtkReliefStyle"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <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="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="retrieve_proxy_menu_item"
-              c:identifier="gtk_tool_item_retrieve_proxy_menu_item">
+      </callback>
+      <callback name="activate_cursor_item" c:type="activate_cursor_item">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_proxy_menu_item"
-              c:identifier="gtk_tool_item_get_proxy_menu_item">
+      </callback>
+      <glib:signal name="move-cursor">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="object">
+            <type name="MovementStep" c:type="GtkMovementStep"/>
           </parameter>
-          <parameter name="menu_item_id">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_proxy_menu_item"
-              c:identifier="gtk_tool_item_set_proxy_menu_item">
+      </glib:signal>
+      <glib:signal name="set-scroll-adjustments">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="object">
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
-          <parameter name="menu_item_id">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="p0">
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
-          <parameter name="menu_item" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
+        </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>
-      </method>
-      <method name="rebuild_menu" c:identifier="gtk_tool_item_rebuild_menu">
+      </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>
+    <record name="IconViewPrivate" c:type="GtkIconViewPrivate"/>
+    <callback name="IconViewForeachFunc" c:type="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>
+    <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="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <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>
-      <property name="visible-horizontal">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="visible-vertical">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="is-important">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="create_menu_proxy">
+      <method name="get_image" c:identifier="gtk_image_menu_item_get_image">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="image_menu_item">
+            <type name="ImageMenuItem" c:type="GtkImageMenuItem*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="toolbar_reconfigured">
+      </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">
+      <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="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
+          <parameter name="context_simple">
+            <type name="IMContextSimple" c:type="GtkIMContextSimple*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="uint16" c:type="guint16*"/>
+          </parameter>
+          <parameter name="max_seq_len">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="n_seqs">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_tooltip">
+      </method>
+    </class>
+    <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="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tool_item">
-            <type name="ToolItem" c:type="GtkToolItem*"/>
-          </parameter>
-          <parameter name="tooltips">
-            <type name="Tooltips" c:type="GtkTooltips*"/>
-          </parameter>
-          <parameter name="tip_text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="context">
+            <type name="IMMulticontext" c:type="GtkIMMulticontext*"/>
           </parameter>
-          <parameter name="tip_private">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="menushell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
+      </method>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="create-menu-proxy">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="toolbar-reconfigured">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="set-tooltip">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="Tooltips" c:type="GtkTooltips"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="string" c:type="gchararray"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="string" c:type="gchararray"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
     </class>
-    <function name="tool_item_toolbar_reconfigured"
-              c:identifier="_gtk_tool_item_toolbar_reconfigured">
+    <record name="IMMulticontextPrivate" c:type="GtkIMMulticontextPrivate"/>
+    <function name="im_multicontext_new"
+              c:identifier="gtk_im_multicontext_new">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="IMContext" c:type="GtkIMContext*"/>
       </return-value>
-      <parameters>
-        <parameter name="tool_item">
-          <type name="ToolItem" c:type="GtkToolItem*"/>
-        </parameter>
-      </parameters>
     </function>
-    <record name="GtkToolButtonPrivate" c:type="GtkToolButtonPrivate"/>
-    <class name="ToolButton"
-           c:type="GtkToolButton"
-           parent="ToolItem"
-           glib:type-name="GtkToolButton"
-           glib:get-type="gtk_tool_button_get_type">
-      <method name="set_label" c:identifier="gtk_tool_button_set_label">
+    <class name="InputDialog"
+           c:type="GtkInputDialog"
+           parent="Dialog"
+           glib:type-name="GtkInputDialog"
+           glib:get-type="gtk_input_dialog_get_type">
+      <callback name="enable_device" c:type="enable_device">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
-          </parameter>
-          <parameter name="label" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="inputd">
+            <type name="InputDialog" c:type="GtkInputDialog*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_label" c:identifier="gtk_tool_button_get_label">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
+          <parameter name="device">
+            <type name="Gdk.Device" c:type="GdkDevice*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_use_underline"
-              c:identifier="gtk_tool_button_set_use_underline">
+      </callback>
+      <callback name="disable_device" c:type="disable_device">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
-          </parameter>
-          <parameter name="use_underline">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="inputd">
+            <type name="InputDialog" c:type="GtkInputDialog*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_use_underline"
-              c:identifier="gtk_tool_button_get_use_underline">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
+          <parameter name="device">
+            <type name="Gdk.Device" c:type="GdkDevice*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_stock_id" c:identifier="gtk_tool_button_set_stock_id">
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
-          </parameter>
-          <parameter name="stock_id" allow-none="1">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_stock_id" c:identifier="gtk_tool_button_get_stock_id">
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_icon_name"
-              c:identifier="gtk_tool_button_set_icon_name">
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
-          </parameter>
-          <parameter name="icon_name" allow-none="1">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_icon_name"
-              c:identifier="gtk_tool_button_get_icon_name">
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_icon_widget"
-              c:identifier="gtk_tool_button_set_icon_widget">
+      </callback>
+      <glib:signal name="enable-device">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
-          </parameter>
-          <parameter name="icon_widget" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="object">
+            <type name="Gdk.Device" c:type="GdkDevice"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_icon_widget"
-              c:identifier="gtk_tool_button_get_icon_widget">
+      </glib:signal>
+      <glib:signal name="disable-device">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
+          <parameter name="object">
+            <type name="Gdk.Device" c:type="GdkDevice"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_label_widget"
-              c:identifier="gtk_tool_button_set_label_widget">
+      </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="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
+          <parameter name="invisible">
+            <type name="Invisible" c:type="GtkInvisible*"/>
           </parameter>
-          <parameter name="label_widget" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_label_widget"
-              c:identifier="gtk_tool_button_get_label_widget">
+      <method name="get_screen" c:identifier="gtk_invisible_get_screen">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="Gdk.Screen" c:type="GdkScreen*"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
+          <parameter name="invisible">
+            <type name="Invisible" c:type="GtkInvisible*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="label">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="use-underline">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="label-widget">
-        <type name="Widget" c:type="GtkWidget"/>
-      </property>
-      <property name="stock-id">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="icon-name">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="icon-widget">
-        <type name="Widget" c:type="GtkWidget"/>
+      <property name="screen">
+        <type name="Gdk.Screen" c:type="GdkScreen"/>
       </property>
-      <field name="button_type">
-        <type name="GObject.GType" c:type="GType"/>
-      </field>
-      <callback name="clicked">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="tool_item">
-            <type name="ToolButton" c:type="GtkToolButton*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="clicked">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
     </class>
-    <function name="tool_button_new" c:identifier="gtk_tool_button_new">
-      <return-value>
-        <type name="ToolItem" c:type="GtkToolItem*"/>
-      </return-value>
-      <parameters>
-        <parameter name="icon_widget" allow-none="1">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="label" allow-none="1">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="tool_button_new_from_stock"
-              c:identifier="gtk_tool_button_new_from_stock">
+    <function name="invisible_new" c:identifier="gtk_invisible_new">
       <return-value>
-        <type name="ToolItem" c:type="GtkToolItem*"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
-      <parameters>
-        <parameter name="stock_id">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
     </function>
-    <function name="tool_button_get_button"
-              c:identifier="_gtk_tool_button_get_button">
+    <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="button">
-          <type name="ToolButton" c:type="GtkToolButton*"/>
+        <parameter name="screen">
+          <type name="Gdk.Screen" c:type="GdkScreen*"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkMenuToolButtonPrivate" c:type="GtkMenuToolButtonPrivate"/>
-    <class name="MenuToolButton"
-           c:type="GtkMenuToolButton"
-           parent="ToolButton"
-           glib:type-name="GtkMenuToolButton"
-           glib:get-type="gtk_menu_tool_button_get_type">
-      <method name="set_menu" c:identifier="gtk_menu_tool_button_set_menu">
+    <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="button">
-            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
-          <parameter name="menu">
+          <parameter name="child_widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="get_menu" c:identifier="gtk_menu_tool_button_get_menu">
+      <method name="move" c:identifier="gtk_layout_move">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
+          <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="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_arrow_tooltip"
-              c:identifier="gtk_menu_tool_button_set_arrow_tooltip">
+      <method name="set_size" c:identifier="gtk_layout_set_size">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
-          <parameter name="tooltips">
-            <type name="Tooltips" c:type="GtkTooltips*"/>
+          <parameter name="width">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="tip_text" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="height">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="tip_private" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+        </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="uint" c:type="guint*"/>
+          </parameter>
+          <parameter name="height">
+            <type name="uint" c:type="guint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_arrow_tooltip_text"
-              c:identifier="gtk_menu_tool_button_set_arrow_tooltip_text">
+      <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="button">
-            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="adjustment" allow-none="1">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_arrow_tooltip_markup"
-              c:identifier="gtk_menu_tool_button_set_arrow_tooltip_markup">
+      <method name="set_vadjustment" c:identifier="gtk_layout_set_vadjustment">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
-          <parameter name="markup">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="adjustment" allow-none="1">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="menu">
-        <type name="Menu" c:type="GtkMenu"/>
-      </property>
-      <callback name="show_menu">
+      <method name="freeze" c:identifier="gtk_layout_freeze">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
+          <parameter name="layout">
+            <type name="Layout" c:type="GtkLayout*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="_gtk_reserved1">
+      </method>
+      <method name="thaw" c:identifier="gtk_layout_thaw">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+        <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="uint" c:type="guint"/>
+      </property>
+      <property name="height">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <callback name="set_scroll_adjustments" c:type="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_reserved3">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="show-menu">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-    </class>
-    <function name="menu_tool_button_new"
-              c:identifier="gtk_menu_tool_button_new">
-      <return-value>
-        <type name="ToolItem" c:type="GtkToolItem*"/>
-      </return-value>
-      <parameters>
-        <parameter name="icon_widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="label">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="menu_tool_button_new_from_stock"
-              c:identifier="gtk_menu_tool_button_new_from_stock">
-      <return-value>
-        <type name="ToolItem" c:type="GtkToolItem*"/>
-      </return-value>
-      <parameters>
-        <parameter name="stock_id">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="MessageDialog"
-           c:type="GtkMessageDialog"
-           parent="Dialog"
-           glib:type-name="GtkMessageDialog"
-           glib:get-type="gtk_message_dialog_get_type">
-      <method name="set_image" c:identifier="gtk_message_dialog_set_image">
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="dialog">
-            <type name="MessageDialog" c:type="GtkMessageDialog*"/>
-          </parameter>
-          <parameter name="image">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_markup" c:identifier="gtk_message_dialog_set_markup">
+      </callback>
+      <glib:signal name="set-scroll-adjustments">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="message_dialog">
-            <type name="MessageDialog" c:type="GtkMessageDialog*"/>
-          </parameter>
-          <parameter name="str">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="object">
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="format_secondary_text"
-              c:identifier="gtk_message_dialog_format_secondary_text">
+          <parameter name="p0">
+            <type name="Adjustment" c:type="GtkAdjustment"/>
+          </parameter>
+        </parameters>
+      </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>
+    <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="message_dialog">
-            <type name="MessageDialog" c:type="GtkMessageDialog*"/>
-          </parameter>
-          <parameter name="message_format">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="link_button">
+            <type name="LinkButton" c:type="GtkLinkButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="format_secondary_markup"
-              c:identifier="gtk_message_dialog_format_secondary_markup">
+      <method name="set_uri" c:identifier="gtk_link_button_set_uri">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="message_dialog">
-            <type name="MessageDialog" c:type="GtkMessageDialog*"/>
+          <parameter name="link_button">
+            <type name="LinkButton" c:type="GtkLinkButton*"/>
           </parameter>
-          <parameter name="message_format">
+          <parameter name="uri">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="message-type">
-        <type name="MessageType" c:type="GtkMessageType"/>
-      </property>
-      <property name="buttons">
-        <type name="ButtonsType" c:type="GtkButtonsType"/>
-      </property>
-      <property name="text">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="use-markup">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="secondary-text">
+      <property name="uri">
         <type name="string" c:type="gchararray"/>
       </property>
-      <property name="secondary-use-markup">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="image">
-        <type name="Widget" c:type="GtkWidget"/>
-      </property>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_padding1" c:type="_gtk_padding1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_padding2" c:type="_gtk_padding2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_padding3" c:type="_gtk_padding3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_padding4" c:type="_gtk_padding4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
     </class>
-    <function name="message_dialog_new" c:identifier="gtk_message_dialog_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="parent" allow-none="1">
-          <type name="Window" c:type="GtkWindow*"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="DialogFlags" c:type="GtkDialogFlags"/>
-        </parameter>
-        <parameter name="type">
-          <type name="MessageType" c:type="GtkMessageType"/>
-        </parameter>
-        <parameter name="buttons">
-          <type name="ButtonsType" c:type="GtkButtonsType"/>
-        </parameter>
-        <parameter name="message_format" allow-none="1">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="message_dialog_new_with_markup"
-              c:identifier="gtk_message_dialog_new_with_markup">
+    <record name="LinkButtonPrivate" c:type="GtkLinkButtonPrivate"/>
+    <callback name="LinkButtonUriFunc" c:type="GtkLinkButtonUriFunc">
       <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="parent">
-          <type name="Window" c:type="GtkWindow*"/>
-        </parameter>
-        <parameter name="flags">
-          <type name="DialogFlags" c:type="GtkDialogFlags"/>
-        </parameter>
-        <parameter name="type">
-          <type name="MessageType" c:type="GtkMessageType"/>
-        </parameter>
-        <parameter name="buttons">
-          <type name="ButtonsType" c:type="GtkButtonsType"/>
-        </parameter>
-        <parameter name="message_format">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="button">
+          <type name="LinkButton" c:type="GtkLinkButton*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="find_module" c:identifier="_gtk_find_module">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
+        <parameter name="link_">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="type">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="get_module_path" c:identifier="_gtk_get_module_path">
+    </callback>
+    <function name="link_button_new" c:identifier="gtk_link_button_new">
       <return-value>
-        <type name="GLib.gchar" c:type="gchar**"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="type">
+        <parameter name="uri">
           <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="modules_init" c:identifier="_gtk_modules_init">
+    <function name="link_button_new_with_label"
+              c:identifier="gtk_link_button_new_with_label">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="argc">
-          <type name="GLib.gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="argv">
-          <type name="GLib.gchar" c:type="gchar***"/>
-        </parameter>
-        <parameter name="gtk_modules_args">
+        <parameter name="uri">
           <type name="string" c:type="gchar*"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="modules_settings_changed"
-              c:identifier="_gtk_modules_settings_changed">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="settings">
-          <type name="Settings" c:type="GtkSettings*"/>
-        </parameter>
-        <parameter name="modules">
+        <parameter name="label" allow-none="1">
           <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <callback name="GtkModuleInitFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="argc">
-          <type name="GLib.gint" c:type="gint*"/>
-        </parameter>
-        <parameter name="argv">
-          <type name="GLib.gchar" c:type="gchar***"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GtkModuleDisplayInitFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="display">
-          <type name="Gdk.Display" c:type="GdkDisplay*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <record name="GtkNotebookPage" c:type="GtkNotebookPage"/>
-    <callback name="GtkNotebookWindowCreationFunc">
+    <function name="link_button_set_uri_hook"
+              c:identifier="gtk_link_button_set_uri_hook">
       <return-value>
-        <type name="Notebook" c:type="GtkNotebook*"/>
+        <type name="LinkButtonUriFunc" c:type="GtkLinkButtonUriFunc"/>
       </return-value>
       <parameters>
-        <parameter name="source">
-          <type name="Notebook" c:type="GtkNotebook*"/>
-        </parameter>
-        <parameter name="page">
-          <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="func">
+          <type name="LinkButtonUriFunc" c:type="GtkLinkButtonUriFunc"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
+        <parameter name="destroy">
+          <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
+        </parameter>
       </parameters>
-    </callback>
-    <class name="Notebook"
-           c:type="GtkNotebook"
-           parent="Container"
-           glib:type-name="GtkNotebook"
-           glib:get-type="gtk_notebook_get_type">
-      <method name="append_page" c:identifier="gtk_notebook_append_page">
+    </function>
+    <class name="ListItem"
+           c:type="GtkListItem"
+           parent="Item"
+           glib:type-name="GtkListItem"
+           glib:get-type="gtk_list_item_get_type">
+      <method name="select" c:identifier="gtk_list_item_select">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="tab_label" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="list_item">
+            <type name="ListItem" c:type="GtkListItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="append_page_menu"
-              c:identifier="gtk_notebook_append_page_menu">
+      <method name="deselect" c:identifier="gtk_list_item_deselect">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list_item">
+            <type name="ListItem" c:type="GtkListItem*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+        </parameters>
+      </method>
+      <callback name="toggle_focus_row" c:type="toggle_focus_row">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="list_item">
+            <type name="ListItem" c:type="GtkListItem*"/>
           </parameter>
-          <parameter name="tab_label" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
+        </parameters>
+      </callback>
+      <callback name="select_all" c:type="select_all">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="list_item">
+            <type name="ListItem" c:type="GtkListItem*"/>
           </parameter>
-          <parameter name="menu_label" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
+        </parameters>
+      </callback>
+      <callback name="unselect_all" c:type="unselect_all">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="list_item">
+            <type name="ListItem" c:type="GtkListItem*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="prepend_page" c:identifier="gtk_notebook_prepend_page">
+      </callback>
+      <callback name="undo_selection" c:type="undo_selection">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list_item">
+            <type name="ListItem" c:type="GtkListItem*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+        </parameters>
+      </callback>
+      <callback name="start_selection" c:type="start_selection">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="list_item">
+            <type name="ListItem" c:type="GtkListItem*"/>
           </parameter>
-          <parameter name="tab_label" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
+        </parameters>
+      </callback>
+      <callback name="end_selection" c:type="end_selection">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="list_item">
+            <type name="ListItem" c:type="GtkListItem*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="prepend_page_menu"
-              c:identifier="gtk_notebook_prepend_page_menu">
+      </callback>
+      <callback name="extend_selection" c:type="extend_selection">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list_item">
+            <type name="ListItem" c:type="GtkListItem*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="scroll_type">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
-          <parameter name="tab_label" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="position">
+            <type name="float" c:type="gfloat"/>
           </parameter>
-          <parameter name="menu_label" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="auto_start_selection">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="insert_page" c:identifier="gtk_notebook_insert_page">
+      </callback>
+      <callback name="scroll_horizontal" c:type="scroll_horizontal">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list_item">
+            <type name="ListItem" c:type="GtkListItem*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="scroll_type">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
-          <parameter name="tab_label" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="position">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="scroll_vertical" c:type="scroll_vertical">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="list_item">
+            <type name="ListItem" c:type="GtkListItem*"/>
+          </parameter>
+          <parameter name="scroll_type">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
           <parameter name="position">
-            <type name="int32" c:type="gint"/>
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="insert_page_menu"
-              c:identifier="gtk_notebook_insert_page_menu">
+      </callback>
+      <callback name="toggle_add_mode" c:type="toggle_add_mode">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list_item">
+            <type name="ListItem" c:type="GtkListItem*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+        </parameters>
+      </callback>
+      <glib:signal name="toggle-focus-row">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </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="undo-selection">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="start-selection">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="end-selection">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="toggle-add-mode">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="extend-selection">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
-          <parameter name="tab_label" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="p0">
+            <type name="float" c:type="gfloat"/>
           </parameter>
-          <parameter name="menu_label" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="p1">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="scroll-vertical">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="ScrollType" c:type="GtkScrollType"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="remove_page" c:identifier="gtk_notebook_remove_page">
+      </glib:signal>
+      <glib:signal name="scroll-horizontal">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="object">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
-          <parameter name="page_num">
-            <type name="int32" c:type="gint"/>
+          <parameter name="p0">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_group_id" c:identifier="gtk_notebook_set_group_id">
+      </glib:signal>
+    </class>
+    <function name="list_item_new" c:identifier="gtk_list_item_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <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>
+      <parameters>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="List"
+           c:type="GtkList"
+           parent="Container"
+           glib:type-name="GtkList"
+           glib:get-type="gtk_list_get_type">
+      <method name="insert_items" c:identifier="gtk_list_insert_items">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
           </parameter>
-          <parameter name="group_id">
-            <type name="int32" c:type="gint"/>
+          <parameter name="items">
+            <type name="GLib.List" c:type="GList*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_group_id" c:identifier="gtk_notebook_get_group_id">
+      <method name="append_items" c:identifier="gtk_list_append_items">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
+          </parameter>
+          <parameter name="items">
+            <type name="GLib.List" c:type="GList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_group" c:identifier="gtk_notebook_set_group">
+      <method name="prepend_items" c:identifier="gtk_list_prepend_items">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
           </parameter>
-          <parameter name="group">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="items">
+            <type name="GLib.List" c:type="GList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_group" c:identifier="gtk_notebook_get_group">
+      <method name="remove_items" c:identifier="gtk_list_remove_items">
         <return-value>
-          <type name="any" c:type="gpointer"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
+          </parameter>
+          <parameter name="items">
+            <type name="GLib.List" c:type="GList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_current_page"
-              c:identifier="gtk_notebook_get_current_page">
+      <method name="remove_items_no_unref"
+              c:identifier="gtk_list_remove_items_no_unref">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
+          </parameter>
+          <parameter name="items">
+            <type name="GLib.List" c:type="GList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_nth_page" c:identifier="gtk_notebook_get_nth_page">
+      <method name="clear_items" c:identifier="gtk_list_clear_items">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
           </parameter>
-          <parameter name="page_num">
-            <type name="int32" c:type="gint"/>
+          <parameter name="start">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="end">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_n_pages" c:identifier="gtk_notebook_get_n_pages">
+      <method name="select_item" c:identifier="gtk_list_select_item">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
+          </parameter>
+          <parameter name="item">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="page_num" c:identifier="gtk_notebook_page_num">
+      <method name="unselect_item" c:identifier="gtk_list_unselect_item">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
           </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="item">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_current_page"
-              c:identifier="gtk_notebook_set_current_page">
+      <method name="select_child" c:identifier="gtk_list_select_child">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
           </parameter>
-          <parameter name="page_num">
-            <type name="int32" c:type="gint"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="next_page" c:identifier="gtk_notebook_next_page">
+      <method name="unselect_child" c:identifier="gtk_list_unselect_child">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="prev_page" c:identifier="gtk_notebook_prev_page">
+      <method name="child_position" c:identifier="gtk_list_child_position">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_show_border"
-              c:identifier="gtk_notebook_set_show_border">
+      <method name="set_selection_mode"
+              c:identifier="gtk_list_set_selection_mode">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
           </parameter>
-          <parameter name="show_border">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="mode">
+            <type name="SelectionMode" c:type="GtkSelectionMode"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_show_border"
-              c:identifier="gtk_notebook_get_show_border">
+      <method name="extend_selection" c:identifier="gtk_list_extend_selection">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
+          </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>
       </method>
-      <method name="set_show_tabs" c:identifier="gtk_notebook_set_show_tabs">
+      <method name="start_selection" c:identifier="gtk_list_start_selection">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="show_tabs">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_show_tabs" c:identifier="gtk_notebook_get_show_tabs">
+      <method name="end_selection" c:identifier="gtk_list_end_selection">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tab_pos" c:identifier="gtk_notebook_set_tab_pos">
+      <method name="select_all" c:identifier="gtk_list_select_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="pos">
-            <type name="PositionType" c:type="GtkPositionType"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_tab_pos" c:identifier="gtk_notebook_get_tab_pos">
+      <method name="unselect_all" c:identifier="gtk_list_unselect_all">
         <return-value>
-          <type name="PositionType" c:type="GtkPositionType"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_homogeneous_tabs"
-              c:identifier="gtk_notebook_set_homogeneous_tabs">
+      <method name="scroll_horizontal"
+              c:identifier="gtk_list_scroll_horizontal">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
           </parameter>
-          <parameter name="homogeneous">
-            <type name="boolean" c:type="gboolean"/>
+          <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="set_tab_border" c:identifier="gtk_notebook_set_tab_border">
+      <method name="scroll_vertical" c:identifier="gtk_list_scroll_vertical">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
           </parameter>
-          <parameter name="border_width">
-            <type name="uint32" c:type="guint"/>
+          <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="set_tab_hborder"
-              c:identifier="gtk_notebook_set_tab_hborder">
+      <method name="toggle_add_mode" c:identifier="gtk_list_toggle_add_mode">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="tab_hborder">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tab_vborder"
-              c:identifier="gtk_notebook_set_tab_vborder">
+      <method name="toggle_focus_row" c:identifier="gtk_list_toggle_focus_row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="tab_vborder">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_scrollable" c:identifier="gtk_notebook_set_scrollable">
+      <method name="toggle_row" c:identifier="gtk_list_toggle_row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
           </parameter>
-          <parameter name="scrollable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="item">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_scrollable" c:identifier="gtk_notebook_get_scrollable">
+      <method name="undo_selection" c:identifier="gtk_list_undo_selection">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="popup_enable" c:identifier="gtk_notebook_popup_enable">
+      <method name="end_drag_selection"
+              c:identifier="gtk_list_end_drag_selection">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="popup_disable" c:identifier="gtk_notebook_popup_disable">
+      <property name="selection-mode">
+        <type name="SelectionMode" c:type="GtkSelectionMode"/>
+      </property>
+      <callback name="selection_changed" c:type="selection_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_tab_label" c:identifier="gtk_notebook_get_tab_label">
+      </callback>
+      <callback name="select_child" c:type="select_child">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
           </parameter>
           <parameter name="child">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_tab_label" c:identifier="gtk_notebook_set_tab_label">
+      </callback>
+      <callback name="unselect_child" c:type="unselect_child">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
           </parameter>
           <parameter name="child">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="tab_label" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
         </parameters>
-      </method>
-      <method name="set_tab_label_text"
-              c:identifier="gtk_notebook_set_tab_label_text">
+      </callback>
+      <glib:signal name="selection-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="select-child">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="tab_text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="object">
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_tab_label_text"
-              c:identifier="gtk_notebook_get_tab_label_text">
+      </glib:signal>
+      <glib:signal name="unselect-child">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="object">
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_menu_label" c:identifier="gtk_notebook_get_menu_label">
-        <return-value>
+      </glib:signal>
+    </class>
+    <function name="list_new" c:identifier="gtk_list_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <callback name="KeySnoopFunc" c:type="GtkKeySnoopFunc">
+      <return-value>
+        <type name="int" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="grab_widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="event">
+          <type name="Gdk.EventKey" c:type="GdkEventKey*"/>
+        </parameter>
+        <parameter name="func_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <function name="check_version" c:identifier="gtk_check_version">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="required_major">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="required_minor">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="required_micro">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="parse_args" c:identifier="gtk_parse_args">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="argc">
+          <type name="int" c:type="int*"/>
+        </parameter>
+        <parameter name="argv">
+          <type name="int8" c:type="char***"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="init" c:identifier="gtk_init">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="argc">
+          <type name="int" c:type="int*"/>
+        </parameter>
+        <parameter name="argv">
+          <type name="int8" c:type="char***"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="init_check" c:identifier="gtk_init_check">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="argc">
+          <type name="int" c:type="int*"/>
+        </parameter>
+        <parameter name="argv">
+          <type name="int8" c:type="char***"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="init_with_args" c:identifier="gtk_init_with_args">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="argc">
+          <type name="int" c:type="int*"/>
+        </parameter>
+        <parameter name="argv">
+          <type name="int8" c:type="char***"/>
+        </parameter>
+        <parameter name="parameter_string">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="entries">
+          <type name="GLib.OptionEntry" c:type="GOptionEntry*"/>
+        </parameter>
+        <parameter name="translation_domain">
+          <type name="string" c:type="char*"/>
+        </parameter>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="get_option_group" c:identifier="gtk_get_option_group">
+      <return-value>
+        <type name="GLib.OptionGroup" c:type="GOptionGroup*"/>
+      </return-value>
+      <parameters>
+        <parameter name="open_default_display">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="exit" c:identifier="gtk_exit">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="error_code">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="disable_setlocale" c:identifier="gtk_disable_setlocale">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="set_locale" c:identifier="gtk_set_locale">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+    </function>
+    <function name="get_default_language"
+              c:identifier="gtk_get_default_language">
+      <return-value>
+        <type name="Pango.Language" c:type="PangoLanguage*"/>
+      </return-value>
+    </function>
+    <function name="events_pending" c:identifier="gtk_events_pending">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+    </function>
+    <function name="main_do_event" c:identifier="gtk_main_do_event">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="event">
+          <type name="Gdk.Event" c:type="GdkEvent*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="main" c:identifier="gtk_main">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="main_level" c:identifier="gtk_main_level">
+      <return-value>
+        <type name="uint" c:type="guint"/>
+      </return-value>
+    </function>
+    <function name="main_quit" c:identifier="gtk_main_quit">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="main_iteration" c:identifier="gtk_main_iteration">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+    </function>
+    <function name="main_iteration_do" c:identifier="gtk_main_iteration_do">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="blocking">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="true" c:identifier="gtk_true">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+    </function>
+    <function name="false" c:identifier="gtk_false">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+    </function>
+    <function name="grab_add" c:identifier="gtk_grab_add">
+      <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="grab_get_current" c:identifier="gtk_grab_get_current">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="grab_remove" c:identifier="gtk_grab_remove">
+      <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="init_add" c:identifier="gtk_init_add">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="function">
+          <type name="Function" c:type="GtkFunction"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="quit_add_destroy" c:identifier="gtk_quit_add_destroy">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="main_level">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="object">
+          <type name="Object" c:type="GtkObject*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="quit_add" c:identifier="gtk_quit_add">
+      <return-value>
+        <type name="uint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="main_level">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="function">
+          <type name="Function" c:type="GtkFunction"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="quit_add_full" c:identifier="gtk_quit_add_full">
+      <return-value>
+        <type name="uint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="main_level">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="function">
+          <type name="Function" c:type="GtkFunction"/>
+        </parameter>
+        <parameter name="marshal">
+          <type name="CallbackMarshal" c:type="GtkCallbackMarshal"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy">
+          <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="quit_remove" c:identifier="gtk_quit_remove">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="quit_handler_id">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="quit_remove_by_data"
+              c:identifier="gtk_quit_remove_by_data">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="timeout_add" c:identifier="gtk_timeout_add">
+      <return-value>
+        <type name="uint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="interval">
+          <type name="uint32" c:type="guint32"/>
+        </parameter>
+        <parameter name="function">
+          <type name="Function" c:type="GtkFunction"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="timeout_add_full" c:identifier="gtk_timeout_add_full">
+      <return-value>
+        <type name="uint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="interval">
+          <type name="uint32" c:type="guint32"/>
+        </parameter>
+        <parameter name="function">
+          <type name="Function" c:type="GtkFunction"/>
+        </parameter>
+        <parameter name="marshal">
+          <type name="CallbackMarshal" c:type="GtkCallbackMarshal"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy">
+          <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="timeout_remove" c:identifier="gtk_timeout_remove">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="timeout_handler_id">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="idle_add" c:identifier="gtk_idle_add">
+      <return-value>
+        <type name="uint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="function">
+          <type name="Function" c:type="GtkFunction"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="idle_add_priority" c:identifier="gtk_idle_add_priority">
+      <return-value>
+        <type name="uint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="priority">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="function">
+          <type name="Function" c:type="GtkFunction"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="idle_add_full" c:identifier="gtk_idle_add_full">
+      <return-value>
+        <type name="uint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="priority">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="function">
+          <type name="Function" c:type="GtkFunction"/>
+        </parameter>
+        <parameter name="marshal">
+          <type name="CallbackMarshal" c:type="GtkCallbackMarshal"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy">
+          <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="idle_remove" c:identifier="gtk_idle_remove">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="idle_handler_id">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="idle_remove_by_data"
+              c:identifier="gtk_idle_remove_by_data">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="input_add_full" c:identifier="gtk_input_add_full">
+      <return-value>
+        <type name="uint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="source">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="condition">
+          <type name="Gdk.InputCondition" c:type="GdkInputCondition"/>
+        </parameter>
+        <parameter name="function">
+          <type name="Gdk.InputFunction" c:type="GdkInputFunction"/>
+        </parameter>
+        <parameter name="marshal">
+          <type name="CallbackMarshal" c:type="GtkCallbackMarshal"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy">
+          <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="input_remove" c:identifier="gtk_input_remove">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="input_handler_id">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="key_snooper_install"
+              c:identifier="gtk_key_snooper_install">
+      <return-value>
+        <type name="uint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="snooper">
+          <type name="KeySnoopFunc" c:type="GtkKeySnoopFunc"/>
+        </parameter>
+        <parameter name="func_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="key_snooper_remove" c:identifier="gtk_key_snooper_remove">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="snooper_handler_id">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="get_current_event" c:identifier="gtk_get_current_event">
+      <return-value>
+        <type name="Gdk.Event" c:type="GdkEvent*"/>
+      </return-value>
+    </function>
+    <function name="get_current_event_time"
+              c:identifier="gtk_get_current_event_time">
+      <return-value>
+        <type name="uint32" c:type="guint32"/>
+      </return-value>
+    </function>
+    <function name="get_current_event_state"
+              c:identifier="gtk_get_current_event_state">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="state">
+          <type name="Gdk.ModifierType" c:type="GdkModifierType*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="get_event_widget" c:identifier="gtk_get_event_widget">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="event">
+          <type name="Gdk.Event" c:type="GdkEvent*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="propagate_event" c:identifier="gtk_propagate_event">
+      <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="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_menu_label" c:identifier="gtk_notebook_set_menu_label">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="menu_label" allow-none="1">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_menu_label_text"
-              c:identifier="gtk_notebook_set_menu_label_text">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="menu_text">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_menu_label_text"
-              c:identifier="gtk_notebook_get_menu_label_text">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="query_tab_label_packing"
-              c:identifier="gtk_notebook_query_tab_label_packing">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="expand">
-            <type name="GLib.gboolean" c:type="gboolean*"/>
-          </parameter>
-          <parameter name="fill">
-            <type name="GLib.gboolean" c:type="gboolean*"/>
-          </parameter>
-          <parameter name="pack_type">
-            <type name="PackType" c:type="GtkPackType*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_tab_label_packing"
-              c:identifier="gtk_notebook_set_tab_label_packing">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="expand">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="fill">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="pack_type">
-            <type name="PackType" c:type="GtkPackType"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="reorder_child" c:identifier="gtk_notebook_reorder_child">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_tab_reorderable"
-              c:identifier="gtk_notebook_get_tab_reorderable">
+        </parameter>
+        <parameter name="event">
+          <type name="Gdk.Event" c:type="GdkEvent*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="boolean_handled_accumulator"
+              c:identifier="_gtk_boolean_handled_accumulator">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="ihint">
+          <type name="GObject.SignalInvocationHint"
+                c:type="GSignalInvocationHint*"/>
+        </parameter>
+        <parameter name="return_accu">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="handler_return">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+        <parameter name="dummy">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="get_lc_ctype" c:identifier="_gtk_get_lc_ctype">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+    </function>
+    <class name="MenuBar"
+           c:type="GtkMenuBar"
+           parent="MenuShell"
+           glib:type-name="GtkMenuBar"
+           glib:get-type="gtk_menu_bar_get_type">
+      <method name="get_pack_direction"
+              c:identifier="gtk_menu_bar_get_pack_direction">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="PackDirection" c:type="GtkPackDirection"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="menubar">
+            <type name="MenuBar" c:type="GtkMenuBar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tab_reorderable"
-              c:identifier="gtk_notebook_set_tab_reorderable">
+      <method name="set_pack_direction"
+              c:identifier="gtk_menu_bar_set_pack_direction">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="menubar">
+            <type name="MenuBar" c:type="GtkMenuBar*"/>
           </parameter>
-          <parameter name="reorderable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="pack_dir">
+            <type name="PackDirection" c:type="GtkPackDirection"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_tab_detachable"
-              c:identifier="gtk_notebook_get_tab_detachable">
+      <method name="get_child_pack_direction"
+              c:identifier="gtk_menu_bar_get_child_pack_direction">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="PackDirection" c:type="GtkPackDirection"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="menubar">
+            <type name="MenuBar" c:type="GtkMenuBar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_tab_detachable"
-              c:identifier="gtk_notebook_set_tab_detachable">
+      <method name="set_child_pack_direction"
+              c:identifier="gtk_menu_bar_set_child_pack_direction">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="menubar">
+            <type name="MenuBar" c:type="GtkMenuBar*"/>
           </parameter>
-          <parameter name="detachable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="child_pack_dir">
+            <type name="PackDirection" c:type="GtkPackDirection"/>
           </parameter>
         </parameters>
       </method>
-      <property name="tab-pos">
-        <type name="PositionType" c:type="GtkPositionType"/>
-      </property>
-      <property name="show-tabs">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="show-border">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="scrollable">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="tab-border">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <property name="tab-hborder">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <property name="tab-vborder">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <property name="page">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="enable-popup">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="group-id">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="group">
-        <type name="any" c:type="gpointer"/>
+      <property name="pack-direction">
+        <type name="PackDirection" c:type="GtkPackDirection"/>
       </property>
-      <property name="homogeneous">
-        <type name="boolean" c:type="gboolean"/>
+      <property name="child-pack-direction">
+        <type name="PackDirection" c:type="GtkPackDirection"/>
       </property>
-      <callback name="switch_page">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="page">
-            <type name="GtkNotebookPage" c:type="GtkNotebookPage*"/>
-          </parameter>
-          <parameter name="page_num">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="select_page">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="move_focus">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="focus_tab">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="type">
-            <type name="NotebookTab" c:type="GtkNotebookTab"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="change_current_page">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="offset">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="move_focus_out">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="direction">
-            <type name="DirectionType" c:type="GtkDirectionType"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="reorder_tab">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="direction">
-            <type name="DirectionType" c:type="GtkDirectionType"/>
-          </parameter>
-          <parameter name="move_to_last">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="insert_page">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="child">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="tab_label">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="menu_label">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="create_window">
-        <return-value>
-          <type name="Notebook" c:type="GtkNotebook*"/>
-        </return-value>
-        <parameters>
-          <parameter name="notebook">
-            <type name="Notebook" c:type="GtkNotebook*"/>
-          </parameter>
-          <parameter name="page">
-            <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>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="switch-page">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="focus-tab">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="NotebookTab" c:type="GtkNotebookTab"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="select-page">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="change-current-page">
+      </callback>
+    </class>
+    <function name="menu_bar_new" c:identifier="gtk_menu_bar_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="menu_bar_cycle_focus"
+              c:identifier="_gtk_menu_bar_cycle_focus">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="menubar">
+          <type name="MenuBar" c:type="GtkMenuBar*"/>
+        </parameter>
+        <parameter name="dir">
+          <type name="DirectionType" c:type="GtkDirectionType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="Tooltips"
+           c:type="GtkTooltips"
+           parent="Object"
+           glib:type-name="GtkTooltips"
+           glib:get-type="gtk_tooltips_get_type">
+      <constructor name="new" c:identifier="gtk_tooltips_new">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Tooltips" c:type="GtkTooltips*"/>
         </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="move-focus-out">
+      </constructor>
+      <method name="enable" c:identifier="gtk_tooltips_enable">
         <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="reorder-tab">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="DirectionType" c:type="GtkDirectionType"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="tooltips">
+            <type name="Tooltips" c:type="GtkTooltips*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="page-reordered">
+      </method>
+      <method name="disable" c:identifier="gtk_tooltips_disable">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Widget" c:type="GtkWidget"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="tooltips">
+            <type name="Tooltips" c:type="GtkTooltips*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="page-removed">
+      </method>
+      <method name="set_delay" c:identifier="gtk_tooltips_set_delay">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Widget" c:type="GtkWidget"/>
+          <parameter name="tooltips">
+            <type name="Tooltips" c:type="GtkTooltips*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="delay">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="page-added">
+      </method>
+      <method name="set_tip" c:identifier="gtk_tooltips_set_tip">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Widget" c:type="GtkWidget"/>
+          <parameter name="tooltips">
+            <type name="Tooltips" c:type="GtkTooltips*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="tip_text" allow-none="1">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="tip_private" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="create-window">
+      </method>
+      <method name="force_window" c:identifier="gtk_tooltips_force_window">
         <return-value>
-          <type name="Notebook" c:type="GtkNotebook"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Widget" c:type="GtkWidget"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="int32" c:type="gint"/>
+          <parameter name="tooltips">
+            <type name="Tooltips" c:type="GtkTooltips*"/>
           </parameter>
         </parameters>
-      </glib:signal>
+      </method>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
     </class>
-    <function name="notebook_new" c:identifier="gtk_notebook_new">
-      <return-value>
+    <record name="TooltipsData" c:type="GtkTooltipsData">
+      <field name="tooltips">
+        <type name="Tooltips" c:type="GtkTooltips*"/>
+      </field>
+      <field name="widget">
         <type name="Widget" c:type="GtkWidget*"/>
+      </field>
+      <field name="tip_text">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="tip_private">
+        <type name="string" c:type="gchar*"/>
+      </field>
+    </record>
+    <function name="tooltips_data_get" c:identifier="gtk_tooltips_data_get">
+      <return-value>
+        <type name="TooltipsData" c:type="GtkTooltipsData*"/>
       </return-value>
+      <parameters>
+        <parameter name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="notebook_set_window_creation_hook"
-              c:identifier="gtk_notebook_set_window_creation_hook">
+    <function name="tooltips_get_info_from_tip_window"
+              c:identifier="gtk_tooltips_get_info_from_tip_window">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="func">
-          <type name="GtkNotebookWindowCreationFunc"
-                c:type="GtkNotebookWindowCreationFunc"/>
+        <parameter name="tip_window">
+          <type name="Window" c:type="GtkWindow*"/>
         </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="tooltips">
+          <type name="Tooltips" c:type="GtkTooltips**"/>
         </parameter>
-        <parameter name="destroy">
-          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+        <parameter name="current_widget">
+          <type name="Widget" c:type="GtkWidget**"/>
         </parameter>
       </parameters>
     </function>
-    <record name="GtkOldEditable" c:type="GtkOldEditable">
-      <field name="widget">
-        <type name="Widget" c:type="GtkWidget"/>
-      </field>
-      <field name="current_pos">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="selection_start_pos">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="selection_end_pos">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="has_selection">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="editable">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="visible">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <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">
+    <class name="ToolItem"
+           c:type="GtkToolItem"
+           parent="Bin"
+           glib:type-name="GtkToolItem"
+           glib:get-type="gtk_tool_item_get_type">
+      <constructor name="new" c:identifier="gtk_tool_item_new">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="ToolItem" c:type="GtkToolItem*"/>
         </return-value>
-        <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="set_editable">
+      </constructor>
+      <method name="set_homogeneous"
+              c:identifier="gtk_tool_item_set_homogeneous">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="is_editable">
+          <parameter name="homogeneous">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="move_cursor">
+      </method>
+      <method name="get_homogeneous"
+              c:identifier="gtk_tool_item_get_homogeneous">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="move_word">
+      </method>
+      <method name="set_expand" c:identifier="gtk_tool_item_set_expand">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="n">
-            <type name="int32" c:type="gint"/>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="move_page">
+      </method>
+      <method name="get_expand" c:identifier="gtk_tool_item_get_expand">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="int32" c:type="gint"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="move_to_row">
+      </method>
+      <method name="set_tooltip" c:identifier="gtk_tool_item_set_tooltip">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="row">
-            <type name="int32" c:type="gint"/>
+          <parameter name="tooltips">
+            <type name="Tooltips" c:type="GtkTooltips*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="move_to_column">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
+          <parameter name="tip_text" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="row">
-            <type name="int32" c:type="gint"/>
+          <parameter name="tip_private" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="kill_char">
+      </method>
+      <method name="set_tooltip_text"
+              c:identifier="gtk_tool_item_set_tooltip_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="direction">
-            <type name="int32" c:type="gint"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="kill_word">
+      </method>
+      <method name="set_tooltip_markup"
+              c:identifier="gtk_tool_item_set_tooltip_markup">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="direction">
-            <type name="int32" c:type="gint"/>
+          <parameter name="markup">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="kill_line">
+      </method>
+      <method name="set_use_drag_window"
+              c:identifier="gtk_tool_item_set_use_drag_window">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="direction">
-            <type name="int32" c:type="gint"/>
+          <parameter name="use_drag_window">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="cut_clipboard">
+      </method>
+      <method name="get_use_drag_window"
+              c:identifier="gtk_tool_item_get_use_drag_window">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="copy_clipboard">
+      </method>
+      <method name="set_visible_horizontal"
+              c:identifier="gtk_tool_item_set_visible_horizontal">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
+          </parameter>
+          <parameter name="visible_horizontal">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="paste_clipboard">
+      </method>
+      <method name="get_visible_horizontal"
+              c:identifier="gtk_tool_item_get_visible_horizontal">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="update_text">
+      </method>
+      <method name="set_visible_vertical"
+              c:identifier="gtk_tool_item_set_visible_vertical">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
-          </parameter>
-          <parameter name="start_pos">
-            <type name="int32" c:type="gint"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="end_pos">
-            <type name="int32" c:type="gint"/>
+          <parameter name="visible_vertical">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_chars">
+      </method>
+      <method name="get_visible_vertical"
+              c:identifier="gtk_tool_item_get_visible_vertical">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
-          </parameter>
-          <parameter name="start_pos">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="end_pos">
-            <type name="int32" c:type="gint"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_selection">
+      </method>
+      <method name="get_is_important"
+              c:identifier="gtk_tool_item_get_is_important">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
-          </parameter>
-          <parameter name="start_pos">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="end_pos">
-            <type name="int32" c:type="gint"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_position">
+      </method>
+      <method name="set_is_important"
+              c:identifier="gtk_tool_item_set_is_important">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="editable">
-            <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
-          <parameter name="position">
-            <type name="int32" c:type="gint"/>
+          <parameter name="is_important">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-    </record>
-    <callback name="GtkTextFunction">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="editable">
-          <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
-        </parameter>
-        <parameter name="time_">
-          <type name="uint32" c:type="guint32"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <function name="old_editable_get_type"
-              c:identifier="gtk_old_editable_get_type">
-      <return-value>
-        <type name="GtkType" c:type="GtkType"/>
-      </return-value>
-    </function>
-    <function name="old_editable_claim_selection"
-              c:identifier="gtk_old_editable_claim_selection">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="old_editable">
-          <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
-        </parameter>
-        <parameter name="claim">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="time_">
-          <type name="uint32" c:type="guint32"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="old_editable_changed"
-              c:identifier="gtk_old_editable_changed">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="old_editable">
-          <type name="GtkOldEditable" c:type="GtkOldEditable*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="OptionMenu"
-           c:type="GtkOptionMenu"
-           parent="Button"
-           glib:type-name="GtkOptionMenu"
-           glib:get-type="gtk_option_menu_get_type">
-      <method name="get_menu" c:identifier="gtk_option_menu_get_menu">
+      </method>
+      <method name="get_icon_size" c:identifier="gtk_tool_item_get_icon_size">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="IconSize" c:type="GtkIconSize"/>
         </return-value>
         <parameters>
-          <parameter name="option_menu">
-            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_menu" c:identifier="gtk_option_menu_set_menu">
+      <method name="get_orientation"
+              c:identifier="gtk_tool_item_get_orientation">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Orientation" c:type="GtkOrientation"/>
         </return-value>
         <parameters>
-          <parameter name="option_menu">
-            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
-          </parameter>
-          <parameter name="menu">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_menu" c:identifier="gtk_option_menu_remove_menu">
+      <method name="get_toolbar_style"
+              c:identifier="gtk_tool_item_get_toolbar_style">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
         </return-value>
         <parameters>
-          <parameter name="option_menu">
-            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_history" c:identifier="gtk_option_menu_get_history">
+      <method name="get_relief_style"
+              c:identifier="gtk_tool_item_get_relief_style">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="ReliefStyle" c:type="GtkReliefStyle"/>
         </return-value>
         <parameters>
-          <parameter name="option_menu">
-            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_history" c:identifier="gtk_option_menu_set_history">
+      <method name="retrieve_proxy_menu_item"
+              c:identifier="gtk_tool_item_retrieve_proxy_menu_item">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="option_menu">
-            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
-          </parameter>
-          <parameter name="index_">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="menu">
-        <type name="Menu" c:type="GtkMenu"/>
-      </property>
-      <callback name="changed">
+      <method name="get_proxy_menu_item"
+              c:identifier="gtk_tool_item_get_proxy_menu_item">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="option_menu">
-            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
+          </parameter>
+          <parameter name="menu_item_id">
+            <type name="string" c:type="gchar*"/>
           </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>
-    <function name="option_menu_new" c:identifier="gtk_option_menu_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <record name="GtkPixmap" c:type="GtkPixmap">
-      <field name="misc">
-        <type name="Misc" c:type="GtkMisc"/>
-      </field>
-      <field name="pixmap">
-        <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-      </field>
-      <field name="mask">
-        <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-      </field>
-      <field name="pixmap_insensitive">
-        <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-      </field>
-      <field name="build_insensitive">
-        <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"/>
-      </return-value>
-    </function>
-    <function name="pixmap_new" c:identifier="gtk_pixmap_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="pixmap">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask" allow-none="1">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="pixmap_set" c:identifier="gtk_pixmap_set">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="pixmap">
-          <type name="GtkPixmap" c:type="GtkPixmap*"/>
-        </parameter>
-        <parameter name="val">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
-        </parameter>
-        <parameter name="mask" allow-none="1">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="pixmap_get" c:identifier="gtk_pixmap_get">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="pixmap">
-          <type name="GtkPixmap" c:type="GtkPixmap*"/>
-        </parameter>
-        <parameter name="val">
-          <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
-        </parameter>
-        <parameter name="mask">
-          <type name="Gdk.GdkBitmap" c:type="GdkBitmap**"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="pixmap_set_build_insensitive"
-              c:identifier="gtk_pixmap_set_build_insensitive">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="pixmap">
-          <type name="GtkPixmap" c:type="GtkPixmap*"/>
-        </parameter>
-        <parameter name="build">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="Socket"
-           c:type="GtkSocket"
-           parent="Container"
-           glib:type-name="GtkSocket"
-           glib:get-type="gtk_socket_get_type">
-      <method name="add_id" c:identifier="gtk_socket_add_id">
+      </method>
+      <method name="set_proxy_menu_item"
+              c:identifier="gtk_tool_item_set_proxy_menu_item">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="socket_">
-            <type name="Socket" c:type="GtkSocket*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
+          </parameter>
+          <parameter name="menu_item_id">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="window_id">
-            <type name="Gdk.GdkNativeWindow" c:type="GdkNativeWindow"/>
+          <parameter name="menu_item" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_id" c:identifier="gtk_socket_get_id">
+      <method name="rebuild_menu" c:identifier="gtk_tool_item_rebuild_menu">
         <return-value>
-          <type name="Gdk.GdkNativeWindow" c:type="GdkNativeWindow"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="socket_">
-            <type name="Socket" c:type="GtkSocket*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="steal" c:identifier="gtk_socket_steal">
+      <property name="visible-horizontal">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="visible-vertical">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="is-important">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="create_menu_proxy" c:type="create_menu_proxy">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="socket_">
-            <type name="Socket" c:type="GtkSocket*"/>
-          </parameter>
-          <parameter name="wid">
-            <type name="Gdk.GdkNativeWindow" c:type="GdkNativeWindow"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
-      </method>
-      <callback name="plug_added">
+      </callback>
+      <callback name="toolbar_reconfigured" c:type="toolbar_reconfigured">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="socket_">
-            <type name="Socket" c:type="GtkSocket*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="plug_removed">
+      <callback name="set_tooltip" c:type="set_tooltip">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="socket_">
-            <type name="Socket" c:type="GtkSocket*"/>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
+          </parameter>
+          <parameter name="tooltips">
+            <type name="Tooltips" c:type="GtkTooltips*"/>
+          </parameter>
+          <parameter name="tip_text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="tip_private">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="plug-added">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="plug-removed">
+      <glib:signal name="create-menu-proxy">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
       </glib:signal>
-    </class>
-    <function name="socket_new" c:identifier="gtk_socket_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <class name="Plug"
-           c:type="GtkPlug"
-           parent="Window"
-           glib:type-name="GtkPlug"
-           glib:get-type="gtk_plug_get_type">
-      <method name="construct" c:identifier="gtk_plug_construct">
+      <glib:signal name="toolbar-reconfigured">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="plug">
-            <type name="Plug" c:type="GtkPlug*"/>
-          </parameter>
-          <parameter name="socket_id">
-            <type name="Gdk.GdkNativeWindow" c:type="GdkNativeWindow"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="construct_for_display"
-              c:identifier="gtk_plug_construct_for_display">
+      </glib:signal>
+      <glib:signal name="set-tooltip">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="plug">
-            <type name="Plug" c:type="GtkPlug*"/>
-          </parameter>
-          <parameter name="display">
-            <type name="Gdk.Display" c:type="GdkDisplay*"/>
-          </parameter>
-          <parameter name="socket_id">
-            <type name="Gdk.GdkNativeWindow" c:type="GdkNativeWindow"/>
+          <parameter name="object">
+            <type name="Tooltips" c:type="GtkTooltips"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_id" c:identifier="gtk_plug_get_id">
-        <return-value>
-          <type name="Gdk.GdkNativeWindow" c:type="GdkNativeWindow"/>
-        </return-value>
-        <parameters>
-          <parameter name="plug">
-            <type name="Plug" c:type="GtkPlug*"/>
+          <parameter name="p0">
+            <type name="string" c:type="gchararray"/>
           </parameter>
-        </parameters>
-      </method>
-      <property name="embedded">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="embedded">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="plug">
-            <type name="Plug" c:type="GtkPlug*"/>
+          <parameter name="p1">
+            <type name="string" c:type="gchararray"/>
           </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="embedded">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
       </glib:signal>
     </class>
-    <function name="plug_new" c:identifier="gtk_plug_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="socket_id">
-          <type name="Gdk.GdkNativeWindow" c:type="GdkNativeWindow"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="plug_new_for_display"
-              c:identifier="gtk_plug_new_for_display">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="display">
-          <type name="Gdk.Display" c:type="GdkDisplay*"/>
-        </parameter>
-        <parameter name="socket_id">
-          <type name="Gdk.GdkNativeWindow" c:type="GdkNativeWindow"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="plug_add_to_socket" c:identifier="_gtk_plug_add_to_socket">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="plug">
-          <type name="Plug" c:type="GtkPlug*"/>
-        </parameter>
-        <parameter name="socket_">
-          <type name="Socket" c:type="GtkSocket*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="plug_remove_from_socket"
-              c:identifier="_gtk_plug_remove_from_socket">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="plug">
-          <type name="Plug" c:type="GtkPlug*"/>
-        </parameter>
-        <parameter name="socket_">
-          <type name="Socket" c:type="GtkSocket*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkPreview" c:type="GtkPreview">
-      <field name="widget">
-        <type name="Widget" c:type="GtkWidget"/>
-      </field>
-      <field name="buffer">
-        <type name="GLib.guchar" c:type="guchar*"/>
-      </field>
-      <field name="buffer_width">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="buffer_height">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="bpp">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="rowstride">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="dither">
-        <type name="GdkRgbDither" c:type="GdkRgbDither"/>
-      </field>
-      <field name="type">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="expand">
-        <type name="uint32" c:type="guint"/>
-      </field>
-    </record>
-    <record name="GtkPreviewInfo" c:type="GtkPreviewInfo">
-      <field name="lookup">
-        <type name="GLib.guchar" c:type="guchar*"/>
-      </field>
-      <field name="gamma">
-        <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"/>
-      </return-value>
-    </function>
-    <function name="preview_uninit" c:identifier="gtk_preview_uninit">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <function name="preview_new" c:identifier="gtk_preview_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="PreviewType" c:type="GtkPreviewType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="preview_size" c:identifier="gtk_preview_size">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="preview">
-          <type name="GtkPreview" c:type="GtkPreview*"/>
-        </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="preview_put" c:identifier="gtk_preview_put">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="preview">
-          <type name="GtkPreview" c:type="GtkPreview*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
-        </parameter>
-        <parameter name="gc">
-          <type name="Gdk.GC" c:type="GdkGC*"/>
-        </parameter>
-        <parameter name="srcx">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="srcy">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="destx">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="desty">
-          <type name="int32" c:type="gint"/>
-        </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="preview_draw_row" c:identifier="gtk_preview_draw_row">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="preview">
-          <type name="GtkPreview" c:type="GtkPreview*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="GLib.guchar" c:type="guchar*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-        <parameter name="w">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="preview_set_expand" c:identifier="gtk_preview_set_expand">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="preview">
-          <type name="GtkPreview" c:type="GtkPreview*"/>
-        </parameter>
-        <parameter name="expand">
-          <type name="boolean" c:type="gboolean"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="preview_set_gamma" c:identifier="gtk_preview_set_gamma">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="gamma_">
-          <type name="double" c:type="double"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="preview_set_color_cube"
-              c:identifier="gtk_preview_set_color_cube">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="nred_shades">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="ngreen_shades">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="nblue_shades">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="ngray_shades">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="preview_set_install_cmap"
-              c:identifier="gtk_preview_set_install_cmap">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="install_cmap">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="preview_set_reserved"
-              c:identifier="gtk_preview_set_reserved">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="nreserved">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="preview_set_dither" c:identifier="gtk_preview_set_dither">
+    <record name="ToolItemPrivate" c:type="GtkToolItemPrivate"/>
+    <function name="tool_item_toolbar_reconfigured"
+              c:identifier="_gtk_tool_item_toolbar_reconfigured">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="preview">
-          <type name="GtkPreview" c:type="GtkPreview*"/>
-        </parameter>
-        <parameter name="dither">
-          <type name="GdkRgbDither" c:type="GdkRgbDither"/>
+        <parameter name="tool_item">
+          <type name="ToolItem" c:type="GtkToolItem*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="preview_get_visual" c:identifier="gtk_preview_get_visual">
-      <return-value>
-        <type name="Gdk.Visual" c:type="GdkVisual*"/>
-      </return-value>
-    </function>
-    <function name="preview_get_cmap" c:identifier="gtk_preview_get_cmap">
-      <return-value>
-        <type name="Gdk.Colormap" c:type="GdkColormap*"/>
-      </return-value>
-    </function>
-    <function name="preview_get_info" c:identifier="gtk_preview_get_info">
-      <return-value>
-        <type name="GtkPreviewInfo" c:type="GtkPreviewInfo*"/>
-      </return-value>
-    </function>
-    <function name="preview_reset" c:identifier="gtk_preview_reset">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-    </function>
-    <glib:boxed c:type="PaperSize"
-                glib:name="PaperSize"
-                glib:type-name="GtkPaperSize"
-                glib:get-type="gtk_paper_size_get_type">
-      <constructor name="new" c:identifier="gtk_paper_size_new">
-        <return-value>
-          <type name="PaperSize" c:type="GtkPaperSize*"/>
-        </return-value>
-        <parameters>
-          <parameter name="name" allow-none="1">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="new_from_ppd"
-                   c:identifier="gtk_paper_size_new_from_ppd">
-        <return-value>
-          <type name="PaperSize" c:type="GtkPaperSize*"/>
-        </return-value>
-        <parameters>
-          <parameter name="ppd_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="ppd_display_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="double" c:type="gdouble"/>
-          </parameter>
-          <parameter name="height">
-            <type name="double" c:type="gdouble"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="new_custom" c:identifier="gtk_paper_size_new_custom">
+    <class name="ToolButton"
+           c:type="GtkToolButton"
+           parent="ToolItem"
+           glib:type-name="GtkToolButton"
+           glib:get-type="gtk_tool_button_get_type">
+      <method name="set_label" c:identifier="gtk_tool_button_set_label">
         <return-value>
-          <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
-          <parameter name="display_name">
+          <parameter name="label" allow-none="1">
             <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="width">
-            <type name="double" c:type="gdouble"/>
-          </parameter>
-          <parameter name="height">
-            <type name="double" c:type="gdouble"/>
-          </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="copy" c:identifier="gtk_paper_size_copy">
-        <return-value>
-          <type name="PaperSize" c:type="GtkPaperSize*"/>
-        </return-value>
-        <parameters>
-          <parameter name="other">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
-          </parameter>
         </parameters>
-      </constructor>
-      <constructor name="new_from_key_file"
-                   c:identifier="gtk_paper_size_new_from_key_file">
+      </method>
+      <method name="get_label" c:identifier="gtk_tool_button_get_label">
         <return-value>
-          <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="key_file">
-            <type name="GKeyFile" c:type="GKeyFile*"/>
-          </parameter>
-          <parameter name="group_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="free" c:identifier="gtk_paper_size_free">
+      </method>
+      <method name="set_use_underline"
+              c:identifier="gtk_tool_button_set_use_underline">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
+          </parameter>
+          <parameter name="use_underline">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="is_equal" c:identifier="gtk_paper_size_is_equal">
+      <method name="get_use_underline"
+              c:identifier="gtk_tool_button_get_use_underline">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="size1">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
-          </parameter>
-          <parameter name="size2">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_name" c:identifier="gtk_paper_size_get_name">
+      <method name="set_stock_id" c:identifier="gtk_tool_button_set_stock_id">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_display_name"
-              c:identifier="gtk_paper_size_get_display_name">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="stock_id" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_ppd_name" c:identifier="gtk_paper_size_get_ppd_name">
+      <method name="get_stock_id" c:identifier="gtk_tool_button_get_stock_id">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_width" c:identifier="gtk_paper_size_get_width">
-        <return-value>
-          <type name="double" c:type="gdouble"/>
-        </return-value>
-        <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
-          </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_height" c:identifier="gtk_paper_size_get_height">
+      <method name="set_icon_name"
+              c:identifier="gtk_tool_button_set_icon_name">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="icon_name" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="is_custom" c:identifier="gtk_paper_size_is_custom">
+      <method name="get_icon_name"
+              c:identifier="gtk_tool_button_get_icon_name">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_size" c:identifier="gtk_paper_size_set_size">
+      <method name="set_icon_widget"
+              c:identifier="gtk_tool_button_set_icon_widget">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="double" c:type="gdouble"/>
-          </parameter>
-          <parameter name="height">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="icon_widget" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_default_top_margin"
-              c:identifier="gtk_paper_size_get_default_top_margin">
+      <method name="get_icon_widget"
+              c:identifier="gtk_tool_button_get_icon_widget">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
-          </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_default_bottom_margin"
-              c:identifier="gtk_paper_size_get_default_bottom_margin">
+      <method name="set_label_widget"
+              c:identifier="gtk_tool_button_set_label_widget">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="label_widget" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_default_left_margin"
-              c:identifier="gtk_paper_size_get_default_left_margin">
+      <method name="get_label_widget"
+              c:identifier="gtk_tool_button_get_label_widget">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
-          </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="button">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_default_right_margin"
-              c:identifier="gtk_paper_size_get_default_right_margin">
+      <property name="label">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="use-underline">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="label-widget">
+        <type name="Widget" c:type="GtkWidget"/>
+      </property>
+      <property name="stock-id">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="icon-name">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="icon-widget">
+        <type name="Widget" c:type="GtkWidget"/>
+      </property>
+      <field name="button_type">
+        <type name="GObject.Type" c:type="GType"/>
+      </field>
+      <callback name="clicked" c:type="clicked">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
-          </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="tool_item">
+            <type name="ToolButton" c:type="GtkToolButton*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="to_key_file" c:identifier="gtk_paper_size_to_key_file">
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
-          </parameter>
-          <parameter name="key_file">
-            <type name="GKeyFile" c:type="GKeyFile*"/>
-          </parameter>
-          <parameter name="group_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </glib:boxed>
-    <function name="paper_size_get_paper_sizes"
-              c:identifier="gtk_paper_size_get_paper_sizes">
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="clicked">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <record name="ToolButtonPrivate" c:type="GtkToolButtonPrivate"/>
+    <function name="tool_button_new" c:identifier="gtk_tool_button_new">
       <return-value>
-        <type name="GLib.GList" c:type="GList*"/>
+        <type name="ToolItem" c:type="GtkToolItem*"/>
       </return-value>
       <parameters>
-        <parameter name="include_custom">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="icon_widget" allow-none="1">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="label" allow-none="1">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="paper_size_get_default"
-              c:identifier="gtk_paper_size_get_default">
+    <function name="tool_button_new_from_stock"
+              c:identifier="gtk_tool_button_new_from_stock">
       <return-value>
-        <type name="string" c:type="gchar*"/>
+        <type name="ToolItem" c:type="GtkToolItem*"/>
       </return-value>
+      <parameters>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
     </function>
-    <class name="PageSetup"
-           c:type="GtkPageSetup"
-           parent="GObject.Object"
-           glib:type-name="GtkPageSetup"
-           glib:get-type="gtk_page_setup_get_type">
-      <constructor name="new" c:identifier="gtk_page_setup_new">
+    <function name="tool_button_get_button"
+              c:identifier="_gtk_tool_button_get_button">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="button">
+          <type name="ToolButton" c:type="GtkToolButton*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="MenuToolButton"
+           c:type="GtkMenuToolButton"
+           parent="ToolButton"
+           glib:type-name="GtkMenuToolButton"
+           glib:get-type="gtk_menu_tool_button_get_type">
+      <method name="set_menu" c:identifier="gtk_menu_tool_button_set_menu">
         <return-value>
-          <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </constructor>
-      <constructor name="copy" c:identifier="gtk_page_setup_copy">
+        <parameters>
+          <parameter name="button">
+            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
+          </parameter>
+          <parameter name="menu">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_menu" c:identifier="gtk_menu_tool_button_get_menu">
         <return-value>
-          <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="other">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="button">
+            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="new_from_file"
-                   c:identifier="gtk_page_setup_new_from_file">
+      </method>
+      <method name="set_arrow_tooltip"
+              c:identifier="gtk_menu_tool_button_set_arrow_tooltip">
         <return-value>
-          <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="file_name">
+          <parameter name="button">
+            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
+          </parameter>
+          <parameter name="tooltips">
+            <type name="Tooltips" c:type="GtkTooltips*"/>
+          </parameter>
+          <parameter name="tip_text" allow-none="1">
             <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="tip_private" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="new_from_key_file"
-                   c:identifier="gtk_page_setup_new_from_key_file">
+      </method>
+      <method name="set_arrow_tooltip_text"
+              c:identifier="gtk_menu_tool_button_set_arrow_tooltip_text">
         <return-value>
-          <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="key_file">
-            <type name="GKeyFile" c:type="GKeyFile*"/>
+          <parameter name="button">
+            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
           </parameter>
-          <parameter name="group_name">
+          <parameter name="text">
             <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
-          </parameter>
         </parameters>
-      </constructor>
-      <method name="get_orientation"
-              c:identifier="gtk_page_setup_get_orientation">
+      </method>
+      <method name="set_arrow_tooltip_markup"
+              c:identifier="gtk_menu_tool_button_set_arrow_tooltip_markup">
         <return-value>
-          <type name="PageOrientation" c:type="GtkPageOrientation"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="button">
+            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
+          </parameter>
+          <parameter name="markup">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_orientation"
-              c:identifier="gtk_page_setup_set_orientation">
+      <property name="menu">
+        <type name="Menu" c:type="GtkMenu"/>
+      </property>
+      <callback name="show_menu" c:type="show_menu">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="button">
+            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
           </parameter>
-          <parameter name="orientation">
-            <type name="PageOrientation" c:type="GtkPageOrientation"/>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="show-menu">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <record name="MenuToolButtonPrivate" c:type="GtkMenuToolButtonPrivate"/>
+    <function name="menu_tool_button_new"
+              c:identifier="gtk_menu_tool_button_new">
+      <return-value>
+        <type name="ToolItem" c:type="GtkToolItem*"/>
+      </return-value>
+      <parameters>
+        <parameter name="icon_widget">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="menu_tool_button_new_from_stock"
+              c:identifier="gtk_menu_tool_button_new_from_stock">
+      <return-value>
+        <type name="ToolItem" c:type="GtkToolItem*"/>
+      </return-value>
+      <parameters>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="MessageDialog"
+           c:type="GtkMessageDialog"
+           parent="Dialog"
+           glib:type-name="GtkMessageDialog"
+           glib:get-type="gtk_message_dialog_get_type">
+      <method name="set_image" c:identifier="gtk_message_dialog_set_image">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="dialog">
+            <type name="MessageDialog" c:type="GtkMessageDialog*"/>
+          </parameter>
+          <parameter name="image">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_paper_size"
-              c:identifier="gtk_page_setup_get_paper_size">
+      <method name="set_markup" c:identifier="gtk_message_dialog_set_markup">
         <return-value>
-          <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="message_dialog">
+            <type name="MessageDialog" c:type="GtkMessageDialog*"/>
+          </parameter>
+          <parameter name="str">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_paper_size"
-              c:identifier="gtk_page_setup_set_paper_size">
+      <method name="format_secondary_text"
+              c:identifier="gtk_message_dialog_format_secondary_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="message_dialog">
+            <type name="MessageDialog" c:type="GtkMessageDialog*"/>
           </parameter>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="message_format">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_top_margin"
-              c:identifier="gtk_page_setup_get_top_margin">
+      <method name="format_secondary_markup"
+              c:identifier="gtk_message_dialog_format_secondary_markup">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="message_dialog">
+            <type name="MessageDialog" c:type="GtkMessageDialog*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="message_format">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_top_margin"
-              c:identifier="gtk_page_setup_set_top_margin">
+      <property name="message-type">
+        <type name="MessageType" c:type="GtkMessageType"/>
+      </property>
+      <property name="buttons">
+        <type name="ButtonsType" c:type="GtkButtonsType"/>
+      </property>
+      <property name="text">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="use-markup">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="secondary-text">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="secondary-use-markup">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="image">
+        <type name="Widget" c:type="GtkWidget"/>
+      </property>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <function name="message_dialog_new" c:identifier="gtk_message_dialog_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="parent" allow-none="1">
+          <type name="Window" c:type="GtkWindow*"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="DialogFlags" c:type="GtkDialogFlags"/>
+        </parameter>
+        <parameter name="type">
+          <type name="MessageType" c:type="GtkMessageType"/>
+        </parameter>
+        <parameter name="buttons">
+          <type name="ButtonsType" c:type="GtkButtonsType"/>
+        </parameter>
+        <parameter name="message_format" allow-none="1">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="message_dialog_new_with_markup"
+              c:identifier="gtk_message_dialog_new_with_markup">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="parent">
+          <type name="Window" c:type="GtkWindow*"/>
+        </parameter>
+        <parameter name="flags">
+          <type name="DialogFlags" c:type="GtkDialogFlags"/>
+        </parameter>
+        <parameter name="type">
+          <type name="MessageType" c:type="GtkMessageType"/>
+        </parameter>
+        <parameter name="buttons">
+          <type name="ButtonsType" c:type="GtkButtonsType"/>
+        </parameter>
+        <parameter name="message_format">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="find_module" c:identifier="_gtk_find_module">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="type">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="get_module_path" c:identifier="_gtk_get_module_path">
+      <return-value>
+        <type name="GLib.char" c:type="gchar**"/>
+      </return-value>
+      <parameters>
+        <parameter name="type">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="modules_init" c:identifier="_gtk_modules_init">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="argc">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+        <parameter name="argv">
+          <type name="GLib.char" c:type="gchar***"/>
+        </parameter>
+        <parameter name="gtk_modules_args">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="modules_settings_changed"
+              c:identifier="_gtk_modules_settings_changed">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="settings">
+          <type name="Settings" c:type="GtkSettings*"/>
+        </parameter>
+        <parameter name="modules">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <callback name="ModuleInitFunc" c:type="GtkModuleInitFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="argc">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+        <parameter name="argv">
+          <type name="GLib.char" c:type="gchar***"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="ModuleDisplayInitFunc" c:type="GtkModuleDisplayInitFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="display">
+          <type name="Gdk.Display" c:type="GdkDisplay*"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <class name="Notebook"
+           c:type="GtkNotebook"
+           parent="Container"
+           glib:type-name="GtkNotebook"
+           glib:get-type="gtk_notebook_get_type">
+      <method name="append_page" c:identifier="gtk_notebook_append_page">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="margin">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="tab_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_bottom_margin"
-              c:identifier="gtk_page_setup_get_bottom_margin">
+      <method name="append_page_menu"
+              c:identifier="gtk_notebook_append_page_menu">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="tab_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="menu_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_bottom_margin"
-              c:identifier="gtk_page_setup_set_bottom_margin">
+      <method name="prepend_page" c:identifier="gtk_notebook_prepend_page">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="margin">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="tab_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_left_margin"
-              c:identifier="gtk_page_setup_get_left_margin">
+      <method name="prepend_page_menu"
+              c:identifier="gtk_notebook_prepend_page_menu">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="tab_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="menu_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_left_margin"
-              c:identifier="gtk_page_setup_set_left_margin">
+      <method name="insert_page" c:identifier="gtk_notebook_insert_page">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="margin">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="tab_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_right_margin"
-              c:identifier="gtk_page_setup_get_right_margin">
+      <method name="insert_page_menu"
+              c:identifier="gtk_notebook_insert_page_menu">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="set_right_margin"
-              c:identifier="gtk_page_setup_set_right_margin">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="tab_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="margin">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="menu_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_paper_size_and_default_margins"
-              c:identifier="gtk_page_setup_set_paper_size_and_default_margins">
+      <method name="remove_page" c:identifier="gtk_notebook_remove_page">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="page_num">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_paper_width"
-              c:identifier="gtk_page_setup_get_paper_width">
+      <method name="set_group_id" c:identifier="gtk_notebook_set_group_id">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="group_id">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_paper_height"
-              c:identifier="gtk_page_setup_get_paper_height">
+      <method name="get_group_id" c:identifier="gtk_notebook_get_group_id">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
-          </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_page_width"
-              c:identifier="gtk_page_setup_get_page_width">
+      <method name="set_group" c:identifier="gtk_notebook_set_group">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="group">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_page_height"
-              c:identifier="gtk_page_setup_get_page_height">
+      <method name="get_group" c:identifier="gtk_notebook_get_group">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="any" c:type="gpointer"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
-          </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="to_file" c:identifier="gtk_page_setup_to_file">
+      <method name="get_current_page"
+              c:identifier="gtk_notebook_get_current_page">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
-          </parameter>
-          <parameter name="file_name">
-            <type name="string" c:type="char*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="to_key_file" c:identifier="gtk_page_setup_to_key_file">
+      <method name="get_nth_page" c:identifier="gtk_notebook_get_nth_page">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
-          </parameter>
-          <parameter name="key_file">
-            <type name="GKeyFile" c:type="GKeyFile*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="group_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="page_num">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-    </class>
-    <callback name="GtkPrintSettingsFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="key">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="value">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <record name="GtkPageRange" c:type="GtkPageRange">
-      <field name="start">
-        <type name="int32" c:type="gint"/>
-      </field>
-      <field name="end">
-        <type name="int32" c:type="gint"/>
-      </field>
-    </record>
-    <class name="PrintSettings"
-           c:type="GtkPrintSettings"
-           parent="GObject.Object"
-           glib:type-name="GtkPrintSettings"
-           glib:get-type="gtk_print_settings_get_type">
-      <constructor name="new" c:identifier="gtk_print_settings_new">
-        <return-value>
-          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-        </return-value>
-      </constructor>
-      <constructor name="copy" c:identifier="gtk_print_settings_copy">
-        <return-value>
-          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-        </return-value>
-        <parameters>
-          <parameter name="other">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="new_from_file"
-                   c:identifier="gtk_print_settings_new_from_file">
-        <return-value>
-          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-        </return-value>
-        <parameters>
-          <parameter name="file_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="new_from_key_file"
-                   c:identifier="gtk_print_settings_new_from_key_file">
+      <method name="get_n_pages" c:identifier="gtk_notebook_get_n_pages">
         <return-value>
-          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="key_file">
-            <type name="GKeyFile" c:type="GKeyFile*"/>
-          </parameter>
-          <parameter name="group_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="to_file" c:identifier="gtk_print_settings_to_file">
+      </method>
+      <method name="page_num" c:identifier="gtk_notebook_page_num">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="file_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="to_key_file" c:identifier="gtk_print_settings_to_key_file">
+      <method name="set_current_page"
+              c:identifier="gtk_notebook_set_current_page">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key_file">
-            <type name="GKeyFile" c:type="GKeyFile*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="group_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="page_num">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="has_key" c:identifier="gtk_print_settings_has_key">
+      <method name="next_page" c:identifier="gtk_notebook_next_page">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get" c:identifier="gtk_print_settings_get">
+      <method name="prev_page" c:identifier="gtk_notebook_prev_page">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set" c:identifier="gtk_print_settings_set">
+      <method name="set_show_border"
+              c:identifier="gtk_notebook_set_show_border">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="value" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="show_border">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unset" c:identifier="gtk_print_settings_unset">
+      <method name="get_show_border"
+              c:identifier="gtk_notebook_get_show_border">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="foreach" c:identifier="gtk_print_settings_foreach">
+      <method name="set_show_tabs" c:identifier="gtk_notebook_set_show_tabs">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="func">
-            <type name="GtkPrintSettingsFunc" c:type="GtkPrintSettingsFunc"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="user_data" allow-none="1">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="show_tabs">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_bool" c:identifier="gtk_print_settings_get_bool">
+      <method name="get_show_tabs" c:identifier="gtk_notebook_get_show_tabs">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_bool" c:identifier="gtk_print_settings_set_bool">
+      <method name="set_tab_pos" c:identifier="gtk_notebook_set_tab_pos">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="value">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="pos">
+            <type name="PositionType" c:type="GtkPositionType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_double" c:identifier="gtk_print_settings_get_double">
+      <method name="get_tab_pos" c:identifier="gtk_notebook_get_tab_pos">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="PositionType" c:type="GtkPositionType"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_double_with_default"
-              c:identifier="gtk_print_settings_get_double_with_default">
+      <method name="set_homogeneous_tabs"
+              c:identifier="gtk_notebook_set_homogeneous_tabs">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="def">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="homogeneous">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_double" c:identifier="gtk_print_settings_set_double">
+      <method name="set_tab_border" c:identifier="gtk_notebook_set_tab_border">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="value">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="border_width">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_length" c:identifier="gtk_print_settings_get_length">
+      <method name="set_tab_hborder"
+              c:identifier="gtk_notebook_set_tab_hborder">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="tab_hborder">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_length" c:identifier="gtk_print_settings_set_length">
+      <method name="set_tab_vborder"
+              c:identifier="gtk_notebook_set_tab_vborder">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="tab_vborder">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_int" c:identifier="gtk_print_settings_get_int">
+      <method name="set_scrollable" c:identifier="gtk_notebook_set_scrollable">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="key">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="scrollable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_int_with_default"
-              c:identifier="gtk_print_settings_get_int_with_default">
+      <method name="get_scrollable" c:identifier="gtk_notebook_get_scrollable">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="def">
-            <type name="int32" c:type="gint"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_int" c:identifier="gtk_print_settings_set_int">
+      <method name="popup_enable" c:identifier="gtk_notebook_popup_enable">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="key">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="int32" c:type="gint"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_printer" c:identifier="gtk_print_settings_get_printer">
+      <method name="popup_disable" c:identifier="gtk_notebook_popup_disable">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_printer" c:identifier="gtk_print_settings_set_printer">
+      <method name="get_tab_label" c:identifier="gtk_notebook_get_tab_label">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="printer">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_orientation"
-              c:identifier="gtk_print_settings_get_orientation">
+      <method name="set_tab_label" c:identifier="gtk_notebook_set_tab_label">
         <return-value>
-          <type name="PageOrientation" c:type="GtkPageOrientation"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="tab_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_orientation"
-              c:identifier="gtk_print_settings_set_orientation">
+      <method name="set_tab_label_text"
+              c:identifier="gtk_notebook_set_tab_label_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="orientation">
-            <type name="PageOrientation" c:type="GtkPageOrientation"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="tab_text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_paper_size"
-              c:identifier="gtk_print_settings_get_paper_size">
+      <method name="get_tab_label_text"
+              c:identifier="gtk_notebook_get_tab_label_text">
         <return-value>
-          <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_paper_size"
-              c:identifier="gtk_print_settings_set_paper_size">
+      <method name="get_menu_label" c:identifier="gtk_notebook_get_menu_label">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="paper_size">
-            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_paper_width"
-              c:identifier="gtk_print_settings_get_paper_width">
+      <method name="set_menu_label" c:identifier="gtk_notebook_set_menu_label">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="menu_label" allow-none="1">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_paper_width"
-              c:identifier="gtk_print_settings_set_paper_width">
+      <method name="set_menu_label_text"
+              c:identifier="gtk_notebook_set_menu_label_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="width">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="menu_text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_paper_height"
-              c:identifier="gtk_print_settings_get_paper_height">
+      <method name="get_menu_label_text"
+              c:identifier="gtk_notebook_get_menu_label_text">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_paper_height"
-              c:identifier="gtk_print_settings_set_paper_height">
+      <method name="query_tab_label_packing"
+              c:identifier="gtk_notebook_query_tab_label_packing">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="height">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean*"/>
+          </parameter>
+          <parameter name="fill">
+            <type name="boolean" c:type="gboolean*"/>
+          </parameter>
+          <parameter name="pack_type">
+            <type name="PackType" c:type="GtkPackType*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_use_color"
-              c:identifier="gtk_print_settings_get_use_color">
+      <method name="set_tab_label_packing"
+              c:identifier="gtk_notebook_set_tab_label_packing">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="fill">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+          <parameter name="pack_type">
+            <type name="PackType" c:type="GtkPackType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_use_color"
-              c:identifier="gtk_print_settings_set_use_color">
+      <method name="reorder_child" c:identifier="gtk_notebook_reorder_child">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="use_color">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_collate" c:identifier="gtk_print_settings_get_collate">
+      <method name="get_tab_reorderable"
+              c:identifier="gtk_notebook_get_tab_reorderable">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_collate" c:identifier="gtk_print_settings_set_collate">
+      <method name="set_tab_reorderable"
+              c:identifier="gtk_notebook_set_tab_reorderable">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="collate">
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="reorderable">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_reverse" c:identifier="gtk_print_settings_get_reverse">
+      <method name="get_tab_detachable"
+              c:identifier="gtk_notebook_get_tab_detachable">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_reverse" c:identifier="gtk_print_settings_set_reverse">
+      <method name="set_tab_detachable"
+              c:identifier="gtk_notebook_set_tab_detachable">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="reverse">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_duplex" c:identifier="gtk_print_settings_get_duplex">
-        <return-value>
-          <type name="PrintDuplex" c:type="GtkPrintDuplex"/>
-        </return-value>
-        <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="detachable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_duplex" c:identifier="gtk_print_settings_set_duplex">
+      <property name="tab-pos">
+        <type name="PositionType" c:type="GtkPositionType"/>
+      </property>
+      <property name="show-tabs">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="show-border">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="scrollable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="tab-border">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="tab-hborder">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="tab-vborder">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="page">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="enable-popup">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="group-id">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="group">
+        <type name="any" c:type="gpointer"/>
+      </property>
+      <property name="homogeneous">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="switch_page" c:type="switch_page">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="duplex">
-            <type name="PrintDuplex" c:type="GtkPrintDuplex"/>
+          <parameter name="page">
+            <type name="NotebookPage" c:type="GtkNotebookPage*"/>
+          </parameter>
+          <parameter name="page_num">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_quality" c:identifier="gtk_print_settings_get_quality">
+      </callback>
+      <callback name="select_page" c:type="select_page">
         <return-value>
-          <type name="PrintQuality" c:type="GtkPrintQuality"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
+          </parameter>
+          <parameter name="move_focus">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_quality" c:identifier="gtk_print_settings_set_quality">
+      </callback>
+      <callback name="focus_tab" c:type="focus_tab">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="quality">
-            <type name="PrintQuality" c:type="GtkPrintQuality"/>
+          <parameter name="type">
+            <type name="NotebookTab" c:type="GtkNotebookTab"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_n_copies"
-              c:identifier="gtk_print_settings_get_n_copies">
+      </callback>
+      <callback name="change_current_page" c:type="change_current_page">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_n_copies"
-              c:identifier="gtk_print_settings_set_n_copies">
+      </callback>
+      <callback name="move_focus_out" c:type="move_focus_out">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="num_copies">
-            <type name="int32" c:type="gint"/>
+          <parameter name="direction">
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_number_up"
-              c:identifier="gtk_print_settings_get_number_up">
+      </callback>
+      <callback name="reorder_tab" c:type="reorder_tab">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
+          </parameter>
+          <parameter name="direction">
+            <type name="DirectionType" c:type="GtkDirectionType"/>
+          </parameter>
+          <parameter name="move_to_last">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_number_up"
-              c:identifier="gtk_print_settings_set_number_up">
+      </callback>
+      <callback name="insert_page" c:type="insert_page">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
           </parameter>
-          <parameter name="number_up">
-            <type name="int32" c:type="gint"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="tab_label">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="menu_label">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_resolution"
-              c:identifier="gtk_print_settings_get_resolution">
+      </callback>
+      <callback name="create_window" c:type="create_window">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="Notebook" c:type="GtkNotebook*"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="notebook">
+            <type name="Notebook" c:type="GtkNotebook*"/>
+          </parameter>
+          <parameter name="page">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_resolution"
-              c:identifier="gtk_print_settings_set_resolution">
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="switch-page">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="object">
+            <type name="any" c:type="gpointer"/>
           </parameter>
-          <parameter name="resolution">
-            <type name="int32" c:type="gint"/>
+          <parameter name="p0">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_scale" c:identifier="gtk_print_settings_get_scale">
+      </glib:signal>
+      <glib:signal name="focus-tab">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="object">
+            <type name="NotebookTab" c:type="GtkNotebookTab"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_scale" c:identifier="gtk_print_settings_set_scale">
+      </glib:signal>
+      <glib:signal name="select-page">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="scale">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="object">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_print_pages"
-              c:identifier="gtk_print_settings_get_print_pages">
+      </glib:signal>
+      <glib:signal name="change-current-page">
         <return-value>
-          <type name="PrintPages" c:type="GtkPrintPages"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_print_pages"
-              c:identifier="gtk_print_settings_set_print_pages">
+      </glib:signal>
+      <glib:signal name="move-focus-out">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="pages">
-            <type name="PrintPages" c:type="GtkPrintPages"/>
+          <parameter name="object">
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_page_ranges"
-              c:identifier="gtk_print_settings_get_page_ranges">
+      </glib:signal>
+      <glib:signal name="reorder-tab">
         <return-value>
-          <type name="GtkPageRange" c:type="GtkPageRange*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="object">
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
-          <parameter name="num_ranges">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="p0">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_page_ranges"
-              c:identifier="gtk_print_settings_set_page_ranges">
+      </glib:signal>
+      <glib:signal name="page-reordered">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="page_ranges">
-            <type name="GtkPageRange" c:type="GtkPageRange*"/>
+          <parameter name="object">
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
-          <parameter name="num_ranges">
-            <type name="int32" c:type="gint"/>
+          <parameter name="p0">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_page_set"
-              c:identifier="gtk_print_settings_get_page_set">
+      </glib:signal>
+      <glib:signal name="page-removed">
         <return-value>
-          <type name="PageSet" c:type="GtkPageSet"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="object">
+            <type name="Widget" c:type="GtkWidget"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_page_set"
-              c:identifier="gtk_print_settings_set_page_set">
+      </glib:signal>
+      <glib:signal name="page-added">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="object">
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
-          <parameter name="page_set">
-            <type name="PageSet" c:type="GtkPageSet"/>
+          <parameter name="p0">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_default_source"
-              c:identifier="gtk_print_settings_get_default_source">
+      </glib:signal>
+      <glib:signal name="create-window">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="Notebook" c:type="GtkNotebook"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="object">
+            <type name="Widget" c:type="GtkWidget"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_default_source"
-              c:identifier="gtk_print_settings_set_default_source">
+      </glib:signal>
+    </class>
+    <record name="NotebookPage" c:type="GtkNotebookPage"/>
+    <callback name="NotebookWindowCreationFunc"
+              c:type="GtkNotebookWindowCreationFunc">
+      <return-value>
+        <type name="Notebook" c:type="GtkNotebook*"/>
+      </return-value>
+      <parameters>
+        <parameter name="source">
+          <type name="Notebook" c:type="GtkNotebook*"/>
+        </parameter>
+        <parameter name="page">
+          <type name="Widget" c:type="GtkWidget*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <function name="notebook_new" c:identifier="gtk_notebook_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <function name="notebook_set_window_creation_hook"
+              c:identifier="gtk_notebook_set_window_creation_hook">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="func">
+          <type name="NotebookWindowCreationFunc"
+                c:type="GtkNotebookWindowCreationFunc"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="destroy">
+          <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="OldEditable"
+           c:type="GtkOldEditable"
+           parent="Widget"
+           glib:type-name="GtkOldEditable"
+           glib:get-type="gtk_old_editable_get_type">
+      <method name="claim_selection"
+              c:identifier="gtk_old_editable_claim_selection">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="old_editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
           </parameter>
-          <parameter name="default_source">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="claim">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_media_type"
-              c:identifier="gtk_print_settings_get_media_type">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="time_">
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_media_type"
-              c:identifier="gtk_print_settings_set_media_type">
+      <method name="changed" c:identifier="gtk_old_editable_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-          </parameter>
-          <parameter name="media_type">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="old_editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_dither" c:identifier="gtk_print_settings_get_dither">
+      <property name="text-position">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="editable">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="activate" c:type="activate">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_dither" c:identifier="gtk_print_settings_set_dither">
+      </callback>
+      <callback name="set_editable" c:type="set_editable">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
           </parameter>
-          <parameter name="dither">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="is_editable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_finishings"
-              c:identifier="gtk_print_settings_get_finishings">
+      </callback>
+      <callback name="move_cursor" c:type="move_cursor">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_finishings"
-              c:identifier="gtk_print_settings_set_finishings">
+      </callback>
+      <callback name="move_word" c:type="move_word">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
           </parameter>
-          <parameter name="finishings">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="n">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_output_bin"
-              c:identifier="gtk_print_settings_get_output_bin">
+      </callback>
+      <callback name="move_page" c:type="move_page">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_output_bin"
-              c:identifier="gtk_print_settings_set_output_bin">
+      </callback>
+      <callback name="move_to_row" c:type="move_to_row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
           </parameter>
-          <parameter name="output_bin">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-    </class>
-    <class name="PrintContext"
-           c:type="GtkPrintContext"
-           parent="GObject.Object"
-           glib:type-name="GtkPrintContext"
-           glib:get-type="gtk_print_context_get_type">
-      <method name="get_cairo_context"
-              c:identifier="gtk_print_context_get_cairo_context">
+      </callback>
+      <callback name="move_to_column" c:type="move_to_column">
         <return-value>
-          <type name="Cairo.cairo_t" c:type="cairo_t*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_page_setup"
-              c:identifier="gtk_print_context_get_page_setup">
-        <return-value>
-          <type name="PageSetup" c:type="GtkPageSetup*"/>
-        </return-value>
-        <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_width" c:identifier="gtk_print_context_get_width">
+      </callback>
+      <callback name="kill_char" c:type="kill_char">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_height" c:identifier="gtk_print_context_get_height">
-        <return-value>
-          <type name="double" c:type="gdouble"/>
-        </return-value>
-        <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="direction">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_dpi_x" c:identifier="gtk_print_context_get_dpi_x">
+      </callback>
+      <callback name="kill_word" c:type="kill_word">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_dpi_y" c:identifier="gtk_print_context_get_dpi_y">
-        <return-value>
-          <type name="double" c:type="gdouble"/>
-        </return-value>
-        <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="direction">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_pango_fontmap"
-              c:identifier="gtk_print_context_get_pango_fontmap">
+      </callback>
+      <callback name="kill_line" c:type="kill_line">
         <return-value>
-          <type name="Pango.FontMap" c:type="PangoFontMap*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
+          </parameter>
+          <parameter name="direction">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="create_pango_context"
-              c:identifier="gtk_print_context_create_pango_context">
+      </callback>
+      <callback name="cut_clipboard" c:type="cut_clipboard">
         <return-value>
-          <type name="Pango.Context" c:type="PangoContext*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="create_pango_layout"
-              c:identifier="gtk_print_context_create_pango_layout">
+      </callback>
+      <callback name="copy_clipboard" c:type="copy_clipboard">
         <return-value>
-          <type name="Pango.Layout" c:type="PangoLayout*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_cairo_context"
-              c:identifier="gtk_print_context_set_cairo_context">
+      </callback>
+      <callback name="paste_clipboard" c:type="paste_clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
-          </parameter>
-          <parameter name="cr">
-            <type name="Cairo.cairo_t" c:type="cairo_t*"/>
-          </parameter>
-          <parameter name="dpi_x">
-            <type name="double" c:type="double"/>
-          </parameter>
-          <parameter name="dpi_y">
-            <type name="double" c:type="double"/>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
           </parameter>
         </parameters>
-      </method>
-    </class>
-    <record name="GtkPrintOperationPreview" c:type="GtkPrintOperationPreview"/>
-    <interface name="PrintOperationPreview"
-               c:type="GtkPrintOperationPreview"
-               glib:type-name="GtkPrintOperationPreview"
-               glib:get-type="gtk_print_operation_preview_get_type">
-      <callback name="ready">
+      </callback>
+      <callback name="update_text" c:type="update_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="preview">
-            <type name="PrintOperationPreview"
-                  c:type="GtkPrintOperationPreview*"/>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
           </parameter>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="start_pos">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="end_pos">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="got_page_size">
+      <callback name="get_chars" c:type="get_chars">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="preview">
-            <type name="PrintOperationPreview"
-                  c:type="GtkPrintOperationPreview*"/>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
           </parameter>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="start_pos">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="page_setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="end_pos">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="render_page">
+      <callback name="set_selection" c:type="set_selection">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="preview">
-            <type name="PrintOperationPreview"
-                  c:type="GtkPrintOperationPreview*"/>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
           </parameter>
-          <parameter name="page_nr">
-            <type name="int32" c:type="gint"/>
+          <parameter name="start_pos">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="end_pos">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="is_selected">
+      <callback name="set_position" c:type="set_position">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="preview">
-            <type name="PrintOperationPreview"
-                  c:type="GtkPrintOperationPreview*"/>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
           </parameter>
-          <parameter name="page_nr">
-            <type name="int32" c:type="gint"/>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="end_preview">
+      <glib:signal name="move-cursor">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="preview">
-            <type name="PrintOperationPreview"
-                  c:type="GtkPrintOperationPreview*"/>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
           </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">
+      </glib:signal>
+      <glib:signal name="copy-clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+      </glib:signal>
+      <glib:signal name="activate">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved5">
+      </glib:signal>
+      <glib:signal name="cut-clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved6">
+      </glib:signal>
+      <glib:signal name="paste-clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved7">
+      </glib:signal>
+      <glib:signal name="set-editable">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <glib:signal name="ready">
+        <parameters>
+          <parameter name="object">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="move-word">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="PrintContext" c:type="GtkPrintContext"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="got-page-size">
+      <glib:signal name="move-page">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="PrintContext" c:type="GtkPrintContext"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="p0">
-            <type name="PageSetup" c:type="GtkPageSetup"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </glib:signal>
-    </interface>
-    <function name="print_operation_preview_render_page"
-              c:identifier="gtk_print_operation_preview_render_page">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="preview">
-          <type name="PrintOperationPreview"
-                c:type="GtkPrintOperationPreview*"/>
-        </parameter>
-        <parameter name="page_nr">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="print_operation_preview_end_preview"
-              c:identifier="gtk_print_operation_preview_end_preview">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="preview">
-          <type name="PrintOperationPreview"
-                c:type="GtkPrintOperationPreview*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="print_operation_preview_is_selected"
-              c:identifier="gtk_print_operation_preview_is_selected">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="preview">
-          <type name="PrintOperationPreview"
-                c:type="GtkPrintOperationPreview*"/>
-        </parameter>
-        <parameter name="page_nr">
-          <type name="int32" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkPrintOperationPrivate" c:type="GtkPrintOperationPrivate"/>
-    <function name="print_error_quark" c:identifier="gtk_print_error_quark">
-      <return-value>
-        <type name="GLib.GQuark" c:type="GQuark"/>
-      </return-value>
-    </function>
-    <class name="PrintOperation"
-           c:type="GtkPrintOperation"
-           parent="GObject.Object"
-           glib:type-name="GtkPrintOperation"
-           glib:get-type="gtk_print_operation_get_type">
-      <constructor name="new" c:identifier="gtk_print_operation_new">
-        <return-value>
-          <type name="PrintOperation" c:type="GtkPrintOperation*"/>
-        </return-value>
-      </constructor>
-      <method name="set_default_page_setup"
-              c:identifier="gtk_print_operation_set_default_page_setup">
+      <glib:signal name="move-to-row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
-          </parameter>
-          <parameter name="default_page_setup" allow-none="1">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_default_page_setup"
-              c:identifier="gtk_print_operation_get_default_page_setup">
+      </glib:signal>
+      <glib:signal name="move-to-column">
         <return-value>
-          <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_print_settings"
-              c:identifier="gtk_print_operation_set_print_settings">
+      </glib:signal>
+      <glib:signal name="kill-char">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
-          </parameter>
-          <parameter name="print_settings" allow-none="1">
-            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_print_settings"
-              c:identifier="gtk_print_operation_get_print_settings">
+      </glib:signal>
+      <glib:signal name="kill-word">
         <return-value>
-          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_job_name"
-              c:identifier="gtk_print_operation_set_job_name">
+      </glib:signal>
+      <glib:signal name="kill-line">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="job_name">
-            <type name="string" c:type="gchar*"/>
+        </parameters>
+      </glib:signal>
+    </class>
+    <callback name="TextFunction" c:type="GtkTextFunction">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="editable">
+          <type name="OldEditable" c:type="GtkOldEditable*"/>
+        </parameter>
+        <parameter name="time_">
+          <type name="uint32" c:type="guint32"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <class name="OptionMenu"
+           c:type="GtkOptionMenu"
+           parent="Button"
+           glib:type-name="GtkOptionMenu"
+           glib:get-type="gtk_option_menu_get_type">
+      <method name="get_menu" c:identifier="gtk_option_menu_get_menu">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="option_menu">
+            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_n_pages"
-              c:identifier="gtk_print_operation_set_n_pages">
+      <method name="set_menu" c:identifier="gtk_option_menu_set_menu">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="option_menu">
+            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
           </parameter>
-          <parameter name="n_pages">
-            <type name="int32" c:type="gint"/>
+          <parameter name="menu">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_current_page"
-              c:identifier="gtk_print_operation_set_current_page">
+      <method name="remove_menu" c:identifier="gtk_option_menu_remove_menu">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
-          </parameter>
-          <parameter name="current_page">
-            <type name="int32" c:type="gint"/>
+          <parameter name="option_menu">
+            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_use_full_page"
-              c:identifier="gtk_print_operation_set_use_full_page">
+      <method name="get_history" c:identifier="gtk_option_menu_get_history">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
-          </parameter>
-          <parameter name="full_page">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="option_menu">
+            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_unit" c:identifier="gtk_print_operation_set_unit">
+      <method name="set_history" c:identifier="gtk_option_menu_set_history">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="option_menu">
+            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
           </parameter>
-          <parameter name="unit">
-            <type name="Unit" c:type="GtkUnit"/>
+          <parameter name="index_">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_export_filename"
-              c:identifier="gtk_print_operation_set_export_filename">
+      <property name="menu">
+        <type name="Menu" c:type="GtkMenu"/>
+      </property>
+      <callback name="changed" c:type="changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
-          </parameter>
-          <parameter name="filename">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="option_menu">
+            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_track_print_status"
-              c:identifier="gtk_print_operation_set_track_print_status">
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_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>
+    <function name="option_menu_new" c:identifier="gtk_option_menu_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="Pixmap"
+           c:type="GtkPixmap"
+           parent="Misc"
+           glib:type-name="GtkPixmap"
+           glib:get-type="gtk_pixmap_get_type">
+      <method name="set" c:identifier="gtk_pixmap_set">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="pixmap">
+            <type name="Pixmap" c:type="GtkPixmap*"/>
           </parameter>
-          <parameter name="track_status">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="val">
+            <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+          </parameter>
+          <parameter name="mask" allow-none="1">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_show_progress"
-              c:identifier="gtk_print_operation_set_show_progress">
+      <method name="get" c:identifier="gtk_pixmap_get">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="pixmap">
+            <type name="Pixmap" c:type="GtkPixmap*"/>
           </parameter>
-          <parameter name="show_progress">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="val">
+            <type name="Gdk.Pixmap" c:type="GdkPixmap**"/>
+          </parameter>
+          <parameter name="mask">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_allow_async"
-              c:identifier="gtk_print_operation_set_allow_async">
+      <method name="set_build_insensitive"
+              c:identifier="gtk_pixmap_set_build_insensitive">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="pixmap">
+            <type name="Pixmap" c:type="GtkPixmap*"/>
           </parameter>
-          <parameter name="allow_async">
+          <parameter name="build">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_custom_tab_label"
-              c:identifier="gtk_print_operation_set_custom_tab_label">
+    </class>
+    <function name="pixmap_new" c:identifier="gtk_pixmap_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="pixmap">
+          <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
+        </parameter>
+        <parameter name="mask" allow-none="1">
+          <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="Socket"
+           c:type="GtkSocket"
+           parent="Container"
+           glib:type-name="GtkSocket"
+           glib:get-type="gtk_socket_get_type">
+      <method name="add_id" c:identifier="gtk_socket_add_id">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="socket_">
+            <type name="Socket" c:type="GtkSocket*"/>
           </parameter>
-          <parameter name="label">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="window_id">
+            <type name="Gdk.NativeWindow" c:type="GdkNativeWindow"/>
           </parameter>
         </parameters>
       </method>
-      <method name="run" c:identifier="gtk_print_operation_run">
+      <method name="get_id" c:identifier="gtk_socket_get_id">
         <return-value>
-          <type name="PrintOperationResult" c:type="GtkPrintOperationResult"/>
+          <type name="Gdk.NativeWindow" c:type="GdkNativeWindow"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
-          </parameter>
-          <parameter name="action">
-            <type name="PrintOperationAction"
-                  c:type="GtkPrintOperationAction"/>
-          </parameter>
-          <parameter name="parent" allow-none="1">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="socket_">
+            <type name="Socket" c:type="GtkSocket*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_error" c:identifier="gtk_print_operation_get_error">
+      <method name="steal" c:identifier="gtk_socket_steal">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="socket_">
+            <type name="Socket" c:type="GtkSocket*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="wid">
+            <type name="Gdk.NativeWindow" c:type="GdkNativeWindow"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_status" c:identifier="gtk_print_operation_get_status">
+      <callback name="plug_added" c:type="plug_added">
         <return-value>
-          <type name="PrintStatus" c:type="GtkPrintStatus"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="socket_">
+            <type name="Socket" c:type="GtkSocket*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_status_string"
-              c:identifier="gtk_print_operation_get_status_string">
+      </callback>
+      <callback name="plug_removed" c:type="plug_removed">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="socket_">
+            <type name="Socket" c:type="GtkSocket*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="is_finished"
-              c:identifier="gtk_print_operation_is_finished">
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="plug-added">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="plug-removed">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
+      </glib:signal>
+    </class>
+    <function name="socket_new" c:identifier="gtk_socket_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <class name="Plug"
+           c:type="GtkPlug"
+           parent="Window"
+           glib:type-name="GtkPlug"
+           glib:get-type="gtk_plug_get_type">
+      <method name="construct" c:identifier="gtk_plug_construct">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="plug">
+            <type name="Plug" c:type="GtkPlug*"/>
+          </parameter>
+          <parameter name="socket_id">
+            <type name="Gdk.NativeWindow" c:type="GdkNativeWindow"/>
           </parameter>
         </parameters>
       </method>
-      <method name="cancel" c:identifier="gtk_print_operation_cancel">
+      <method name="construct_for_display"
+              c:identifier="gtk_plug_construct_for_display">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="op">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="plug">
+            <type name="Plug" c:type="GtkPlug*"/>
+          </parameter>
+          <parameter name="display">
+            <type name="Gdk.Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="socket_id">
+            <type name="Gdk.NativeWindow" c:type="GdkNativeWindow"/>
           </parameter>
         </parameters>
       </method>
-      <property name="default-page-setup">
-        <type name="PageSetup" c:type="GtkPageSetup"/>
-      </property>
-      <property name="print-settings">
-        <type name="PrintSettings" c:type="GtkPrintSettings"/>
-      </property>
-      <property name="job-name">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="n-pages">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="current-page">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="use-full-page">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="track-print-status">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="unit">
-        <type name="Unit" c:type="GtkUnit"/>
-      </property>
-      <property name="show-progress">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="allow-async">
+      <method name="get_id" c:identifier="gtk_plug_get_id">
+        <return-value>
+          <type name="Gdk.NativeWindow" c:type="GdkNativeWindow"/>
+        </return-value>
+        <parameters>
+          <parameter name="plug">
+            <type name="Plug" c:type="GtkPlug*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="embedded">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="export-filename">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="status">
-        <type name="PrintStatus" c:type="GtkPrintStatus"/>
-      </property>
-      <property name="status-string">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="custom-tab-label">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <callback name="done">
+      <callback name="embedded" c:type="embedded">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
-          </parameter>
-          <parameter name="result">
-            <type name="PrintOperationResult"
-                  c:type="GtkPrintOperationResult"/>
+          <parameter name="plug">
+            <type name="Plug" c:type="GtkPlug*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="begin_print">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="operation">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
-          </parameter>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="paginate">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="embedded">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="plug_new" c:identifier="gtk_plug_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="socket_id">
+          <type name="Gdk.NativeWindow" c:type="GdkNativeWindow"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="plug_new_for_display"
+              c:identifier="gtk_plug_new_for_display">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="display">
+          <type name="Gdk.Display" c:type="GdkDisplay*"/>
+        </parameter>
+        <parameter name="socket_id">
+          <type name="Gdk.NativeWindow" c:type="GdkNativeWindow"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="plug_add_to_socket" c:identifier="_gtk_plug_add_to_socket">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="plug">
+          <type name="Plug" c:type="GtkPlug*"/>
+        </parameter>
+        <parameter name="socket_">
+          <type name="Socket" c:type="GtkSocket*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="plug_remove_from_socket"
+              c:identifier="_gtk_plug_remove_from_socket">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="plug">
+          <type name="Plug" c:type="GtkPlug*"/>
+        </parameter>
+        <parameter name="socket_">
+          <type name="Socket" c:type="GtkSocket*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="Preview"
+           c:type="GtkPreview"
+           parent="Widget"
+           glib:type-name="GtkPreview"
+           glib:get-type="gtk_preview_get_type">
+      <method name="size" c:identifier="gtk_preview_size">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="preview">
+            <type name="Preview" c:type="GtkPreview*"/>
           </parameter>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="width">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="height">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="request_page_setup">
+      </method>
+      <method name="put" c:identifier="gtk_preview_put">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="preview">
+            <type name="Preview" c:type="GtkPreview*"/>
           </parameter>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="window">
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
-          <parameter name="page_nr">
-            <type name="int32" c:type="gint"/>
+          <parameter name="gc">
+            <type name="Gdk.GC" c:type="GdkGC*"/>
           </parameter>
-          <parameter name="setup">
-            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          <parameter name="srcx">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="srcy">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="destx">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="desty">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="width">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="height">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="draw_page">
+      </method>
+      <method name="draw_row" c:identifier="gtk_preview_draw_row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="preview">
+            <type name="Preview" c:type="GtkPreview*"/>
           </parameter>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="data">
+            <type name="GLib.uchar" c:type="guchar*"/>
           </parameter>
-          <parameter name="page_nr">
-            <type name="int32" c:type="gint"/>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="w">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="end_print">
+      </method>
+      <method name="set_expand" c:identifier="gtk_preview_set_expand">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="preview">
+            <type name="Preview" c:type="GtkPreview*"/>
           </parameter>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="expand">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="status_changed">
+      </method>
+      <method name="set_dither" c:identifier="gtk_preview_set_dither">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="preview">
+            <type name="Preview" c:type="GtkPreview*"/>
+          </parameter>
+          <parameter name="dither">
+            <type name="Gdk.RgbDither" c:type="GdkRgbDither"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="create_custom_widget">
+      </method>
+      <property name="expand">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <field name="info">
+        <type name="PreviewInfo" c:type="GtkPreviewInfo"/>
+      </field>
+    </class>
+    <record name="PreviewInfo" c:type="GtkPreviewInfo">
+      <field name="lookup">
+        <type name="GLib.uchar" c:type="guchar*"/>
+      </field>
+      <field name="gamma">
+        <type name="double" c:type="gdouble"/>
+      </field>
+    </record>
+    <function name="preview_uninit" c:identifier="gtk_preview_uninit">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <function name="preview_new" c:identifier="gtk_preview_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="type">
+          <type name="PreviewType" c:type="GtkPreviewType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="preview_set_gamma" c:identifier="gtk_preview_set_gamma">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="gamma_">
+          <type name="double" c:type="double"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="preview_set_color_cube"
+              c:identifier="gtk_preview_set_color_cube">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="nred_shades">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="ngreen_shades">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="nblue_shades">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="ngray_shades">
+          <type name="uint" c:type="guint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="preview_set_install_cmap"
+              c:identifier="gtk_preview_set_install_cmap">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="install_cmap">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="preview_set_reserved"
+              c:identifier="gtk_preview_set_reserved">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="nreserved">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="preview_get_visual" c:identifier="gtk_preview_get_visual">
+      <return-value>
+        <type name="Gdk.Visual" c:type="GdkVisual*"/>
+      </return-value>
+    </function>
+    <function name="preview_get_cmap" c:identifier="gtk_preview_get_cmap">
+      <return-value>
+        <type name="Gdk.Colormap" c:type="GdkColormap*"/>
+      </return-value>
+    </function>
+    <function name="preview_get_info" c:identifier="gtk_preview_get_info">
+      <return-value>
+        <type name="PreviewInfo" c:type="GtkPreviewInfo*"/>
+      </return-value>
+    </function>
+    <function name="preview_reset" c:identifier="gtk_preview_reset">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <glib:boxed c:type="GtkPaperSize"
+                glib:name="PaperSize"
+                glib:type-name="GtkPaperSize"
+                glib:get-type="gtk_paper_size_get_type">
+      <constructor name="new" c:identifier="gtk_paper_size_new">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="PaperSize" c:type="GtkPaperSize*"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="name" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="custom_widget_apply">
+      </constructor>
+      <constructor name="new_from_ppd"
+                   c:identifier="gtk_paper_size_new_from_ppd">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="PaperSize" c:type="GtkPaperSize*"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="ppd_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="ppd_display_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="width">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="height">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="preview">
+      </constructor>
+      <constructor name="new_custom" c:identifier="gtk_paper_size_new_custom">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="PaperSize" c:type="GtkPaperSize*"/>
         </return-value>
         <parameters>
-          <parameter name="operation">
-            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="preview">
-            <type name="PrintOperationPreview"
-                  c:type="GtkPrintOperationPreview*"/>
+          <parameter name="display_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="context">
-            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          <parameter name="width">
+            <type name="double" c:type="gdouble"/>
           </parameter>
-          <parameter name="parent">
-            <type name="Window" c:type="GtkWindow*"/>
+          <parameter name="height">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </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">
+      </constructor>
+      <constructor name="copy" c:identifier="gtk_paper_size_copy">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="PaperSize" c:type="GtkPaperSize*"/>
         </return-value>
-      </callback>
-      <glib:signal name="done">
+        <parameters>
+          <parameter name="other">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="new_from_key_file"
+                   c:identifier="gtk_paper_size_new_from_key_file">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="PaperSize" c:type="GtkPaperSize*"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="PrintOperationResult"
-                  c:type="GtkPrintOperationResult"/>
+          <parameter name="key_file">
+            <type name="GLib.KeyFile" c:type="GKeyFile*"/>
+          </parameter>
+          <parameter name="group_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="begin-print">
+      </constructor>
+      <method name="free" c:identifier="gtk_paper_size_free">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="PrintContext" c:type="GtkPrintContext"/>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="paginate">
+      </method>
+      <method name="is_equal" c:identifier="gtk_paper_size_is_equal">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="PrintContext" c:type="GtkPrintContext"/>
+          <parameter name="size1">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+          <parameter name="size2">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="request-page-setup">
+      </method>
+      <method name="get_name" c:identifier="gtk_paper_size_get_name">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="PrintContext" c:type="GtkPrintContext"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="PageSetup" c:type="GtkPageSetup"/>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="draw-page">
+      </method>
+      <method name="get_display_name"
+              c:identifier="gtk_paper_size_get_display_name">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="PrintContext" c:type="GtkPrintContext"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="int32" c:type="gint"/>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="end-print">
+      </method>
+      <method name="get_ppd_name" c:identifier="gtk_paper_size_get_ppd_name">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="PrintContext" c:type="GtkPrintContext"/>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="status-changed">
+      </method>
+      <method name="get_width" c:identifier="gtk_paper_size_get_width">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="create-custom-widget">
+        <parameters>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_height" c:identifier="gtk_paper_size_get_height">
         <return-value>
-          <type name="GObject.Object" c:type="GObject"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="custom-widget-apply">
+        <parameters>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="is_custom" c:identifier="gtk_paper_size_is_custom">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Widget" c:type="GtkWidget"/>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="preview">
+      </method>
+      <method name="set_size" c:identifier="gtk_paper_size_set_size">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="PrintOperationPreview"
-                  c:type="GtkPrintOperationPreview"/>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="PrintContext" c:type="GtkPrintContext"/>
+          <parameter name="width">
+            <type name="double" c:type="gdouble"/>
           </parameter>
-          <parameter name="p1">
-            <type name="Window" c:type="GtkWindow"/>
+          <parameter name="height">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
-    <function name="print_run_page_setup_dialog"
-              c:identifier="gtk_print_run_page_setup_dialog">
-      <return-value>
-        <type name="PageSetup" c:type="GtkPageSetup*"/>
-      </return-value>
-      <parameters>
-        <parameter name="parent" allow-none="1">
-          <type name="Window" c:type="GtkWindow*"/>
-        </parameter>
-        <parameter name="page_setup" allow-none="1">
-          <type name="PageSetup" c:type="GtkPageSetup*"/>
-        </parameter>
-        <parameter name="settings">
-          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <callback name="GtkPageSetupDoneFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="page_setup">
-          <type name="PageSetup" c:type="GtkPageSetup*"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <function name="print_run_page_setup_dialog_async"
-              c:identifier="gtk_print_run_page_setup_dialog_async">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="parent">
-          <type name="Window" c:type="GtkWindow*"/>
-        </parameter>
-        <parameter name="page_setup">
-          <type name="PageSetup" c:type="GtkPageSetup*"/>
-        </parameter>
-        <parameter name="settings">
-          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
-        </parameter>
-        <parameter name="done_cb">
-          <type name="GtkPageSetupDoneFunc" c:type="GtkPageSetupDoneFunc"/>
-        </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="Progress"
-           c:type="GtkProgress"
-           parent="Widget"
-           glib:type-name="GtkProgress"
-           glib:get-type="gtk_progress_get_type">
-      <method name="set_show_text" c:identifier="gtk_progress_set_show_text">
+      </method>
+      <method name="get_default_top_margin"
+              c:identifier="gtk_paper_size_get_default_top_margin">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
           </parameter>
-          <parameter name="show_text">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_text_alignment"
-              c:identifier="gtk_progress_set_text_alignment">
+      <method name="get_default_bottom_margin"
+              c:identifier="gtk_paper_size_get_default_bottom_margin">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
-          </parameter>
-          <parameter name="x_align">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
           </parameter>
-          <parameter name="y_align">
-            <type name="float" c:type="gfloat"/>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_format_string"
-              c:identifier="gtk_progress_set_format_string">
+      <method name="get_default_left_margin"
+              c:identifier="gtk_paper_size_get_default_left_margin">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
           </parameter>
-          <parameter name="format">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_adjustment" c:identifier="gtk_progress_set_adjustment">
+      <method name="get_default_right_margin"
+              c:identifier="gtk_paper_size_get_default_right_margin">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
           </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </parameter>
         </parameters>
       </method>
-      <method name="configure" c:identifier="gtk_progress_configure">
+      <method name="to_key_file" c:identifier="gtk_paper_size_to_key_file">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
           </parameter>
-          <parameter name="hmin">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="key_file">
+            <type name="GLib.KeyFile" c:type="GKeyFile*"/>
           </parameter>
-          <parameter name="max">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="group_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_percentage" c:identifier="gtk_progress_set_percentage">
+    </glib:boxed>
+    <function name="paper_size_get_paper_sizes"
+              c:identifier="gtk_paper_size_get_paper_sizes">
+      <return-value>
+        <type name="GLib.List" c:type="GList*"/>
+      </return-value>
+      <parameters>
+        <parameter name="include_custom">
+          <type name="boolean" c:type="gboolean"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="paper_size_get_default"
+              c:identifier="gtk_paper_size_get_default">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+    </function>
+    <class name="PageSetup"
+           c:type="GtkPageSetup"
+           parent="GObject.Object"
+           glib:type-name="GtkPageSetup"
+           glib:get-type="gtk_page_setup_get_type">
+      <constructor name="new" c:identifier="gtk_page_setup_new">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
+        </return-value>
+      </constructor>
+      <constructor name="copy" c:identifier="gtk_page_setup_copy">
+        <return-value>
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="other">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
           </parameter>
-          <parameter name="percentage">
-            <type name="double" c:type="gdouble"/>
+        </parameters>
+      </constructor>
+      <constructor name="new_from_file"
+                   c:identifier="gtk_page_setup_new_from_file">
+        <return-value>
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
+        </return-value>
+        <parameters>
+          <parameter name="file_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_value" c:identifier="gtk_progress_set_value">
+      </constructor>
+      <constructor name="new_from_key_file"
+                   c:identifier="gtk_page_setup_new_from_key_file">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="key_file">
+            <type name="GLib.KeyFile" c:type="GKeyFile*"/>
           </parameter>
-          <parameter name="value">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="group_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_value" c:identifier="gtk_progress_get_value">
+      </constructor>
+      <method name="get_orientation"
+              c:identifier="gtk_page_setup_get_orientation">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="PageOrientation" c:type="GtkPageOrientation"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_activity_mode"
-              c:identifier="gtk_progress_set_activity_mode">
+      <method name="set_orientation"
+              c:identifier="gtk_page_setup_set_orientation">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
           </parameter>
-          <parameter name="activity_mode">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="orientation">
+            <type name="PageOrientation" c:type="GtkPageOrientation"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_current_text"
-              c:identifier="gtk_progress_get_current_text">
+      <method name="get_paper_size"
+              c:identifier="gtk_page_setup_get_paper_size">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="PaperSize" c:type="GtkPaperSize*"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_text_from_value"
-              c:identifier="gtk_progress_get_text_from_value">
+      <method name="set_paper_size"
+              c:identifier="gtk_page_setup_set_paper_size">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
           </parameter>
-          <parameter name="value">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_current_percentage"
-              c:identifier="gtk_progress_get_current_percentage">
+      <method name="get_top_margin"
+              c:identifier="gtk_page_setup_get_top_margin">
         <return-value>
           <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_percentage_from_value"
-              c:identifier="gtk_progress_get_percentage_from_value">
+      <method name="set_top_margin"
+              c:identifier="gtk_page_setup_set_top_margin">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
           </parameter>
-          <parameter name="value">
+          <parameter name="margin">
             <type name="double" c:type="gdouble"/>
           </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
         </parameters>
       </method>
-      <property name="activity-mode">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="show-text">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="text-xalign">
-        <type name="float" c:type="gfloat"/>
-      </property>
-      <property name="text-yalign">
-        <type name="float" c:type="gfloat"/>
-      </property>
-      <callback name="paint">
+      <method name="get_bottom_margin"
+              c:identifier="gtk_page_setup_get_bottom_margin">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="update">
+      </method>
+      <method name="set_bottom_margin"
+              c:identifier="gtk_page_setup_set_bottom_margin">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="margin">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="act_mode_enter">
+      </method>
+      <method name="get_left_margin"
+              c:identifier="gtk_page_setup_get_left_margin">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="progress">
-            <type name="Progress" c:type="GtkProgress*"/>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </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>
-    </class>
-    <class name="ProgressBar"
-           c:type="GtkProgressBar"
-           parent="Progress"
-           glib:type-name="GtkProgressBar"
-           glib:get-type="gtk_progress_bar_get_type">
-      <method name="pulse" c:identifier="gtk_progress_bar_pulse">
+      </method>
+      <method name="set_left_margin"
+              c:identifier="gtk_page_setup_set_left_margin">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="margin">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_text" c:identifier="gtk_progress_bar_set_text">
+      <method name="get_right_margin"
+              c:identifier="gtk_page_setup_get_right_margin">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
           </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_fraction" c:identifier="gtk_progress_bar_set_fraction">
+      <method name="set_right_margin"
+              c:identifier="gtk_page_setup_set_right_margin">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
           </parameter>
-          <parameter name="fraction">
+          <parameter name="margin">
             <type name="double" c:type="gdouble"/>
           </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="set_pulse_step"
-              c:identifier="gtk_progress_bar_set_pulse_step">
+      <method name="set_paper_size_and_default_margins"
+              c:identifier="gtk_page_setup_set_paper_size_and_default_margins">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
           </parameter>
-          <parameter name="fraction">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_orientation"
-              c:identifier="gtk_progress_bar_set_orientation">
+      <method name="get_paper_width"
+              c:identifier="gtk_page_setup_get_paper_width">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
           </parameter>
-          <parameter name="orientation">
-            <type name="ProgressBarOrientation"
-                  c:type="GtkProgressBarOrientation"/>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_text" c:identifier="gtk_progress_bar_get_text">
+      <method name="get_paper_height"
+              c:identifier="gtk_page_setup_get_paper_height">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_fraction" c:identifier="gtk_progress_bar_get_fraction">
+      <method name="get_page_width"
+              c:identifier="gtk_page_setup_get_page_width">
         <return-value>
           <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_pulse_step"
-              c:identifier="gtk_progress_bar_get_pulse_step">
+      <method name="get_page_height"
+              c:identifier="gtk_page_setup_get_page_height">
         <return-value>
           <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_orientation"
-              c:identifier="gtk_progress_bar_get_orientation">
+      <method name="to_file" c:identifier="gtk_page_setup_to_file">
         <return-value>
-          <type name="ProgressBarOrientation"
-                c:type="GtkProgressBarOrientation"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
+          </parameter>
+          <parameter name="file_name">
+            <type name="string" c:type="char*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_ellipsize"
-              c:identifier="gtk_progress_bar_set_ellipsize">
+      <method name="to_key_file" c:identifier="gtk_page_setup_to_key_file">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
           </parameter>
-          <parameter name="mode">
-            <type name="PangoEllipsizeMode" c:type="PangoEllipsizeMode"/>
+          <parameter name="key_file">
+            <type name="GLib.KeyFile" c:type="GKeyFile*"/>
+          </parameter>
+          <parameter name="group_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_ellipsize"
-              c:identifier="gtk_progress_bar_get_ellipsize">
+    </class>
+    <class name="PrintSettings"
+           c:type="GtkPrintSettings"
+           parent="GObject.Object"
+           glib:type-name="GtkPrintSettings"
+           glib:get-type="gtk_print_settings_get_type">
+      <constructor name="new" c:identifier="gtk_print_settings_new">
+        <return-value>
+          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+        </return-value>
+      </constructor>
+      <constructor name="copy" c:identifier="gtk_print_settings_copy">
         <return-value>
-          <type name="PangoEllipsizeMode" c:type="PangoEllipsizeMode"/>
+          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="other">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_bar_style"
-              c:identifier="gtk_progress_bar_set_bar_style">
+      </constructor>
+      <constructor name="new_from_file"
+                   c:identifier="gtk_print_settings_new_from_file">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="file_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="style">
-            <type name="ProgressBarStyle" c:type="GtkProgressBarStyle"/>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_discrete_blocks"
-              c:identifier="gtk_progress_bar_set_discrete_blocks">
+      </constructor>
+      <constructor name="new_from_key_file"
+                   c:identifier="gtk_print_settings_new_from_key_file">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="key_file">
+            <type name="GLib.KeyFile" c:type="GKeyFile*"/>
           </parameter>
-          <parameter name="blocks">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="group_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_activity_step"
-              c:identifier="gtk_progress_bar_set_activity_step">
+      </constructor>
+      <method name="to_file" c:identifier="gtk_print_settings_to_file">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="step">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="file_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_activity_blocks"
-              c:identifier="gtk_progress_bar_set_activity_blocks">
+      <method name="to_key_file" c:identifier="gtk_print_settings_to_key_file">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="blocks">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="key_file">
+            <type name="GLib.KeyFile" c:type="GKeyFile*"/>
+          </parameter>
+          <parameter name="group_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="update" c:identifier="gtk_progress_bar_update">
+      <method name="has_key" c:identifier="gtk_print_settings_has_key">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="pbar">
-            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="percentage">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="fraction">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <property name="pulse-step">
-        <type name="double" c:type="gdouble"/>
-      </property>
-      <property name="orientation">
-        <type name="ProgressBarOrientation"
-              c:type="GtkProgressBarOrientation"/>
-      </property>
-      <property name="text">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="ellipsize">
-        <type name="PangoEllipsizeMode" c:type="PangoEllipsizeMode"/>
-      </property>
-      <property name="adjustment">
-        <type name="Adjustment" c:type="GtkAdjustment"/>
-      </property>
-      <property name="bar-style">
-        <type name="ProgressBarStyle" c:type="GtkProgressBarStyle"/>
-      </property>
-      <property name="activity-step">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <property name="activity-blocks">
-        <type name="uint32" c:type="guint"/>
-      </property>
-      <property name="discrete-blocks">
-        <type name="uint32" c:type="guint"/>
-      </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">
+      <method name="get" c:identifier="gtk_print_settings_get">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set" c:identifier="gtk_print_settings_set">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-    </class>
-    <function name="progress_bar_new" c:identifier="gtk_progress_bar_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-    </function>
-    <function name="progress_bar_new_with_adjustment"
-              c:identifier="gtk_progress_bar_new_with_adjustment">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="adjustment" allow-none="1">
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkToggleActionPrivate" c:type="GtkToggleActionPrivate"/>
-    <class name="ToggleAction"
-           c:type="GtkToggleAction"
-           parent="Action"
-           glib:type-name="GtkToggleAction"
-           glib:get-type="gtk_toggle_action_get_type">
-      <constructor name="new" c:identifier="gtk_toggle_action_new">
-        <return-value>
-          <type name="ToggleAction" c:type="GtkToggleAction*"/>
-        </return-value>
         <parameters>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="label">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="tooltip">
+          <parameter name="key">
             <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="stock_id">
+          <parameter name="value" allow-none="1">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="toggled" c:identifier="gtk_toggle_action_toggled">
+      </method>
+      <method name="unset" c:identifier="gtk_print_settings_unset">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="ToggleAction" c:type="GtkToggleAction*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_active" c:identifier="gtk_toggle_action_set_active">
+      <method name="foreach" c:identifier="gtk_print_settings_foreach">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="ToggleAction" c:type="GtkToggleAction*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="is_active">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="func">
+            <type name="PrintSettingsFunc" c:type="GtkPrintSettingsFunc"/>
+          </parameter>
+          <parameter name="user_data" allow-none="1">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_active" c:identifier="gtk_toggle_action_get_active">
+      <method name="get_bool" c:identifier="gtk_print_settings_get_bool">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="ToggleAction" c:type="GtkToggleAction*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_draw_as_radio"
-              c:identifier="gtk_toggle_action_set_draw_as_radio">
+      <method name="set_bool" c:identifier="gtk_print_settings_set_bool">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="ToggleAction" c:type="GtkToggleAction*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="draw_as_radio">
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="value">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_draw_as_radio"
-              c:identifier="gtk_toggle_action_get_draw_as_radio">
+      <method name="get_double" c:identifier="gtk_print_settings_get_double">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="ToggleAction" c:type="GtkToggleAction*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="draw-as-radio">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="active">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="toggled">
+      <method name="get_double_with_default"
+              c:identifier="gtk_print_settings_get_double_with_default">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="ToggleAction" c:type="GtkToggleAction*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="def">
+            <type name="double" c:type="gdouble"/>
           </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="toggled">
+      </method>
+      <method name="set_double" c:identifier="gtk_print_settings_set_double">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-    </class>
-    <record name="GtkRadioActionPrivate" c:type="GtkRadioActionPrivate"/>
-    <class name="RadioAction"
-           c:type="GtkRadioAction"
-           parent="ToggleAction"
-           glib:type-name="GtkRadioAction"
-           glib:get-type="gtk_radio_action_get_type">
-      <constructor name="new" c:identifier="gtk_radio_action_new">
-        <return-value>
-          <type name="RadioAction" c:type="GtkRadioAction*"/>
-        </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 name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="stock_id">
+          <parameter name="key">
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="value">
-            <type name="int32" c:type="gint"/>
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="get_group" c:identifier="gtk_radio_action_get_group">
+      </method>
+      <method name="get_length" c:identifier="gtk_print_settings_get_length">
         <return-value>
-          <type name="GLib.GSList" c:type="GSList*"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="RadioAction" c:type="GtkRadioAction*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_group" c:identifier="gtk_radio_action_set_group">
+      <method name="set_length" c:identifier="gtk_print_settings_set_length">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="RadioAction" c:type="GtkRadioAction*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="group">
-            <type name="GLib.GSList" c:type="GSList*"/>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_current_value"
-              c:identifier="gtk_radio_action_get_current_value">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="action">
-            <type name="RadioAction" c:type="GtkRadioAction*"/>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_current_value"
-              c:identifier="gtk_radio_action_set_current_value">
+      <method name="get_int" c:identifier="gtk_print_settings_get_int">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="RadioAction" c:type="GtkRadioAction*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="current_value">
-            <type name="int32" c:type="gint"/>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="value">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="group">
-        <type name="RadioAction" c:type="GtkRadioAction"/>
-      </property>
-      <property name="current-value">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <callback name="changed">
+      <method name="get_int_with_default"
+              c:identifier="gtk_print_settings_get_int_with_default">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="RadioAction" c:type="GtkRadioAction*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="current">
-            <type name="RadioAction" c:type="GtkRadioAction*"/>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="def">
+            <type name="int" c:type="gint"/>
           </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">
+      </method>
+      <method name="set_int" c:identifier="gtk_print_settings_set_int">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="RadioAction" c:type="GtkRadioAction"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-        </parameters>
-      </glib:signal>
-    </class>
-    <class name="RadioButton"
-           c:type="GtkRadioButton"
-           parent="CheckButton"
-           glib:type-name="GtkRadioButton"
-           glib:get-type="gtk_radio_button_get_type">
-      <method name="new_from_widget"
-              c:identifier="gtk_radio_button_new_from_widget">
-        <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="radio_group_member">
-            <type name="RadioButton" c:type="GtkRadioButton*"/>
+          <parameter name="key">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="new_with_label_from_widget"
-              c:identifier="gtk_radio_button_new_with_label_from_widget">
+      <method name="get_printer" c:identifier="gtk_print_settings_get_printer">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="radio_group_member">
-            <type name="RadioButton" c:type="GtkRadioButton*"/>
-          </parameter>
-          <parameter name="label">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="new_with_mnemonic_from_widget"
-              c:identifier="gtk_radio_button_new_with_mnemonic_from_widget">
+      <method name="set_printer" c:identifier="gtk_print_settings_set_printer">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="radio_group_member">
-            <type name="RadioButton" c:type="GtkRadioButton*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="label">
+          <parameter name="printer">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_group" c:identifier="gtk_radio_button_get_group">
+      <method name="get_orientation"
+              c:identifier="gtk_print_settings_get_orientation">
         <return-value>
-          <type name="GLib.GSList" c:type="GSList*"/>
+          <type name="PageOrientation" c:type="GtkPageOrientation"/>
         </return-value>
         <parameters>
-          <parameter name="radio_button">
-            <type name="RadioButton" c:type="GtkRadioButton*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_group" c:identifier="gtk_radio_button_set_group">
+      <method name="set_orientation"
+              c:identifier="gtk_print_settings_set_orientation">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="radio_button">
-            <type name="RadioButton" c:type="GtkRadioButton*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="group">
-            <type name="GLib.GSList" c:type="GSList*"/>
+          <parameter name="orientation">
+            <type name="PageOrientation" c:type="GtkPageOrientation"/>
           </parameter>
         </parameters>
       </method>
-      <property name="group">
-        <type name="RadioButton" c:type="GtkRadioButton"/>
-      </property>
-      <callback name="group_changed">
+      <method name="get_paper_size"
+              c:identifier="gtk_print_settings_get_paper_size">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="PaperSize" c:type="GtkPaperSize*"/>
         </return-value>
         <parameters>
-          <parameter name="radio_button">
-            <type name="RadioButton" c:type="GtkRadioButton*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
         </parameters>
-      </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="group-changed">
+      </method>
+      <method name="set_paper_size"
+              c:identifier="gtk_print_settings_set_paper_size">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-    </class>
-    <function name="radio_button_new" c:identifier="gtk_radio_button_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="group">
-          <type name="GLib.GSList" c:type="GSList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="radio_button_new_with_label"
-              c:identifier="gtk_radio_button_new_with_label">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="group">
-          <type name="GLib.GSList" c:type="GSList*"/>
-        </parameter>
-        <parameter name="label">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="radio_button_new_with_mnemonic"
-              c:identifier="gtk_radio_button_new_with_mnemonic">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="group">
-          <type name="GLib.GSList" c:type="GSList*"/>
-        </parameter>
-        <parameter name="label">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="RadioMenuItem"
-           c:type="GtkRadioMenuItem"
-           parent="CheckMenuItem"
-           glib:type-name="GtkRadioMenuItem"
-           glib:get-type="gtk_radio_menu_item_get_type">
-      <method name="new_from_widget"
-              c:identifier="gtk_radio_menu_item_new_from_widget">
-        <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
         <parameters>
-          <parameter name="group">
-            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="paper_size">
+            <type name="PaperSize" c:type="GtkPaperSize*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="new_with_mnemonic_from_widget"
-              c:identifier="gtk_radio_menu_item_new_with_mnemonic_from_widget">
+      <method name="get_paper_width"
+              c:identifier="gtk_print_settings_get_paper_width">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="group">
-            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="label">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </parameter>
         </parameters>
       </method>
-      <method name="new_with_label_from_widget"
-              c:identifier="gtk_radio_menu_item_new_with_label_from_widget">
+      <method name="set_paper_width"
+              c:identifier="gtk_print_settings_set_paper_width">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="group">
-            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="label">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="width">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_group" c:identifier="gtk_radio_menu_item_get_group">
+      <method name="get_paper_height"
+              c:identifier="gtk_print_settings_get_paper_height">
         <return-value>
-          <type name="GLib.GSList" c:type="GSList*"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="radio_menu_item">
-            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_group" c:identifier="gtk_radio_menu_item_set_group">
+      <method name="set_paper_height"
+              c:identifier="gtk_print_settings_set_paper_height">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="radio_menu_item">
-            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="group">
-            <type name="GLib.GSList" c:type="GSList*"/>
+          <parameter name="height">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </parameter>
         </parameters>
       </method>
-      <property name="group">
-        <type name="RadioMenuItem" c:type="GtkRadioMenuItem"/>
-      </property>
-      <callback name="group_changed">
+      <method name="get_use_color"
+              c:identifier="gtk_print_settings_get_use_color">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="radio_menu_item">
-            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
         </parameters>
-      </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">
+      </method>
+      <method name="set_use_color"
+              c:identifier="gtk_print_settings_set_use_color">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <glib:signal name="group-changed">
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="use_color">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_collate" c:identifier="gtk_print_settings_get_collate">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </glib:signal>
-    </class>
-    <function name="radio_menu_item_new"
-              c:identifier="gtk_radio_menu_item_new">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="group">
-          <type name="GLib.GSList" c:type="GSList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="radio_menu_item_new_with_label"
-              c:identifier="gtk_radio_menu_item_new_with_label">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="group">
-          <type name="GLib.GSList" c:type="GSList*"/>
-        </parameter>
-        <parameter name="label">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="radio_menu_item_new_with_mnemonic"
-              c:identifier="gtk_radio_menu_item_new_with_mnemonic">
-      <return-value>
-        <type name="Widget" c:type="GtkWidget*"/>
-      </return-value>
-      <parameters>
-        <parameter name="group">
-          <type name="GLib.GSList" c:type="GSList*"/>
-        </parameter>
-        <parameter name="label">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkToggleToolButtonPrivate"
-            c:type="GtkToggleToolButtonPrivate"/>
-    <class name="ToggleToolButton"
-           c:type="GtkToggleToolButton"
-           parent="ToolButton"
-           glib:type-name="GtkToggleToolButton"
-           glib:get-type="gtk_toggle_tool_button_get_type">
-      <method name="set_active"
-              c:identifier="gtk_toggle_tool_button_set_active">
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_collate" c:identifier="gtk_print_settings_set_collate">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ToggleToolButton" c:type="GtkToggleToolButton*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="is_active">
+          <parameter name="collate">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_active"
-              c:identifier="gtk_toggle_tool_button_get_active">
+      <method name="get_reverse" c:identifier="gtk_print_settings_get_reverse">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ToggleToolButton" c:type="GtkToggleToolButton*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="active">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <callback name="toggled">
+      <method name="set_reverse" c:identifier="gtk_print_settings_set_reverse">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ToggleToolButton" c:type="GtkToggleToolButton*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="reverse">
+            <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">
+      </method>
+      <method name="get_duplex" c:identifier="gtk_print_settings_get_duplex">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="PrintDuplex" c:type="GtkPrintDuplex"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_duplex" c:identifier="gtk_print_settings_set_duplex">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="duplex">
+            <type name="PrintDuplex" c:type="GtkPrintDuplex"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_quality" c:identifier="gtk_print_settings_get_quality">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="PrintQuality" c:type="GtkPrintQuality"/>
         </return-value>
-      </callback>
-      <glib:signal name="toggled">
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_quality" c:identifier="gtk_print_settings_set_quality">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-    </class>
-    <function name="toggle_tool_button_new"
-              c:identifier="gtk_toggle_tool_button_new">
-      <return-value>
-        <type name="ToolItem" c:type="GtkToolItem*"/>
-      </return-value>
-    </function>
-    <function name="toggle_tool_button_new_from_stock"
-              c:identifier="gtk_toggle_tool_button_new_from_stock">
-      <return-value>
-        <type name="ToolItem" c:type="GtkToolItem*"/>
-      </return-value>
-      <parameters>
-        <parameter name="stock_id">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="RadioToolButton"
-           c:type="GtkRadioToolButton"
-           parent="ToggleToolButton"
-           glib:type-name="GtkRadioToolButton"
-           glib:get-type="gtk_radio_tool_button_get_type">
-      <method name="new_from_widget"
-              c:identifier="gtk_radio_tool_button_new_from_widget">
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="quality">
+            <type name="PrintQuality" c:type="GtkPrintQuality"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_n_copies"
+              c:identifier="gtk_print_settings_get_n_copies">
         <return-value>
-          <type name="ToolItem" c:type="GtkToolItem*"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="group">
-            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="new_with_stock_from_widget"
-              c:identifier="gtk_radio_tool_button_new_with_stock_from_widget">
+      <method name="set_n_copies"
+              c:identifier="gtk_print_settings_set_n_copies">
         <return-value>
-          <type name="ToolItem" c:type="GtkToolItem*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="group">
-            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="stock_id">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="num_copies">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_group" c:identifier="gtk_radio_tool_button_get_group">
+      <method name="get_number_up"
+              c:identifier="gtk_print_settings_get_number_up">
         <return-value>
-          <type name="GLib.GSList" c:type="GSList*"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_group" c:identifier="gtk_radio_tool_button_set_group">
+      <method name="set_number_up"
+              c:identifier="gtk_print_settings_set_number_up">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="group">
-            <type name="GLib.GSList" c:type="GSList*"/>
+          <parameter name="number_up">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <property name="group">
-        <type name="RadioToolButton" c:type="GtkRadioToolButton"/>
-      </property>
-      <callback name="_gtk_reserved1">
+      <method name="get_resolution"
+              c:identifier="gtk_print_settings_get_resolution">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_resolution"
+              c:identifier="gtk_print_settings_set_resolution">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="resolution">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_scale" c:identifier="gtk_print_settings_get_scale">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_scale" c:identifier="gtk_print_settings_set_scale">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-    </class>
-    <function name="radio_tool_button_new"
-              c:identifier="gtk_radio_tool_button_new">
-      <return-value>
-        <type name="ToolItem" c:type="GtkToolItem*"/>
-      </return-value>
-      <parameters>
-        <parameter name="group">
-          <type name="GLib.GSList" c:type="GSList*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="radio_tool_button_new_from_stock"
-              c:identifier="gtk_radio_tool_button_new_from_stock">
-      <return-value>
-        <type name="ToolItem" c:type="GtkToolItem*"/>
-      </return-value>
-      <parameters>
-        <parameter name="group">
-          <type name="GLib.GSList" c:type="GSList*"/>
-        </parameter>
-        <parameter name="stock_id">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <record name="GtkRecentData" c:type="GtkRecentData">
-      <field name="display_name">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="description">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="mime_type">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="app_name">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="app_exec">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="groups">
-        <type name="GLib.gchar" c:type="gchar**"/>
-      </field>
-      <field name="is_private">
-        <type name="boolean" c:type="gboolean"/>
-      </field>
-    </record>
-    <record name="GtkRecentManagerPrivate" c:type="GtkRecentManagerPrivate"/>
-    <function name="recent_manager_error_quark"
-              c:identifier="gtk_recent_manager_error_quark">
-      <return-value>
-        <type name="GLib.GQuark" c:type="GQuark"/>
-      </return-value>
-    </function>
-    <class name="RecentManager"
-           c:type="GtkRecentManager"
-           parent="GObject.Object"
-           glib:type-name="GtkRecentManager"
-           glib:get-type="gtk_recent_manager_get_type">
-      <constructor name="new" c:identifier="gtk_recent_manager_new">
-        <return-value>
-          <type name="RecentManager" c:type="GtkRecentManager*"/>
-        </return-value>
-      </constructor>
-      <constructor name="get_default"
-                   c:identifier="gtk_recent_manager_get_default">
-        <return-value>
-          <type name="RecentManager" c:type="GtkRecentManager*"/>
-        </return-value>
-      </constructor>
-      <constructor name="get_for_screen"
-                   c:identifier="gtk_recent_manager_get_for_screen">
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="scale">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_print_pages"
+              c:identifier="gtk_print_settings_get_print_pages">
         <return-value>
-          <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <type name="PrintPages" c:type="GtkPrintPages"/>
         </return-value>
         <parameters>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="set_screen" c:identifier="gtk_recent_manager_set_screen">
+      </method>
+      <method name="set_print_pages"
+              c:identifier="gtk_print_settings_set_print_pages">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <parameter name="pages">
+            <type name="PrintPages" c:type="GtkPrintPages"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_item" c:identifier="gtk_recent_manager_add_item">
+      <method name="get_page_ranges"
+              c:identifier="gtk_print_settings_get_page_ranges">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="PageRange" c:type="GtkPageRange*"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="uri">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="num_ranges">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_full" c:identifier="gtk_recent_manager_add_full">
+      <method name="set_page_ranges"
+              c:identifier="gtk_print_settings_set_page_ranges">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="uri">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="page_ranges">
+            <type name="PageRange" c:type="GtkPageRange*"/>
           </parameter>
-          <parameter name="recent_data">
-            <type name="GtkRecentData" c:type="GtkRecentData*"/>
+          <parameter name="num_ranges">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_item" c:identifier="gtk_recent_manager_remove_item">
+      <method name="get_page_set"
+              c:identifier="gtk_print_settings_get_page_set">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="PageSet" c:type="GtkPageSet"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
-          </parameter>
-          <parameter name="uri">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="lookup_item" c:identifier="gtk_recent_manager_lookup_item">
+      <method name="set_page_set"
+              c:identifier="gtk_print_settings_set_page_set">
         <return-value>
-          <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
-          </parameter>
-          <parameter name="uri">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="page_set">
+            <type name="PageSet" c:type="GtkPageSet"/>
           </parameter>
         </parameters>
       </method>
-      <method name="has_item" c:identifier="gtk_recent_manager_has_item">
+      <method name="get_default_source"
+              c:identifier="gtk_print_settings_get_default_source">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
-          </parameter>
-          <parameter name="uri">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_item" c:identifier="gtk_recent_manager_move_item">
+      <method name="set_default_source"
+              c:identifier="gtk_print_settings_set_default_source">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
-          </parameter>
-          <parameter name="uri">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="new_uri">
+          <parameter name="default_source">
             <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="set_limit" c:identifier="gtk_recent_manager_set_limit">
+      <method name="get_media_type"
+              c:identifier="gtk_print_settings_get_media_type">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
-          </parameter>
-          <parameter name="limit">
-            <type name="int32" c:type="gint"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_limit" c:identifier="gtk_recent_manager_get_limit">
+      <method name="set_media_type"
+              c:identifier="gtk_print_settings_set_media_type">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="media_type">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_items" c:identifier="gtk_recent_manager_get_items">
+      <method name="get_dither" c:identifier="gtk_print_settings_get_dither">
         <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="purge_items" c:identifier="gtk_recent_manager_purge_items">
+      <method name="set_dither" c:identifier="gtk_print_settings_set_dither">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="dither">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="filename">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <property name="limit">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <property name="size">
-        <type name="int32" c:type="gint"/>
-      </property>
-      <callback name="changed">
+      <method name="get_finishings"
+              c:identifier="gtk_print_settings_get_finishings">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="manager">
-            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
         </parameters>
-      </callback>
-      <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">
+      </method>
+      <method name="set_finishings"
+              c:identifier="gtk_print_settings_set_finishings">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_recent4">
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="finishings">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_output_bin"
+              c:identifier="gtk_print_settings_get_output_bin">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
-      </callback>
-      <glib:signal name="changed">
+        <parameters>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_output_bin"
+              c:identifier="gtk_print_settings_set_output_bin">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-    </class>
-    <glib:boxed c:type="RecentInfo"
-                glib:name="RecentInfo"
-                glib:type-name="GtkRecentInfo"
-                glib:get-type="gtk_recent_info_get_type">
-      <constructor name="ref" c:identifier="gtk_recent_info_ref">
-        <return-value>
-          <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-        </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="settings">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+          </parameter>
+          <parameter name="output_bin">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="unref" c:identifier="gtk_recent_info_unref">
+      </method>
+    </class>
+    <callback name="PrintSettingsFunc" c:type="GtkPrintSettingsFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="key">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="value">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <record name="PageRange" c:type="GtkPageRange">
+      <field name="start">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="end">
+        <type name="int" c:type="gint"/>
+      </field>
+    </record>
+    <class name="PrintContext"
+           c:type="GtkPrintContext"
+           parent="GObject.Object"
+           glib:type-name="GtkPrintContext"
+           glib:get-type="gtk_print_context_get_type">
+      <method name="get_cairo_context"
+              c:identifier="gtk_print_context_get_cairo_context">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="cairo.cairo_t" c:type="cairo_t*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_uri" c:identifier="gtk_recent_info_get_uri">
+      <method name="get_page_setup"
+              c:identifier="gtk_print_context_get_page_setup">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_display_name"
-              c:identifier="gtk_recent_info_get_display_name">
+      <method name="get_width" c:identifier="gtk_print_context_get_width">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_description"
-              c:identifier="gtk_recent_info_get_description">
+      <method name="get_height" c:identifier="gtk_print_context_get_height">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_mime_type"
-              c:identifier="gtk_recent_info_get_mime_type">
+      <method name="get_dpi_x" c:identifier="gtk_print_context_get_dpi_x">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_added" c:identifier="gtk_recent_info_get_added">
+      <method name="get_dpi_y" c:identifier="gtk_print_context_get_dpi_y">
         <return-value>
-          <type name="time_t" c:type="time_t"/>
+          <type name="double" c:type="gdouble"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_modified" c:identifier="gtk_recent_info_get_modified">
+      <method name="get_pango_fontmap"
+              c:identifier="gtk_print_context_get_pango_fontmap">
         <return-value>
-          <type name="time_t" c:type="time_t"/>
+          <type name="Pango.FontMap" c:type="PangoFontMap*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_visited" c:identifier="gtk_recent_info_get_visited">
+      <method name="create_pango_context"
+              c:identifier="gtk_print_context_create_pango_context">
         <return-value>
-          <type name="time_t" c:type="time_t"/>
+          <type name="Pango.Context" c:type="PangoContext*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_private_hint"
-              c:identifier="gtk_recent_info_get_private_hint">
+      <method name="create_pango_layout"
+              c:identifier="gtk_print_context_create_pango_layout">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Pango.Layout" c:type="PangoLayout*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_application_info"
-              c:identifier="gtk_recent_info_get_application_info">
+      <method name="set_cairo_context"
+              c:identifier="gtk_print_context_set_cairo_context">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
-          </parameter>
-          <parameter name="app_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
-          <parameter name="app_exec">
-            <type name="GLib.gchar" c:type="gchar**"/>
+          <parameter name="cr">
+            <type name="cairo.cairo_t" c:type="cairo_t*"/>
           </parameter>
-          <parameter name="count">
-            <type name="GLib.guint" c:type="guint*"/>
+          <parameter name="dpi_x">
+            <type name="double" c:type="double"/>
           </parameter>
-          <parameter name="time_">
-            <type name="time_t" c:type="time_t*"/>
+          <parameter name="dpi_y">
+            <type name="double" c:type="double"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_applications"
-              c:identifier="gtk_recent_info_get_applications">
+    </class>
+    <interface name="PrintOperationPreview"
+               c:type="GtkPrintOperationPreview"
+               glib:type-name="GtkPrintOperationPreview"
+               glib:get-type="gtk_print_operation_preview_get_type">
+      <callback name="ready" c:type="ready">
         <return-value>
-          <type name="GLib.gchar" c:type="gchar**"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="preview">
+            <type name="PrintOperationPreview"
+                  c:type="GtkPrintOperationPreview*"/>
           </parameter>
-          <parameter name="length">
-            <type name="gsize" c:type="gsize*"/>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="last_application"
-              c:identifier="gtk_recent_info_last_application">
+      </callback>
+      <callback name="got_page_size" c:type="got_page_size">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="preview">
+            <type name="PrintOperationPreview"
+                  c:type="GtkPrintOperationPreview*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          </parameter>
+          <parameter name="page_setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="has_application"
-              c:identifier="gtk_recent_info_has_application">
+      </callback>
+      <callback name="render_page" c:type="render_page">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="preview">
+            <type name="PrintOperationPreview"
+                  c:type="GtkPrintOperationPreview*"/>
           </parameter>
-          <parameter name="app_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="page_nr">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_groups" c:identifier="gtk_recent_info_get_groups">
+      </callback>
+      <callback name="is_selected" c:type="is_selected">
         <return-value>
-          <type name="GLib.gchar" c:type="gchar**"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="preview">
+            <type name="PrintOperationPreview"
+                  c:type="GtkPrintOperationPreview*"/>
           </parameter>
-          <parameter name="length">
-            <type name="gsize" c:type="gsize*"/>
+          <parameter name="page_nr">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="has_group" c:identifier="gtk_recent_info_has_group">
+      </callback>
+      <callback name="end_preview" c:type="end_preview">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="preview">
+            <type name="PrintOperationPreview"
+                  c:type="GtkPrintOperationPreview*"/>
           </parameter>
-          <parameter name="group_name">
-            <type name="string" c:type="gchar*"/>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved5" c:type="_gtk_reserved5">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved6" c:type="_gtk_reserved6">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved7" c:type="_gtk_reserved7">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="ready">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="PrintContext" c:type="GtkPrintContext"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_icon" c:identifier="gtk_recent_info_get_icon">
+      </glib:signal>
+      <glib:signal name="got-page-size">
         <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="object">
+            <type name="PrintContext" c:type="GtkPrintContext"/>
           </parameter>
-          <parameter name="size">
-            <type name="int32" c:type="gint"/>
+          <parameter name="p0">
+            <type name="PageSetup" c:type="GtkPageSetup"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_short_name"
-              c:identifier="gtk_recent_info_get_short_name">
+      </glib:signal>
+    </interface>
+    <function name="print_operation_preview_render_page"
+              c:identifier="gtk_print_operation_preview_render_page">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="preview">
+          <type name="PrintOperationPreview"
+                c:type="GtkPrintOperationPreview*"/>
+        </parameter>
+        <parameter name="page_nr">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="print_operation_preview_end_preview"
+              c:identifier="gtk_print_operation_preview_end_preview">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="preview">
+          <type name="PrintOperationPreview"
+                c:type="GtkPrintOperationPreview*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="print_operation_preview_is_selected"
+              c:identifier="gtk_print_operation_preview_is_selected">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="preview">
+          <type name="PrintOperationPreview"
+                c:type="GtkPrintOperationPreview*"/>
+        </parameter>
+        <parameter name="page_nr">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="PrintOperationPrivate" c:type="GtkPrintOperationPrivate"/>
+    <class name="PrintOperation"
+           c:type="GtkPrintOperation"
+           parent="GObject.Object"
+           glib:type-name="GtkPrintOperation"
+           glib:get-type="gtk_print_operation_get_type">
+      <constructor name="new" c:identifier="gtk_print_operation_new">
+        <return-value>
+          <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+        </return-value>
+      </constructor>
+      <method name="set_default_page_setup"
+              c:identifier="gtk_print_operation_set_default_page_setup">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="default_page_setup" allow-none="1">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_uri_display"
-              c:identifier="gtk_recent_info_get_uri_display">
+      <method name="get_default_page_setup"
+              c:identifier="gtk_print_operation_get_default_page_setup">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_age" c:identifier="gtk_recent_info_get_age">
+      <method name="set_print_settings"
+              c:identifier="gtk_print_operation_set_print_settings">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="print_settings" allow-none="1">
+            <type name="PrintSettings" c:type="GtkPrintSettings*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="is_local" c:identifier="gtk_recent_info_is_local">
+      <method name="get_print_settings"
+              c:identifier="gtk_print_operation_get_print_settings">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="exists" c:identifier="gtk_recent_info_exists">
+      <method name="set_job_name"
+              c:identifier="gtk_print_operation_set_job_name">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="job_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="match" c:identifier="gtk_recent_info_match">
+      <method name="set_n_pages"
+              c:identifier="gtk_print_operation_set_n_pages">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="info_a">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="info_b">
-            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
+          <parameter name="n_pages">
+            <type name="int" c:type="gint"/>
           </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">
+      <method name="set_current_page"
+              c:identifier="gtk_print_operation_set_current_page">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="RecentAction" c:type="GtkRecentAction*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="current_page">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_show_numbers"
-              c:identifier="gtk_recent_action_set_show_numbers">
+      <method name="set_use_full_page"
+              c:identifier="gtk_print_operation_set_use_full_page">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="RecentAction" c:type="GtkRecentAction*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="show_numbers">
+          <parameter name="full_page">
             <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">
+      <method name="set_unit" c:identifier="gtk_print_operation_set_unit">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="unit">
+            <type name="Unit" c:type="GtkUnit"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_name" c:identifier="gtk_recent_filter_get_name">
+      <method name="set_export_filename"
+              c:identifier="gtk_print_operation_set_export_filename">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="filename">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_mime_type"
-              c:identifier="gtk_recent_filter_add_mime_type">
+      <method name="set_track_print_status"
+              c:identifier="gtk_print_operation_set_track_print_status">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="mime_type">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="track_status">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_pattern" c:identifier="gtk_recent_filter_add_pattern">
+      <method name="set_show_progress"
+              c:identifier="gtk_print_operation_set_show_progress">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="pattern">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="show_progress">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_pixbuf_formats"
-              c:identifier="gtk_recent_filter_add_pixbuf_formats">
+      <method name="set_allow_async"
+              c:identifier="gtk_print_operation_set_allow_async">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="allow_async">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_application"
-              c:identifier="gtk_recent_filter_add_application">
+      <method name="set_custom_tab_label"
+              c:identifier="gtk_print_operation_set_custom_tab_label">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="application">
+          <parameter name="label">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_group" c:identifier="gtk_recent_filter_add_group">
+      <method name="run" c:identifier="gtk_print_operation_run">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="PrintOperationResult" c:type="GtkPrintOperationResult"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="group">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="action">
+            <type name="PrintOperationAction"
+                  c:type="GtkPrintOperationAction"/>
+          </parameter>
+          <parameter name="parent" allow-none="1">
+            <type name="Window" c:type="GtkWindow*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_age" c:identifier="gtk_recent_filter_add_age">
+      <method name="get_error" c:identifier="gtk_print_operation_get_error">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="days">
-            <type name="int32" c:type="gint"/>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_custom" c:identifier="gtk_recent_filter_add_custom">
+      <method name="get_status" c:identifier="gtk_print_operation_get_status">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="PrintStatus" c:type="GtkPrintStatus"/>
         </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 name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_needed" c:identifier="gtk_recent_filter_get_needed">
+      <method name="get_status_string"
+              c:identifier="gtk_print_operation_get_status_string">
         <return-value>
-          <type name="RecentFilterFlags" c:type="GtkRecentFilterFlags"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="filter" c:identifier="gtk_recent_filter_filter">
+      <method name="is_finished"
+              c:identifier="gtk_print_operation_is_finished">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="filter_info">
-            <type name="GtkRecentFilterInfo" c:type="GtkRecentFilterInfo*"/>
+        </parameters>
+      </method>
+      <method name="cancel" c:identifier="gtk_print_operation_cancel">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="op">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </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="local-only">
-        <type name="boolean" c:type="gboolean"/>
+      <property name="default-page-setup">
+        <type name="PageSetup" c:type="GtkPageSetup"/>
       </property>
-      <property name="recent-manager">
-        <type name="RecentManager" c:type="GtkRecentManager"/>
+      <property name="print-settings">
+        <type name="PrintSettings" c:type="GtkPrintSettings"/>
       </property>
-      <property name="filter">
-        <type name="RecentFilter" c:type="GtkRecentFilter"/>
+      <property name="job-name">
+        <type name="string" c:type="gchararray"/>
       </property>
-      <property name="show-private">
-        <type name="boolean" c:type="gboolean"/>
+      <property name="n-pages">
+        <type name="int" c:type="gint"/>
       </property>
-      <property name="show-tips">
-        <type name="boolean" c:type="gboolean"/>
+      <property name="current-page">
+        <type name="int" c:type="gint"/>
       </property>
-      <property name="sort-type">
-        <type name="RecentSortType" c:type="GtkRecentSortType"/>
+      <property name="use-full-page">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="show-not-found">
+      <property name="track-print-status">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="limit">
-        <type name="int32" c:type="gint"/>
+      <property name="unit">
+        <type name="Unit" c:type="GtkUnit"/>
       </property>
-      <property name="show-icons">
+      <property name="show-progress">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="select-multiple">
+      <property name="allow-async">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <callback name="set_current_uri">
+      <property name="export-filename">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="status">
+        <type name="PrintStatus" c:type="GtkPrintStatus"/>
+      </property>
+      <property name="status-string">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="custom-tab-label">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <callback name="done" c:type="done">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="result">
+            <type name="PrintOperationResult"
+                  c:type="GtkPrintOperationResult"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="begin_print" c:type="begin_print">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="paginate" c:type="paginate">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+          <parameter name="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="uri">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+        </parameters>
+      </callback>
+      <callback name="request_page_setup" c:type="request_page_setup">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          </parameter>
+          <parameter name="page_nr">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="setup">
+            <type name="PageSetup" c:type="GtkPageSetup*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_current_uri">
+      <callback name="draw_page" c:type="draw_page">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+          <parameter name="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          </parameter>
+          <parameter name="page_nr">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="select_uri">
+      <callback name="end_print" c:type="end_print">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+          <parameter name="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="uri">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+        </parameters>
+      </callback>
+      <callback name="status_changed" c:type="status_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="create_custom_widget" c:type="create_custom_widget">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="unselect_uri">
+      <callback name="custom_widget_apply" c:type="custom_widget_apply">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+          <parameter name="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
           </parameter>
-          <parameter name="uri">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="preview" c:type="preview">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="preview">
+            <type name="PrintOperationPreview"
+                  c:type="GtkPrintOperationPreview*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          </parameter>
+          <parameter name="parent">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="select_all">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <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">
+      <callback name="gtk_reserved5" c:type="_gtk_reserved5">
         <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">
+      <callback name="gtk_reserved6" c:type="_gtk_reserved6">
         <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="get_recent_manager">
+      <callback name="gtk_reserved7" c:type="_gtk_reserved7">
         <return-value>
-          <type name="RecentManager" c:type="GtkRecentManager*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="add_filter">
+      <glib:signal name="done">
         <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 name="object">
+            <type name="PrintOperationResult"
+                  c:type="GtkPrintOperationResult"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="remove_filter">
+      </glib:signal>
+      <glib:signal name="begin-print">
         <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 name="object">
+            <type name="PrintContext" c:type="GtkPrintContext"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="list_filters">
+      </glib:signal>
+      <glib:signal name="paginate">
         <return-value>
-          <type name="GLib.GSList" c:type="GSList*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+          <parameter name="object">
+            <type name="PrintContext" c:type="GtkPrintContext"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_sort_func">
+      </glib:signal>
+      <glib:signal name="request-page-setup">
         <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 name="object">
+            <type name="PrintContext" c:type="GtkPrintContext"/>
           </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="destroy">
-            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+          <parameter name="p1">
+            <type name="PageSetup" c:type="GtkPageSetup"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="item_activated">
+      </glib:signal>
+      <glib:signal name="draw-page">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+          <parameter name="object">
+            <type name="PrintContext" c:type="GtkPrintContext"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="selection_changed">
+      </glib:signal>
+      <glib:signal name="end-print">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="chooser">
-            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+          <parameter name="object">
+            <type name="PrintContext" c:type="GtkPrintContext"/>
           </parameter>
         </parameters>
-      </callback>
-      <glib:signal name="selection-changed">
+      </glib:signal>
+      <glib:signal name="status-changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-      <glib:signal name="item-activated">
+      <glib:signal name="create-custom-widget">
+        <return-value>
+          <type name="GObject.Object" c:type="GObject"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="custom-widget-apply">
         <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="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">
+      <glib:signal name="preview">
+        <return-value>
           <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>
+        <parameters>
+          <parameter name="object">
+            <type name="PrintOperationPreview"
+                  c:type="GtkPrintOperationPreview"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="PrintContext" c:type="GtkPrintContext"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="Window" c:type="GtkWindow"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
+    <function name="print_error_quark" c:identifier="gtk_print_error_quark">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="GLib.Quark" c:type="GQuark"/>
       </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">
+    <function name="print_run_page_setup_dialog"
+              c:identifier="gtk_print_run_page_setup_dialog">
       <return-value>
-        <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+        <type name="PageSetup" c:type="GtkPageSetup*"/>
       </return-value>
       <parameters>
-        <parameter name="chooser">
-          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        <parameter name="parent" allow-none="1">
+          <type name="Window" c:type="GtkWindow*"/>
+        </parameter>
+        <parameter name="page_setup" allow-none="1">
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
+        </parameter>
+        <parameter name="settings">
+          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
         </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">
+    <callback name="PageSetupDoneFunc" c:type="GtkPageSetupDoneFunc">
       <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>
-        <parameter name="parent">
-          <type name="Window" c:type="GtkWindow*"/>
+        <parameter name="page_setup">
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
         </parameter>
-        <parameter name="first_button_text">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="recent_chooser_dialog_new_for_manager"
-              c:identifier="gtk_recent_chooser_dialog_new_for_manager">
+    </callback>
+    <function name="print_run_page_setup_dialog_async"
+              c:identifier="gtk_print_run_page_setup_dialog_async">
       <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>
         <parameter name="parent">
           <type name="Window" c:type="GtkWindow*"/>
         </parameter>
-        <parameter name="manager">
-          <type name="RecentManager" c:type="GtkRecentManager*"/>
+        <parameter name="page_setup">
+          <type name="PageSetup" c:type="GtkPageSetup*"/>
         </parameter>
-        <parameter name="first_button_text">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="settings">
+          <type name="PrintSettings" c:type="GtkPrintSettings*"/>
+        </parameter>
+        <parameter name="done_cb">
+          <type name="PageSetupDoneFunc" c:type="GtkPageSetupDoneFunc"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </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">
+    <class name="Progress"
+           c:type="GtkProgress"
+           parent="Widget"
+           glib:type-name="GtkProgress"
+           glib:get-type="gtk_progress_get_type">
+      <method name="set_show_text" c:identifier="gtk_progress_set_show_text">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="RecentChooserMenu" c:type="GtkRecentChooserMenu*"/>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+          <parameter name="show_text">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_show_numbers"
-              c:identifier="gtk_recent_chooser_menu_set_show_numbers">
+      <method name="set_text_alignment"
+              c:identifier="gtk_progress_set_text_alignment">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="menu">
-            <type name="RecentChooserMenu" c:type="GtkRecentChooserMenu*"/>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
           </parameter>
-          <parameter name="show_numbers">
+          <parameter name="x_align">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="y_align">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_format_string"
+              c:identifier="gtk_progress_set_format_string">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+          <parameter name="format">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_adjustment" c:identifier="gtk_progress_set_adjustment">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="configure" c:identifier="gtk_progress_configure">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="hmin">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="max">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_percentage" c:identifier="gtk_progress_set_percentage">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+          <parameter name="percentage">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_value" c:identifier="gtk_progress_set_value">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_value" c:identifier="gtk_progress_get_value">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_activity_mode"
+              c:identifier="gtk_progress_set_activity_mode">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+          <parameter name="activity_mode">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <property name="show-numbers">
+      <method name="get_current_text"
+              c:identifier="gtk_progress_get_current_text">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_text_from_value"
+              c:identifier="gtk_progress_get_text_from_value">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_current_percentage"
+              c:identifier="gtk_progress_get_current_percentage">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_percentage_from_value"
+              c:identifier="gtk_progress_get_percentage_from_value">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="activity-mode">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="show-text">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <callback name="gtk_recent1">
+      <property name="text-xalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <property name="text-yalign">
+        <type name="float" c:type="gfloat"/>
+      </property>
+      <callback name="paint" c:type="paint">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="update" c:type="update">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="act_mode_enter" c:type="act_mode_enter">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="progress">
+            <type name="Progress" c:type="GtkProgress*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <class name="ProgressBar"
+           c:type="GtkProgressBar"
+           parent="Progress"
+           glib:type-name="GtkProgressBar"
+           glib:get-type="gtk_progress_bar_get_type">
+      <method name="pulse" c:identifier="gtk_progress_bar_pulse">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_text" c:identifier="gtk_progress_bar_set_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_fraction" c:identifier="gtk_progress_bar_set_fraction">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+          <parameter name="fraction">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_pulse_step"
+              c:identifier="gtk_progress_bar_set_pulse_step">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+          <parameter name="fraction">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_orientation"
+              c:identifier="gtk_progress_bar_set_orientation">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+          <parameter name="orientation">
+            <type name="ProgressBarOrientation"
+                  c:type="GtkProgressBarOrientation"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_text" c:identifier="gtk_progress_bar_get_text">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_fraction" c:identifier="gtk_progress_bar_get_fraction">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_pulse_step"
+              c:identifier="gtk_progress_bar_get_pulse_step">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_orientation"
+              c:identifier="gtk_progress_bar_get_orientation">
+        <return-value>
+          <type name="ProgressBarOrientation"
+                c:type="GtkProgressBarOrientation"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_ellipsize"
+              c:identifier="gtk_progress_bar_set_ellipsize">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+          <parameter name="mode">
+            <type name="Pango.EllipsizeMode" c:type="PangoEllipsizeMode"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_ellipsize"
+              c:identifier="gtk_progress_bar_get_ellipsize">
+        <return-value>
+          <type name="Pango.EllipsizeMode" c:type="PangoEllipsizeMode"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_bar_style"
+              c:identifier="gtk_progress_bar_set_bar_style">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+          <parameter name="style">
+            <type name="ProgressBarStyle" c:type="GtkProgressBarStyle"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_discrete_blocks"
+              c:identifier="gtk_progress_bar_set_discrete_blocks">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+          <parameter name="blocks">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_activity_step"
+              c:identifier="gtk_progress_bar_set_activity_step">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+          <parameter name="step">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_activity_blocks"
+              c:identifier="gtk_progress_bar_set_activity_blocks">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+          <parameter name="blocks">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="update" c:identifier="gtk_progress_bar_update">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="pbar">
+            <type name="ProgressBar" c:type="GtkProgressBar*"/>
+          </parameter>
+          <parameter name="percentage">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="fraction">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="pulse-step">
+        <type name="double" c:type="gdouble"/>
+      </property>
+      <property name="orientation">
+        <type name="ProgressBarOrientation"
+              c:type="GtkProgressBarOrientation"/>
+      </property>
+      <property name="text">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="ellipsize">
+        <type name="Pango.EllipsizeMode" c:type="PangoEllipsizeMode"/>
+      </property>
+      <property name="adjustment">
+        <type name="Adjustment" c:type="GtkAdjustment"/>
+      </property>
+      <property name="bar-style">
+        <type name="ProgressBarStyle" c:type="GtkProgressBarStyle"/>
+      </property>
+      <property name="activity-step">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="activity-blocks">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="discrete-blocks">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="gtk_recent2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="gtk_recent3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="gtk_recent4">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <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">
+    <function name="progress_bar_new" c:identifier="gtk_progress_bar_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">
+    <function name="progress_bar_new_with_adjustment"
+              c:identifier="gtk_progress_bar_new_with_adjustment">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="manager">
-          <type name="RecentManager" c:type="GtkRecentManager*"/>
+        <parameter name="adjustment" allow-none="1">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </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">
+    <class name="ToggleAction"
+           c:type="GtkToggleAction"
+           parent="Action"
+           glib:type-name="GtkToggleAction"
+           glib:get-type="gtk_toggle_action_get_type">
+      <constructor name="new" c:identifier="gtk_toggle_action_new">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="ToggleAction" c:type="GtkToggleAction*"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ScaleButton" c:type="GtkScaleButton*"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="icons">
-            <type name="GLib.gchar" c:type="gchar**"/>
+          <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>
-      </method>
-      <method name="get_value" c:identifier="gtk_scale_button_get_value">
+      </constructor>
+      <method name="toggled" c:identifier="gtk_toggle_action_toggled">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ScaleButton" c:type="GtkScaleButton*"/>
+          <parameter name="action">
+            <type name="ToggleAction" c:type="GtkToggleAction*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_value" c:identifier="gtk_scale_button_set_value">
+      <method name="set_active" c:identifier="gtk_toggle_action_set_active">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ScaleButton" c:type="GtkScaleButton*"/>
+          <parameter name="action">
+            <type name="ToggleAction" c:type="GtkToggleAction*"/>
           </parameter>
-          <parameter name="value">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="is_active">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_adjustment"
-              c:identifier="gtk_scale_button_get_adjustment">
+      <method name="get_active" c:identifier="gtk_toggle_action_get_active">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ScaleButton" c:type="GtkScaleButton*"/>
+          <parameter name="action">
+            <type name="ToggleAction" c:type="GtkToggleAction*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_adjustment"
-              c:identifier="gtk_scale_button_set_adjustment">
+      <method name="set_draw_as_radio"
+              c:identifier="gtk_toggle_action_set_draw_as_radio">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ScaleButton" c:type="GtkScaleButton*"/>
+          <parameter name="action">
+            <type name="ToggleAction" c:type="GtkToggleAction*"/>
           </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="draw_as_radio">
+            <type name="boolean" c:type="gboolean"/>
           </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"/>
+      <method name="get_draw_as_radio"
+              c:identifier="gtk_toggle_action_get_draw_as_radio">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="action">
+            <type name="ToggleAction" c:type="GtkToggleAction*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="draw-as-radio">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="icons">
-        <type name="GStrv" c:type="GStrv"/>
+      <property name="active">
+        <type name="boolean" c:type="gboolean"/>
       </property>
-      <callback name="value_changed">
+      <callback name="toggled" c:type="toggled">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="button">
-            <type name="ScaleButton" c:type="GtkScaleButton*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="action">
+            <type name="ToggleAction" c:type="GtkToggleAction*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_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="object">
-            <type name="double" c:type="gdouble"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="popup">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="popdown">
+      <glib:signal name="toggled">
         <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">
+    <record name="ToggleActionPrivate" c:type="GtkToggleActionPrivate"/>
+    <class name="RadioAction"
+           c:type="GtkRadioAction"
+           parent="ToggleAction"
+           glib:type-name="GtkRadioAction"
+           glib:get-type="gtk_radio_action_get_type">
+      <constructor name="new" c:identifier="gtk_radio_action_new">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <type name="RadioAction" c:type="GtkRadioAction*"/>
         </return-value>
         <parameters>
-          <parameter name="viewport">
-            <type name="Viewport" c:type="GtkViewport*"/>
+          <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="value">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_vadjustment"
-              c:identifier="gtk_viewport_get_vadjustment">
+      </constructor>
+      <method name="get_group" c:identifier="gtk_radio_action_get_group">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <type name="GLib.SList" c:type="GSList*"/>
         </return-value>
         <parameters>
-          <parameter name="viewport">
-            <type name="Viewport" c:type="GtkViewport*"/>
+          <parameter name="action">
+            <type name="RadioAction" c:type="GtkRadioAction*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_hadjustment"
-              c:identifier="gtk_viewport_set_hadjustment">
+      <method name="set_group" c:identifier="gtk_radio_action_set_group">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="viewport">
-            <type name="Viewport" c:type="GtkViewport*"/>
+          <parameter name="action">
+            <type name="RadioAction" c:type="GtkRadioAction*"/>
           </parameter>
-          <parameter name="adjustment" allow-none="1">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="group">
+            <type name="GLib.SList" c:type="GSList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_vadjustment"
-              c:identifier="gtk_viewport_set_vadjustment">
+      <method name="get_current_value"
+              c:identifier="gtk_radio_action_get_current_value">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="viewport">
-            <type name="Viewport" c:type="GtkViewport*"/>
-          </parameter>
-          <parameter name="adjustment" allow-none="1">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="action">
+            <type name="RadioAction" c:type="GtkRadioAction*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_shadow_type"
-              c:identifier="gtk_viewport_set_shadow_type">
+      <method name="set_current_value"
+              c:identifier="gtk_radio_action_set_current_value">
         <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="action">
+            <type name="RadioAction" c:type="GtkRadioAction*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_shadow_type"
-              c:identifier="gtk_viewport_get_shadow_type">
-        <return-value>
-          <type name="ShadowType" c:type="GtkShadowType"/>
-        </return-value>
-        <parameters>
-          <parameter name="viewport">
-            <type name="Viewport" c:type="GtkViewport*"/>
+          <parameter name="current_value">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <property name="hadjustment">
-        <type name="Adjustment" c:type="GtkAdjustment"/>
+      <property name="value">
+        <type name="int" c:type="gint"/>
       </property>
-      <property name="vadjustment">
-        <type name="Adjustment" c:type="GtkAdjustment"/>
+      <property name="group">
+        <type name="RadioAction" c:type="GtkRadioAction"/>
       </property>
-      <property name="shadow-type">
-        <type name="ShadowType" c:type="GtkShadowType"/>
+      <property name="current-value">
+        <type name="int" c:type="gint"/>
       </property>
-      <callback name="set_scroll_adjustments">
+      <callback name="changed" c:type="changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="viewport">
-            <type name="Viewport" c:type="GtkViewport*"/>
-          </parameter>
-          <parameter name="hadjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="action">
+            <type name="RadioAction" c:type="GtkRadioAction*"/>
           </parameter>
-          <parameter name="vadjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="current">
+            <type name="RadioAction" c:type="GtkRadioAction*"/>
           </parameter>
         </parameters>
       </callback>
-      <glib:signal name="set-scroll-adjustments">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <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="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">
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <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_vadjustment"
-              c:identifier="gtk_scrolled_window_set_vadjustment">
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
-          </parameter>
-          <parameter name="vadjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_hadjustment"
-              c:identifier="gtk_scrolled_window_get_hadjustment">
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <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>
-        </parameters>
-      </method>
-      <method name="get_vadjustment"
-              c:identifier="gtk_scrolled_window_get_vadjustment">
+      </callback>
+      <glib:signal name="changed">
         <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="object">
+            <type name="RadioAction" c:type="GtkRadioAction"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_hscrollbar"
-              c:identifier="gtk_scrolled_window_get_hscrollbar">
+      </glib:signal>
+    </class>
+    <record name="RadioActionPrivate" c:type="GtkRadioActionPrivate"/>
+    <class name="RadioButton"
+           c:type="GtkRadioButton"
+           parent="CheckButton"
+           glib:type-name="GtkRadioButton"
+           glib:get-type="gtk_radio_button_get_type">
+      <method name="new_from_widget"
+              c:identifier="gtk_radio_button_new_from_widget">
         <return-value>
           <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="radio_group_member">
+            <type name="RadioButton" c:type="GtkRadioButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_vscrollbar"
-              c:identifier="gtk_scrolled_window_get_vscrollbar">
+      <method name="new_with_label_from_widget"
+              c:identifier="gtk_radio_button_new_with_label_from_widget">
         <return-value>
           <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="radio_group_member">
+            <type name="RadioButton" c:type="GtkRadioButton*"/>
+          </parameter>
+          <parameter name="label">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_policy" c:identifier="gtk_scrolled_window_set_policy">
+      <method name="new_with_mnemonic_from_widget"
+              c:identifier="gtk_radio_button_new_with_mnemonic_from_widget">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </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 name="radio_group_member">
+            <type name="RadioButton" c:type="GtkRadioButton*"/>
           </parameter>
-          <parameter name="vscrollbar_policy">
-            <type name="PolicyType" c:type="GtkPolicyType"/>
+          <parameter name="label">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_policy" c:identifier="gtk_scrolled_window_get_policy">
+      <method name="get_group" c:identifier="gtk_radio_button_get_group">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.SList" c:type="GSList*"/>
         </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="radio_button">
+            <type name="RadioButton" c:type="GtkRadioButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_placement"
-              c:identifier="gtk_scrolled_window_set_placement">
+      <method name="set_group" c:identifier="gtk_radio_button_set_group">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="radio_button">
+            <type name="RadioButton" c:type="GtkRadioButton*"/>
           </parameter>
-          <parameter name="window_placement">
-            <type name="CornerType" c:type="GtkCornerType"/>
+          <parameter name="group">
+            <type name="GLib.SList" c:type="GSList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="unset_placement"
-              c:identifier="gtk_scrolled_window_unset_placement">
+      <property name="group">
+        <type name="RadioButton" c:type="GtkRadioButton"/>
+      </property>
+      <callback name="group_changed" c:type="group_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="radio_button">
+            <type name="RadioButton" c:type="GtkRadioButton*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_placement"
-              c:identifier="gtk_scrolled_window_get_placement">
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="group-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <function name="radio_button_new" c:identifier="gtk_radio_button_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="group">
+          <type name="GLib.SList" c:type="GSList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="radio_button_new_with_label"
+              c:identifier="gtk_radio_button_new_with_label">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="group">
+          <type name="GLib.SList" c:type="GSList*"/>
+        </parameter>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="radio_button_new_with_mnemonic"
+              c:identifier="gtk_radio_button_new_with_mnemonic">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+      <parameters>
+        <parameter name="group">
+          <type name="GLib.SList" c:type="GSList*"/>
+        </parameter>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="RadioMenuItem"
+           c:type="GtkRadioMenuItem"
+           parent="CheckMenuItem"
+           glib:type-name="GtkRadioMenuItem"
+           glib:get-type="gtk_radio_menu_item_get_type">
+      <method name="new_from_widget"
+              c:identifier="gtk_radio_menu_item_new_from_widget">
         <return-value>
-          <type name="CornerType" c:type="GtkCornerType"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="group">
+            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_shadow_type"
-              c:identifier="gtk_scrolled_window_set_shadow_type">
+      <method name="new_with_mnemonic_from_widget"
+              c:identifier="gtk_radio_menu_item_new_with_mnemonic_from_widget">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="group">
+            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
           </parameter>
-          <parameter name="type">
-            <type name="ShadowType" c:type="GtkShadowType"/>
+          <parameter name="label">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_shadow_type"
-              c:identifier="gtk_scrolled_window_get_shadow_type">
+      <method name="new_with_label_from_widget"
+              c:identifier="gtk_radio_menu_item_new_with_label_from_widget">
         <return-value>
-          <type name="ShadowType" c:type="GtkShadowType"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          <parameter name="group">
+            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
+          </parameter>
+          <parameter name="label">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_with_viewport"
-              c:identifier="gtk_scrolled_window_add_with_viewport">
+      <method name="get_group" c:identifier="gtk_radio_menu_item_get_group">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.SList" c:type="GSList*"/>
         </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="radio_menu_item">
+            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
           </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">
-        <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">
+      <method name="set_group" c:identifier="gtk_radio_menu_item_set_group">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="scrolled_window">
-            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
-          </parameter>
-          <parameter name="scroll">
-            <type name="ScrollType" c:type="GtkScrollType"/>
+          <parameter name="radio_menu_item">
+            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
           </parameter>
-          <parameter name="horizontal">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="group">
+            <type name="GLib.SList" c:type="GSList*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="move_focus_out">
+      </method>
+      <property name="group">
+        <type name="RadioMenuItem" c:type="GtkRadioMenuItem"/>
+      </property>
+      <callback name="group_changed" c:type="group_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="direction">
-            <type name="DirectionType" c:type="GtkDirectionType"/>
+          <parameter name="radio_menu_item">
+            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="move-focus-out">
+      <glib:signal name="group-changed">
         <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">
+    <function name="radio_menu_item_new"
+              c:identifier="gtk_radio_menu_item_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 name="group">
+          <type name="GLib.SList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="scrolled_window_get_scrollbar_spacing"
-              c:identifier="_gtk_scrolled_window_get_scrollbar_spacing">
+    <function name="radio_menu_item_new_with_label"
+              c:identifier="gtk_radio_menu_item_new_with_label">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="scrolled_window">
-          <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+        <parameter name="group">
+          <type name="GLib.SList" c:type="GSList*"/>
+        </parameter>
+        <parameter name="label">
+          <type name="string" c:type="gchar*"/>
         </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">
+    <function name="radio_menu_item_new_with_mnemonic"
+              c:identifier="gtk_radio_menu_item_new_with_mnemonic">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
+      <parameters>
+        <parameter name="group">
+          <type name="GLib.SList" c:type="GSList*"/>
+        </parameter>
+        <parameter name="label">
+          <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">
+    <class name="ToggleToolButton"
+           c:type="GtkToggleToolButton"
+           parent="ToolButton"
+           glib:type-name="GtkToggleToolButton"
+           glib:get-type="gtk_toggle_tool_button_get_type">
+      <method name="set_active"
+              c:identifier="gtk_toggle_tool_button_set_active">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="item">
-            <type name="SeparatorToolItem" c:type="GtkSeparatorToolItem*"/>
+          <parameter name="button">
+            <type name="ToggleToolButton" c:type="GtkToggleToolButton*"/>
+          </parameter>
+          <parameter name="is_active">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_draw" c:identifier="gtk_separator_tool_item_set_draw">
+      <method name="get_active"
+              c:identifier="gtk_toggle_tool_button_get_active">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="item">
-            <type name="SeparatorToolItem" c:type="GtkSeparatorToolItem*"/>
-          </parameter>
-          <parameter name="draw">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="button">
+            <type name="ToggleToolButton" c:type="GtkToggleToolButton*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="draw">
+      <property name="active">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <callback name="_gtk_reserved1">
+      <callback name="toggled" c:type="toggled">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="button">
+            <type name="ToggleToolButton" c:type="GtkToggleToolButton*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <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">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
-          <type name="SizeGroup" c:type="GtkSizeGroup*"/>
+          <type name="none" c:type="void"/>
         </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">
+      </callback>
+      <glib:signal name="toggled">
         <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">
+      </glib:signal>
+    </class>
+    <record name="ToggleToolButtonPrivate"
+            c:type="GtkToggleToolButtonPrivate"/>
+    <function name="toggle_tool_button_new"
+              c:identifier="gtk_toggle_tool_button_new">
+      <return-value>
+        <type name="ToolItem" c:type="GtkToolItem*"/>
+      </return-value>
+    </function>
+    <function name="toggle_tool_button_new_from_stock"
+              c:identifier="gtk_toggle_tool_button_new_from_stock">
+      <return-value>
+        <type name="ToolItem" c:type="GtkToolItem*"/>
+      </return-value>
+      <parameters>
+        <parameter name="stock_id">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="RadioToolButton"
+           c:type="GtkRadioToolButton"
+           parent="ToggleToolButton"
+           glib:type-name="GtkRadioToolButton"
+           glib:get-type="gtk_radio_tool_button_get_type">
+      <method name="new_from_widget"
+              c:identifier="gtk_radio_tool_button_new_from_widget">
         <return-value>
-          <type name="SizeGroupMode" c:type="GtkSizeGroupMode"/>
+          <type name="ToolItem" c:type="GtkToolItem*"/>
         </return-value>
         <parameters>
-          <parameter name="size_group">
-            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
+          <parameter name="group">
+            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_ignore_hidden"
-              c:identifier="gtk_size_group_set_ignore_hidden">
+      <method name="new_with_stock_from_widget"
+              c:identifier="gtk_radio_tool_button_new_with_stock_from_widget">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="ToolItem" c:type="GtkToolItem*"/>
         </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 name="group">
+            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
           </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 name="stock_id">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_widget" c:identifier="gtk_size_group_add_widget">
+      <method name="get_group" c:identifier="gtk_radio_tool_button_get_group">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.SList" c:type="GSList*"/>
         </return-value>
         <parameters>
-          <parameter name="size_group">
-            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
-          </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="button">
+            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_widget" c:identifier="gtk_size_group_remove_widget">
+      <method name="set_group" c:identifier="gtk_radio_tool_button_set_group">
         <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 name="button">
+            <type name="RadioToolButton" c:type="GtkRadioToolButton*"/>
           </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 name="group">
+            <type name="GLib.SList" c:type="GSList*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="mode">
-        <type name="SizeGroupMode" c:type="GtkSizeGroupMode"/>
-      </property>
-      <property name="ignore-hidden">
-        <type name="boolean" c:type="gboolean"/>
+      <property name="group">
+        <type name="RadioToolButton" c:type="GtkRadioToolButton"/>
       </property>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_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="radio_tool_button_new"
+              c:identifier="gtk_radio_tool_button_new">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="ToolItem" c:type="GtkToolItem*"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="requisition">
-          <type name="Requisition" c:type="GtkRequisition*"/>
+        <parameter name="group">
+          <type name="GLib.SList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="size_group_compute_requisition"
-              c:identifier="_gtk_size_group_compute_requisition">
+    <function name="radio_tool_button_new_from_stock"
+              c:identifier="gtk_radio_tool_button_new_from_stock">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="ToolItem" c:type="GtkToolItem*"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
-        </parameter>
-        <parameter name="requisition">
-          <type name="Requisition" c:type="GtkRequisition*"/>
+        <parameter name="group">
+          <type name="GLib.SList" c:type="GSList*"/>
         </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 name="stock_id">
+          <type name="string" c:type="gchar*"/>
         </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">
+    <glib:boxed c:type="GtkRecentInfo"
+                glib:name="RecentInfo"
+                glib:type-name="GtkRecentInfo"
+                glib:get-type="gtk_recent_info_get_type">
+      <constructor name="ref" c:identifier="gtk_recent_info_ref">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="RecentInfo" c:type="GtkRecentInfo*"/>
         </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 name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_adjustment"
-              c:identifier="gtk_spin_button_set_adjustment">
+      </constructor>
+      <method name="unref" c:identifier="gtk_recent_info_unref">
         <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">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_adjustment"
-              c:identifier="gtk_spin_button_get_adjustment">
+      <method name="get_uri" c:identifier="gtk_recent_info_get_uri">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_digits" c:identifier="gtk_spin_button_set_digits">
+      <method name="get_display_name"
+              c:identifier="gtk_recent_info_get_display_name">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
-          </parameter>
-          <parameter name="digits">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_digits" c:identifier="gtk_spin_button_get_digits">
+      <method name="get_description"
+              c:identifier="gtk_recent_info_get_description">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_increments"
-              c:identifier="gtk_spin_button_set_increments">
+      <method name="get_mime_type"
+              c:identifier="gtk_recent_info_get_mime_type">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
-          </parameter>
-          <parameter name="step">
-            <type name="double" c:type="gdouble"/>
-          </parameter>
-          <parameter name="page">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_increments"
-              c:identifier="gtk_spin_button_get_increments">
+      <method name="get_added" c:identifier="gtk_recent_info_get_added">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="time_t" c:type="time_t"/>
         </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>
-          <parameter name="page">
-            <type name="GLib.gdouble" c:type="gdouble*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_range" c:identifier="gtk_spin_button_set_range">
+      <method name="get_modified" c:identifier="gtk_recent_info_get_modified">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="time_t" c:type="time_t"/>
         </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">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_range" c:identifier="gtk_spin_button_get_range">
+      <method name="get_visited" c:identifier="gtk_recent_info_get_visited">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="time_t" c:type="time_t"/>
         </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 name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_value" c:identifier="gtk_spin_button_get_value">
+      <method name="get_private_hint"
+              c:identifier="gtk_recent_info_get_private_hint">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_value_as_int"
-              c:identifier="gtk_spin_button_get_value_as_int">
+      <method name="get_application_info"
+              c:identifier="gtk_recent_info_get_application_info">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <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.char" c:type="gchar**"/>
+          </parameter>
+          <parameter name="count">
+            <type name="uint" c:type="guint*"/>
+          </parameter>
+          <parameter name="time_">
+            <type name="time_t" c:type="time_t*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_value" c:identifier="gtk_spin_button_set_value">
+      <method name="get_applications"
+              c:identifier="gtk_recent_info_get_applications">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.char" c:type="gchar**"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
-          <parameter name="value">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="length">
+            <type name="size_t" c:type="gsize*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_update_policy"
-              c:identifier="gtk_spin_button_set_update_policy">
+      <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="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
-          </parameter>
-          <parameter name="policy">
-            <type name="SpinButtonUpdatePolicy"
-                  c:type="GtkSpinButtonUpdatePolicy"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_update_policy"
-              c:identifier="gtk_spin_button_get_update_policy">
+      <method name="has_application"
+              c:identifier="gtk_recent_info_has_application">
         <return-value>
-          <type name="SpinButtonUpdatePolicy"
-                c:type="GtkSpinButtonUpdatePolicy"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <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="set_numeric" c:identifier="gtk_spin_button_set_numeric">
+      <method name="get_groups" c:identifier="gtk_recent_info_get_groups">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.char" c:type="gchar**"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
-          <parameter name="numeric">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="length">
+            <type name="size_t" c:type="gsize*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_numeric" c:identifier="gtk_spin_button_get_numeric">
+      <method name="has_group" c:identifier="gtk_recent_info_has_group">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <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="spin" c:identifier="gtk_spin_button_spin">
+      <method name="get_icon" c:identifier="gtk_recent_info_get_icon">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
-          </parameter>
-          <parameter name="direction">
-            <type name="SpinType" c:type="GtkSpinType"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
-          <parameter name="increment">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="size">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_wrap" c:identifier="gtk_spin_button_set_wrap">
+      <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>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
-          </parameter>
-          <parameter name="wrap">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_wrap" c:identifier="gtk_spin_button_get_wrap">
+      <method name="get_uri_display"
+              c:identifier="gtk_recent_info_get_uri_display">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_snap_to_ticks"
-              c:identifier="gtk_spin_button_set_snap_to_ticks">
+      <method name="get_age" c:identifier="gtk_recent_info_get_age">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
-          </parameter>
-          <parameter name="snap_to_ticks">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_snap_to_ticks"
-              c:identifier="gtk_spin_button_get_snap_to_ticks">
+      <method name="is_local" c:identifier="gtk_recent_info_is_local">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="update" c:identifier="gtk_spin_button_update">
+      <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="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="info">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </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="match" c:identifier="gtk_recent_info_match">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="info_a">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
-          <parameter name="new_value">
-            <type name="GLib.gdouble" c:type="gdouble*"/>
+          <parameter name="info_b">
+            <type name="RecentInfo" c:type="GtkRecentInfo*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="output">
+      </method>
+    </glib:boxed>
+    <record name="RecentData" c:type="GtkRecentData">
+      <field name="display_name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="description">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="mime_type">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="app_name">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="app_exec">
+        <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="groups">
+        <type name="GLib.char" c:type="gchar**"/>
+      </field>
+      <field name="is_private">
+        <type name="boolean" c:type="gboolean"/>
+      </field>
+    </record>
+    <class name="RecentManager"
+           c:type="GtkRecentManager"
+           parent="GObject.Object"
+           glib:type-name="GtkRecentManager"
+           glib:get-type="gtk_recent_manager_get_type">
+      <constructor name="new" c:identifier="gtk_recent_manager_new">
+        <return-value>
+          <type name="RecentManager" c:type="GtkRecentManager*"/>
+        </return-value>
+      </constructor>
+      <constructor name="get_default"
+                   c:identifier="gtk_recent_manager_get_default">
+        <return-value>
+          <type name="RecentManager" c:type="GtkRecentManager*"/>
+        </return-value>
+      </constructor>
+      <constructor name="get_for_screen"
+                   c:identifier="gtk_recent_manager_get_for_screen">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="RecentManager" c:type="GtkRecentManager*"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="value_changed">
+      </constructor>
+      <method name="set_screen" c:identifier="gtk_recent_manager_set_screen">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          </parameter>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="change_value">
+      </method>
+      <method name="add_item" c:identifier="gtk_recent_manager_add_item">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
           </parameter>
-          <parameter name="scroll">
-            <type name="ScrollType" c:type="GtkScrollType"/>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="wrapped">
+      </method>
+      <method name="add_full" c:identifier="gtk_recent_manager_add_full">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="spin_button">
-            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          </parameter>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="recent_data">
+            <type name="RecentData" c:type="GtkRecentData*"/>
           </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">
+      </method>
+      <method name="remove_item" c:identifier="gtk_recent_manager_remove_item">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="ScrollType" c:type="GtkScrollType"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          </parameter>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="input">
+      </method>
+      <method name="lookup_item" c:identifier="gtk_recent_manager_lookup_item">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="RecentInfo" c:type="GtkRecentInfo*"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          </parameter>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="output">
+      </method>
+      <method name="has_item" c:identifier="gtk_recent_manager_has_item">
         <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">
-        <return-value>
-          <type name="uint32" c:type="guint"/>
-        </return-value>
         <parameters>
-          <parameter name="statusbar">
-            <type name="Statusbar" c:type="GtkStatusbar*"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
           </parameter>
-          <parameter name="context_description">
+          <parameter name="uri">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="push" c:identifier="gtk_statusbar_push">
+      <method name="move_item" c:identifier="gtk_recent_manager_move_item">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="statusbar">
-            <type name="Statusbar" c:type="GtkStatusbar*"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
           </parameter>
-          <parameter name="context_id">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="text">
+          <parameter name="new_uri">
             <type name="string" c:type="gchar*"/>
           </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="pop" c:identifier="gtk_statusbar_pop">
+      <method name="set_limit" c:identifier="gtk_recent_manager_set_limit">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="statusbar">
-            <type name="Statusbar" c:type="GtkStatusbar*"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
           </parameter>
-          <parameter name="context_id">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="limit">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove" c:identifier="gtk_statusbar_remove">
+      <method name="get_limit" c:identifier="gtk_recent_manager_get_limit">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </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="message_id">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_has_resize_grip"
-              c:identifier="gtk_statusbar_set_has_resize_grip">
+      <method name="get_items" c:identifier="gtk_recent_manager_get_items">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="statusbar">
-            <type name="Statusbar" c:type="GtkStatusbar*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_has_resize_grip"
-              c:identifier="gtk_statusbar_get_has_resize_grip">
+      <method name="purge_items" c:identifier="gtk_recent_manager_purge_items">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="statusbar">
-            <type name="Statusbar" c:type="GtkStatusbar*"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
-      <property name="has-resize-grip">
-        <type name="boolean" c:type="gboolean"/>
+      <property name="filename">
+        <type name="string" c:type="gchararray"/>
       </property>
-      <field name="reserved">
-        <type name="any" c:type="gpointer"/>
-      </field>
-      <callback name="text_pushed">
+      <property name="limit">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="size">
+        <type name="int" c:type="gint"/>
+      </property>
+      <callback name="changed" c:type="changed">
         <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>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="text_popped">
+      <callback name="gtk_recent1" c:type="_gtk_recent1">
         <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>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-        </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_recent2" c:type="_gtk_recent2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_recent3" c:type="_gtk_recent3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_recent4" c:type="_gtk_recent4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <glib:signal name="changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <glib:signal name="text-pushed">
+      </glib:signal>
+    </class>
+    <record name="RecentManagerPrivate" c:type="GtkRecentManagerPrivate"/>
+    <function name="recent_manager_error_quark"
+              c:identifier="gtk_recent_manager_error_quark">
+      <return-value>
+        <type name="GLib.Quark" c:type="GQuark"/>
+      </return-value>
+    </function>
+    <function name="recent_manager_sync"
+              c:identifier="_gtk_recent_manager_sync">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </function>
+    <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="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="string" c:type="gchararray"/>
+          <parameter name="action">
+            <type name="RecentAction" c:type="GtkRecentAction*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="text-popped">
+      </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="object">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="action">
+            <type name="RecentAction" c:type="GtkRecentAction*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="string" c:type="gchararray"/>
+          <parameter name="show_numbers">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </glib:signal>
+      </method>
+      <property name="show-numbers">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
     </class>
-    <function name="statusbar_new" c:identifier="gtk_statusbar_new">
+    <record name="RecentActionPrivate" c:type="GtkRecentActionPrivate"/>
+    <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="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>
-    <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">
+    <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="RecentFilter"
+           c:type="GtkRecentFilter"
+           parent="Object"
+           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="StatusIcon" c:type="GtkStatusIcon*"/>
+          <type name="RecentFilter" c:type="GtkRecentFilter*"/>
         </return-value>
       </constructor>
-      <constructor name="new_from_pixbuf"
-                   c:identifier="gtk_status_icon_new_from_pixbuf">
+      <method name="set_name" c:identifier="gtk_recent_filter_set_name">
         <return-value>
-          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
           </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="new_from_file"
-                   c:identifier="gtk_status_icon_new_from_file">
-        <return-value>
-          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
-        </return-value>
-        <parameters>
-          <parameter name="filename">
+          <parameter name="name">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="new_from_stock"
-                   c:identifier="gtk_status_icon_new_from_stock">
+      </method>
+      <method name="get_name" c:identifier="gtk_recent_filter_get_name">
         <return-value>
-          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="stock_id">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="new_from_icon_name"
-                   c:identifier="gtk_status_icon_new_from_icon_name">
+      </method>
+      <method name="add_mime_type"
+              c:identifier="gtk_recent_filter_add_mime_type">
         <return-value>
-          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_name">
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+          <parameter name="mime_type">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="set_from_pixbuf"
-              c:identifier="gtk_status_icon_set_from_pixbuf">
+      </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="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
           </parameter>
-          <parameter name="pixbuf" allow-none="1">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="pattern">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_from_file"
-              c:identifier="gtk_status_icon_set_from_file">
+      <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="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
-          </parameter>
-          <parameter name="filename">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_from_stock"
-              c:identifier="gtk_status_icon_set_from_stock">
+      <method name="add_application"
+              c:identifier="gtk_recent_filter_add_application">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
           </parameter>
-          <parameter name="stock_id">
+          <parameter name="application">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_from_icon_name"
-              c:identifier="gtk_status_icon_set_from_icon_name">
+      <method name="add_group" c:identifier="gtk_recent_filter_add_group">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
           </parameter>
-          <parameter name="icon_name">
+          <parameter name="group">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_storage_type"
-              c:identifier="gtk_status_icon_get_storage_type">
+      <method name="add_age" c:identifier="gtk_recent_filter_add_age">
         <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="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_pixbuf" c:identifier="gtk_status_icon_get_pixbuf">
-        <return-value>
-          <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
-        </return-value>
-        <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="days">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_stock" c:identifier="gtk_status_icon_get_stock">
+      <method name="add_custom" c:identifier="gtk_recent_filter_add_custom">
         <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="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+          <parameter name="needed">
+            <type name="RecentFilterFlags" c:type="GtkRecentFilterFlags"/>
+          </parameter>
+          <parameter name="func">
+            <type name="RecentFilterFunc" c:type="GtkRecentFilterFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="data_destroy">
+            <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_icon_name"
-              c:identifier="gtk_status_icon_get_icon_name">
+      <method name="get_needed" c:identifier="gtk_recent_filter_get_needed">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="RecentFilterFlags" c:type="GtkRecentFilterFlags"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_size" c:identifier="gtk_status_icon_get_size">
+      <method name="filter" c:identifier="gtk_recent_filter_filter">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+          <parameter name="filter_info">
+            <type name="RecentFilterInfo" c:type="GtkRecentFilterInfo*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_screen" c:identifier="gtk_status_icon_set_screen">
+    </class>
+    <record name="RecentFilterInfo" 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.char" c:type="gchar**"/>
+      </field>
+      <field name="groups">
+        <type name="GLib.char" c:type="gchar**"/>
+      </field>
+      <field name="age">
+        <type name="int" c:type="gint"/>
+      </field>
+    </record>
+    <callback name="RecentFilterFunc" c:type="GtkRecentFilterFunc">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="filter_info">
+          <type name="RecentFilterInfo" c:type="GtkRecentFilterInfo*"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="RecentSortFunc" c:type="GtkRecentSortFunc">
+      <return-value>
+        <type name="int" 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>
+    <interface name="RecentChooser"
+               c:type="GtkRecentChooser"
+               glib:type-name="GtkRecentChooser"
+               glib:get-type="gtk_recent_chooser_get_type">
+      <property name="show-tips">
+        <type name="boolean" c:type="gboolean"/>
+      </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-icons">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="local-only">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="select-multiple">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="limit">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="show-not-found">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="show-private">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="filter">
+        <type name="RecentFilter" c:type="GtkRecentFilter"/>
+      </property>
+      <callback name="set_current_uri" c:type="set_current_uri">
         <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 name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_screen" c:identifier="gtk_status_icon_get_screen">
+      </callback>
+      <callback name="get_current_uri" c:type="get_current_uri">
         <return-value>
-          <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_tooltip" c:identifier="gtk_status_icon_set_tooltip">
+      </callback>
+      <callback name="select_uri" c:type="select_uri">
         <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 name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
-          <parameter name="tooltip_text" allow-none="1">
+          <parameter name="uri">
             <type name="string" c:type="gchar*"/>
           </parameter>
+          <parameter name="error">
+            <type name="GLib.Error" c:type="GError**"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="set_visible" c:identifier="gtk_status_icon_set_visible">
+      </callback>
+      <callback name="unselect_uri" c:type="unselect_uri">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
-          <parameter name="visible">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_visible" c:identifier="gtk_status_icon_get_visible">
+      </callback>
+      <callback name="select_all" c:type="select_all">
         <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="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_blinking" c:identifier="gtk_status_icon_set_blinking">
+      </callback>
+      <callback name="unselect_all" c:type="unselect_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
-          </parameter>
-          <parameter name="blinking">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_blinking" c:identifier="gtk_status_icon_get_blinking">
+      </callback>
+      <callback name="get_items" c:type="get_items">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="is_embedded" c:identifier="gtk_status_icon_is_embedded">
+      </callback>
+      <callback name="get_recent_manager" c:type="get_recent_manager">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="RecentManager" c:type="GtkRecentManager*"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_geometry" c:identifier="gtk_status_icon_get_geometry">
+      </callback>
+      <callback name="add_filter" c:type="add_filter">
         <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="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
-          <parameter name="screen">
-            <type name="Gdk.Screen" c:type="GdkScreen**"/>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
           </parameter>
-          <parameter name="area">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+        </parameters>
+      </callback>
+      <callback name="remove_filter" c:type="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="orientation">
-            <type name="Orientation" c:type="GtkOrientation*"/>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
           </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">
+      </callback>
+      <callback name="list_filters" c:type="list_filters">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.SList" c:type="GSList*"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="popup_menu">
+      <callback name="set_sort_func" c:type="set_sort_func">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="status_icon">
-            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
-          <parameter name="button">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="sort_func">
+            <type name="RecentSortFunc" c:type="GtkRecentSortFunc"/>
           </parameter>
-          <parameter name="activate_time">
-            <type name="uint32" c:type="guint32"/>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="size_changed">
+      <callback name="item_activated" c:type="item_activated">
         <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>
-          <parameter name="size">
-            <type name="int32" c:type="gint"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </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">
+      <callback name="selection_changed" c:type="selection_changed">
         <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="uint32" c:type="guint"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="activate">
+      </callback>
+      <glib:signal name="selection-changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-      <glib:signal name="size-changed">
+      <glib:signal name="item-activated">
         <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </interface>
+    <function name="recent_chooser_error_quark"
+              c:identifier="gtk_recent_chooser_error_quark">
+      <return-value>
+        <type name="GLib.Quark" c:type="GQuark"/>
+      </return-value>
+    </function>
+    <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="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="recent_chooser_get_limit"
+              c:identifier="gtk_recent_chooser_get_limit">
+      <return-value>
+        <type name="int" 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"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="int32" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </class>
-    <function name="status_icon_position_menu"
-              c:identifier="gtk_status_icon_position_menu">
+        </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="menu">
-          <type name="Menu" c:type="GtkMenu*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
-        <parameter name="x">
-          <type name="GLib.gint" c:type="gint*"/>
+        <parameter name="show_tips">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
-        <parameter name="y">
-          <type name="GLib.gint" c:type="gint*"/>
+      </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>
-        <parameter name="push_in">
-          <type name="GLib.gboolean" c:type="gboolean*"/>
+      </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="user_data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="show_numbers">
+          <type name="boolean" c:type="gboolean"/>
         </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">
+    <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="items">
-          <type name="GtkStockItem" c:type="GtkStockItem*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
-        <parameter name="n_items">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="show_icons">
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
     </function>
-    <function name="stock_add_static" c:identifier="gtk_stock_add_static">
+    <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="items">
-          <type name="GtkStockItem" c:type="GtkStockItem*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
-        <parameter name="n_items">
-          <type name="uint32" c:type="guint"/>
+        <parameter name="sort_type">
+          <type name="RecentSortType" c:type="GtkRecentSortType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="stock_lookup" c:identifier="gtk_stock_lookup">
+    <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="RecentSortFunc" c:type="GtkRecentSortFunc"/>
+        </parameter>
+        <parameter name="sort_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="data_destroy">
+          <type name="GLib.DestroyNotify" 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="stock_id">
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+        <parameter name="uri">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="item">
-          <type name="GtkStockItem" c:type="GtkStockItem*"/>
+        <parameter name="error">
+          <type name="GLib.Error" c:type="GError**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="stock_list_ids" c:identifier="gtk_stock_list_ids">
+    <function name="recent_chooser_get_current_uri"
+              c:identifier="gtk_recent_chooser_get_current_uri">
       <return-value>
-        <type name="GLib.GSList" c:type="GSList*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+      </parameters>
     </function>
-    <function name="stock_item_copy" c:identifier="gtk_stock_item_copy">
+    <function name="recent_chooser_get_current_item"
+              c:identifier="gtk_recent_chooser_get_current_item">
       <return-value>
-        <type name="GtkStockItem" c:type="GtkStockItem*"/>
+        <type name="RecentInfo" c:type="GtkRecentInfo*"/>
       </return-value>
       <parameters>
-        <parameter name="item">
-          <type name="GtkStockItem" c:type="GtkStockItem*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="stock_item_free" c:identifier="gtk_stock_item_free">
+    <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.Error" 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="item">
-          <type name="GtkStockItem" c:type="GtkStockItem*"/>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+        <parameter name="uri">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="stock_set_translate_func"
-              c:identifier="gtk_stock_set_translate_func">
+    <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="domain">
+        <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.List" 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.char" c:type="gchar**"/>
+      </return-value>
+      <parameters>
+        <parameter name="chooser">
+          <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+        </parameter>
+        <parameter name="length">
+          <type name="size_t" 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.SList" 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>
+    <class name="RecentChooserDialog"
+           c:type="GtkRecentChooserDialog"
+           parent="Dialog"
+           glib:type-name="GtkRecentChooserDialog"
+           glib:get-type="gtk_recent_chooser_dialog_get_type">
+    </class>
+    <record name="RecentChooserDialogPrivate"
+            c:type="GtkRecentChooserDialogPrivate"/>
+    <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="func">
-          <type name="GtkTranslateFunc" c:type="GtkTranslateFunc"/>
+        <parameter name="parent">
+          <type name="Window" c:type="GtkWindow*"/>
         </parameter>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="first_button_text">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="notify">
-          <type name="GtkDestroyNotify" c:type="GtkDestroyNotify"/>
+      </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="GtkTableChild" c:type="GtkTableChild">
-      <field name="widget">
+    <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="_recent1" c:type="gtk_recent1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_recent2" c:type="gtk_recent2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_recent3" c:type="gtk_recent3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="_recent4" c:type="gtk_recent4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <record name="RecentChooserMenuPrivate"
+            c:type="GtkRecentChooserMenuPrivate"/>
+    <function name="recent_chooser_menu_new"
+              c:identifier="gtk_recent_chooser_menu_new">
+      <return-value>
         <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>
+    </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>
+    <class name="RecentChooserWidget"
+           c:type="GtkRecentChooserWidget"
+           parent="VBox"
+           glib:type-name="GtkRecentChooserWidget"
+           glib:get-type="gtk_recent_chooser_widget_get_type">
+    </class>
+    <record name="RecentChooserWidgetPrivate"
+            c:type="GtkRecentChooserWidgetPrivate"/>
+    <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>
+    <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="table">
-            <type name="Table" c:type="GtkTable*"/>
-          </parameter>
-          <parameter name="rows">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="button">
+            <type name="ScaleButton" c:type="GtkScaleButton*"/>
           </parameter>
-          <parameter name="columns">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="icons">
+            <type name="GLib.char" c:type="gchar**"/>
           </parameter>
         </parameters>
       </method>
-      <method name="attach" c:identifier="gtk_table_attach">
+      <method name="get_value" c:identifier="gtk_scale_button_get_value">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="double" c:type="gdouble"/>
         </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>
-          <parameter name="ypadding">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="button">
+            <type name="ScaleButton" c:type="GtkScaleButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="attach_defaults" c:identifier="gtk_table_attach_defaults">
+      <method name="set_value" c:identifier="gtk_scale_button_set_value">
         <return-value>
           <type name="none" c:type="void"/>
         </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 name="button">
+            <type name="ScaleButton" c:type="GtkScaleButton*"/>
           </parameter>
-          <parameter name="bottom_attach">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_row_spacing" c:identifier="gtk_table_set_row_spacing">
+      <method name="get_adjustment"
+              c:identifier="gtk_scale_button_get_adjustment">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
-          </parameter>
-          <parameter name="row">
-            <type name="uint32" c:type="guint"/>
-          </parameter>
-          <parameter name="spacing">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="button">
+            <type name="ScaleButton" c:type="GtkScaleButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_row_spacing" c:identifier="gtk_table_get_row_spacing">
+      <method name="set_adjustment"
+              c:identifier="gtk_scale_button_set_adjustment">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
+          <parameter name="button">
+            <type name="ScaleButton" c:type="GtkScaleButton*"/>
           </parameter>
-          <parameter name="row">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_col_spacing" c:identifier="gtk_table_set_col_spacing">
+      <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="GObject.Strv" c:type="GStrv"/>
+      </property>
+      <callback name="value_changed" c:type="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="column">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="button">
+            <type name="ScaleButton" c:type="GtkScaleButton*"/>
           </parameter>
-          <parameter name="spacing">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_col_spacing" c:identifier="gtk_table_get_col_spacing">
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="value-changed">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <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 name="object">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_row_spacings"
-              c:identifier="gtk_table_set_row_spacings">
+      </glib:signal>
+      <glib:signal name="popup">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="popdown">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+      </glib:signal>
+    </class>
+    <record name="ScaleButtonPrivate" c:type="GtkScaleButtonPrivate"/>
+    <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.char" 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="table">
-            <type name="Table" c:type="GtkTable*"/>
-          </parameter>
-          <parameter name="spacing">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="viewport">
+            <type name="Viewport" c:type="GtkViewport*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_default_row_spacing"
-              c:identifier="gtk_table_get_default_row_spacing">
+      <method name="get_vadjustment"
+              c:identifier="gtk_viewport_get_vadjustment">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
+          <parameter name="viewport">
+            <type name="Viewport" c:type="GtkViewport*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_col_spacings"
-              c:identifier="gtk_table_set_col_spacings">
+      <method name="set_hadjustment"
+              c:identifier="gtk_viewport_set_hadjustment">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
+          <parameter name="viewport">
+            <type name="Viewport" c:type="GtkViewport*"/>
           </parameter>
-          <parameter name="spacing">
-            <type name="uint32" c:type="guint"/>
+          <parameter name="adjustment" allow-none="1">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_default_col_spacing"
-              c:identifier="gtk_table_get_default_col_spacing">
+      <method name="set_vadjustment"
+              c:identifier="gtk_viewport_set_vadjustment">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="Table" c:type="GtkTable*"/>
+          <parameter name="viewport">
+            <type name="Viewport" c:type="GtkViewport*"/>
+          </parameter>
+          <parameter name="adjustment" allow-none="1">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_homogeneous" c:identifier="gtk_table_set_homogeneous">
+      <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="table">
-            <type name="Table" c:type="GtkTable*"/>
+          <parameter name="viewport">
+            <type name="Viewport" c:type="GtkViewport*"/>
           </parameter>
-          <parameter name="homogeneous">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="type">
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_homogeneous" c:identifier="gtk_table_get_homogeneous">
+      <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="table">
-            <type name="Table" c:type="GtkTable*"/>
+          <parameter name="viewport">
+            <type name="Viewport" c:type="GtkViewport*"/>
           </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 name="hadjustment">
+        <type name="Adjustment" c:type="GtkAdjustment"/>
       </property>
-      <property name="row-spacing">
-        <type name="uint32" c:type="guint"/>
+      <property name="vadjustment">
+        <type name="Adjustment" c:type="GtkAdjustment"/>
       </property>
-      <property name="homogeneous">
-        <type name="boolean" c:type="gboolean"/>
+      <property name="shadow-type">
+        <type name="ShadowType" c:type="GtkShadowType"/>
       </property>
+      <callback name="set_scroll_adjustments" c:type="set_scroll_adjustments">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="viewport">
+            <type name="Viewport" c:type="GtkViewport*"/>
+          </parameter>
+          <parameter name="hadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+          <parameter name="vadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+        </parameters>
+      </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="table_new" c:identifier="gtk_table_new">
+    <function name="viewport_new" c:identifier="gtk_viewport_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 name="hadjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </parameter>
-        <parameter name="homogeneous">
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="vadjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </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">
+    <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="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved2">
+        <parameters>
+          <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_vadjustment"
+              c:identifier="gtk_scrolled_window_set_vadjustment">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved3">
+        <parameters>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          </parameter>
+          <parameter name="vadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_hadjustment"
+              c:identifier="gtk_scrolled_window_get_hadjustment">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
-      </callback>
-      <callback name="_gtk_reserved4">
+        <parameters>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <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>
-      </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">
+        <parameters>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_hscrollbar"
+              c:identifier="gtk_scrolled_window_get_hscrollbar">
         <return-value>
-          <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
-      </constructor>
-      <method name="add" c:identifier="gtk_text_tag_table_add">
+        <parameters>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_vscrollbar"
+              c:identifier="gtk_scrolled_window_get_vscrollbar">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          </parameter>
+        </parameters>
+      </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="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
+          <parameter name="hscrollbar_policy">
+            <type name="PolicyType" c:type="GtkPolicyType"/>
+          </parameter>
+          <parameter name="vscrollbar_policy">
+            <type name="PolicyType" c:type="GtkPolicyType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove" c:identifier="gtk_text_tag_table_remove">
+      <method name="get_policy" c:identifier="gtk_scrolled_window_get_policy">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
+          <parameter name="hscrollbar_policy">
+            <type name="PolicyType" c:type="GtkPolicyType*"/>
+          </parameter>
+          <parameter name="vscrollbar_policy">
+            <type name="PolicyType" c:type="GtkPolicyType*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="foreach" c:identifier="gtk_text_tag_table_foreach">
+      <method name="set_placement"
+              c:identifier="gtk_scrolled_window_set_placement">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
-          <parameter name="func">
-            <type name="GtkTextTagTableForeach"
-                  c:type="GtkTextTagTableForeach"/>
+          <parameter name="window_placement">
+            <type name="CornerType" c:type="GtkCornerType"/>
           </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
+        </parameters>
+      </method>
+      <method name="unset_placement"
+              c:identifier="gtk_scrolled_window_unset_placement">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_size" c:identifier="gtk_text_tag_table_get_size">
+      <method name="get_placement"
+              c:identifier="gtk_scrolled_window_get_placement">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="CornerType" c:type="GtkCornerType"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
         </parameters>
       </method>
-      <callback name="tag_changed">
+      <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="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
+          <parameter name="type">
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
-          <parameter name="size_changed">
-            <type name="boolean" c:type="gboolean"/>
+        </parameters>
+      </method>
+      <method name="get_shadow_type"
+              c:identifier="gtk_scrolled_window_get_shadow_type">
+        <return-value>
+          <type name="ShadowType" c:type="GtkShadowType"/>
+        </return-value>
+        <parameters>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="tag_added">
+      </method>
+      <method name="add_with_viewport"
+              c:identifier="gtk_scrolled_window_add_with_viewport">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <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="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>
+      <property name="shadow-type">
+        <type name="ShadowType" c:type="GtkShadowType"/>
+      </property>
+      <field name="scrollbar_spacing">
+        <type name="int" c:type="gint"/>
+      </field>
+      <callback name="scroll_child" c:type="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="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
+          <parameter name="scroll">
+            <type name="ScrollType" c:type="GtkScrollType"/>
+          </parameter>
+          <parameter name="horizontal">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="tag_removed">
+      <callback name="move_focus_out" c:type="move_focus_out">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
           </parameter>
-          <parameter name="tag">
-            <type name="TextTag" c:type="GtkTextTag*"/>
+          <parameter name="direction">
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <glib:signal name="tag-changed">
+      <glib:signal name="move-focus-out">
         <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="boolean" c:type="gboolean"/>
+            <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="tag-added">
+      <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="TextTag" c:type="GtkTextTag"/>
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </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="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </glib:signal>
     </class>
-    <function name="text_tag_table_add_buffer"
-              c:identifier="_gtk_text_tag_table_add_buffer">
+    <function name="scrolled_window_new"
+              c:identifier="gtk_scrolled_window_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 name="hadjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </parameter>
-        <parameter name="buffer">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="vadjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_tag_table_remove_buffer"
-              c:identifier="_gtk_text_tag_table_remove_buffer">
+    <function name="scrolled_window_get_scrollbar_spacing"
+              c:identifier="_gtk_scrolled_window_get_scrollbar_spacing">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
-        <parameter name="table">
-          <type name="TextTagTable" c:type="GtkTextTagTable*"/>
-        </parameter>
-        <parameter name="buffer">
-          <type name="any" c:type="gpointer"/>
+        <parameter name="scrolled_window">
+          <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
         </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">
+    <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>
+    <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="TextMark" c:type="GtkTextMark*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="item">
+            <type name="SeparatorToolItem" c:type="GtkSeparatorToolItem*"/>
           </parameter>
-          <parameter name="left_gravity">
+        </parameters>
+      </method>
+      <method name="set_draw" c:identifier="gtk_separator_tool_item_set_draw">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="item">
+            <type name="SeparatorToolItem" c:type="GtkSeparatorToolItem*"/>
+          </parameter>
+          <parameter name="draw">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
+      </method>
+      <property name="draw">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <record name="SeparatorToolItemPrivate"
+            c:type="GtkSeparatorToolItemPrivate"/>
+    <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="mode">
+            <type name="SizeGroupMode" c:type="GtkSizeGroupMode"/>
+          </parameter>
+        </parameters>
       </constructor>
-      <method name="set_visible" c:identifier="gtk_text_mark_set_visible">
+      <method name="set_mode" c:identifier="gtk_size_group_set_mode">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="size_group">
+            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
           </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="mode">
+            <type name="SizeGroupMode" c:type="GtkSizeGroupMode"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_visible" c:identifier="gtk_text_mark_get_visible">
+      <method name="get_mode" c:identifier="gtk_size_group_get_mode">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="SizeGroupMode" c:type="GtkSizeGroupMode"/>
         </return-value>
         <parameters>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="size_group">
+            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_name" c:identifier="gtk_text_mark_get_name">
+      <method name="set_ignore_hidden"
+              c:identifier="gtk_size_group_set_ignore_hidden">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <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_deleted" c:identifier="gtk_text_mark_get_deleted">
+      <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="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="size_group">
+            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_buffer" c:identifier="gtk_text_mark_get_buffer">
+      <method name="add_widget" c:identifier="gtk_size_group_add_widget">
         <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="size_group">
+            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_left_gravity"
-              c:identifier="gtk_text_mark_get_left_gravity">
+      <method name="remove_widget" c:identifier="gtk_size_group_remove_widget">
         <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="size_group">
+            <type name="SizeGroup" c:type="GtkSizeGroup*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <property name="name">
-        <type name="string" c:type="gchararray"/>
+      <method name="get_widgets" c:identifier="gtk_size_group_get_widgets">
+        <return-value>
+          <type name="GLib.SList" 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="left-gravity">
+      <property name="ignore-hidden">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_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">
+    <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="TextBuffer" c:type="GtkTextBuffer*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="table">
-            <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-        </parameters>
-      </constructor>
-      <method name="get_line_count"
-              c:identifier="gtk_text_buffer_get_line_count">
-        <return-value>
-          <type name="int32" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <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="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_char_count"
-              c:identifier="gtk_text_buffer_get_char_count">
+      <method name="set_adjustment"
+              c:identifier="gtk_spin_button_set_adjustment">
         <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="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_tag_table"
-              c:identifier="gtk_text_buffer_get_tag_table">
+      <method name="get_adjustment"
+              c:identifier="gtk_spin_button_get_adjustment">
         <return-value>
-          <type name="TextTagTable" c:type="GtkTextTagTable*"/>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_text" c:identifier="gtk_text_buffer_set_text">
+      <method name="set_digits" c:identifier="gtk_spin_button_set_digits">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="len">
-            <type name="int32" c:type="gint"/>
+          <parameter name="digits">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert" c:identifier="gtk_text_buffer_insert">
+      <method name="get_digits" c:identifier="gtk_spin_button_get_digits">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="uint" c:type="guint"/>
         </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="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_at_cursor"
-              c:identifier="gtk_text_buffer_insert_at_cursor">
+      <method name="set_increments"
+              c:identifier="gtk_spin_button_set_increments">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="step">
+            <type name="double" c:type="gdouble"/>
           </parameter>
-          <parameter name="len">
-            <type name="int32" c:type="gint"/>
+          <parameter name="page">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_interactive"
-              c:identifier="gtk_text_buffer_insert_interactive">
+      <method name="get_increments"
+              c:identifier="gtk_spin_button_get_increments">
         <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 name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="len">
-            <type name="int32" c:type="gint"/>
+          <parameter name="step">
+            <type name="double" c:type="gdouble*"/>
           </parameter>
-          <parameter name="default_editable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="page">
+            <type name="double" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_interactive_at_cursor"
-              c:identifier="gtk_text_buffer_insert_interactive_at_cursor">
+      <method name="set_range" c:identifier="gtk_spin_button_set_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="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="len">
-            <type name="int32" c:type="gint"/>
+          <parameter name="min">
+            <type name="double" c:type="gdouble"/>
           </parameter>
-          <parameter name="default_editable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="max">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_range" c:identifier="gtk_text_buffer_insert_range">
+      <method name="get_range" c:identifier="gtk_spin_button_get_range">
         <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="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="min">
+            <type name="double" c:type="gdouble*"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="max">
+            <type name="double" c:type="gdouble*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_range_interactive"
-              c:identifier="gtk_text_buffer_insert_range_interactive">
+      <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="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>
-          <parameter name="default_editable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_with_tags"
-              c:identifier="gtk_text_buffer_insert_with_tags">
+      <method name="get_value_as_int"
+              c:identifier="gtk_spin_button_get_value_as_int">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </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="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_with_tags_by_name"
-              c:identifier="gtk_text_buffer_insert_with_tags_by_name">
+      <method name="set_value" c:identifier="gtk_spin_button_set_value">
         <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 name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="first_tag_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="value">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="delete" c:identifier="gtk_text_buffer_delete">
+      <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="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="delete_interactive"
-              c:identifier="gtk_text_buffer_delete_interactive">
-        <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 name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="default_editable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="policy">
+            <type name="SpinButtonUpdatePolicy"
+                  c:type="GtkSpinButtonUpdatePolicy"/>
           </parameter>
         </parameters>
       </method>
-      <method name="backspace" c:identifier="gtk_text_buffer_backspace">
+      <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="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <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 name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_text" c:identifier="gtk_text_buffer_get_text">
+      <method name="set_numeric" c:identifier="gtk_spin_button_set_numeric">
         <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>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="include_hidden_chars">
+          <parameter name="numeric">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_slice" c:identifier="gtk_text_buffer_get_slice">
+      <method name="get_numeric" c:identifier="gtk_spin_button_get_numeric">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </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>
-          <parameter name="include_hidden_chars">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_pixbuf"
-              c:identifier="gtk_text_buffer_insert_pixbuf">
+      <method name="spin" c:identifier="gtk_spin_button_spin">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="direction">
+            <type name="SpinType" c:type="GtkSpinType"/>
           </parameter>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="increment">
+            <type name="double" c:type="gdouble"/>
           </parameter>
         </parameters>
       </method>
-      <method name="insert_child_anchor"
-              c:identifier="gtk_text_buffer_insert_child_anchor">
+      <method name="set_wrap" c:identifier="gtk_spin_button_set_wrap">
         <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="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="anchor">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          <parameter name="wrap">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="create_child_anchor"
-              c:identifier="gtk_text_buffer_create_child_anchor">
+      <method name="get_wrap" c:identifier="gtk_spin_button_get_wrap">
         <return-value>
-          <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          <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="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_mark" c:identifier="gtk_text_buffer_add_mark">
+      <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="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="where">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="snap_to_ticks">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="create_mark" c:identifier="gtk_text_buffer_create_mark">
+      <method name="get_snap_to_ticks"
+              c:identifier="gtk_spin_button_get_snap_to_ticks">
         <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>
-          <parameter name="mark_name" allow-none="1">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="where">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="left_gravity">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="move_mark" c:identifier="gtk_text_buffer_move_mark">
+      <method name="update" c:identifier="gtk_spin_button_update">
         <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>
-          <parameter name="where">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="delete_mark" c:identifier="gtk_text_buffer_delete_mark">
+      <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="uint" 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" c:type="input">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="mark">
-            <type name="TextMark" c:type="GtkTextMark*"/>
+          <parameter name="new_value">
+            <type name="double" c:type="gdouble*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_mark" c:identifier="gtk_text_buffer_get_mark">
+      </callback>
+      <callback name="output" c:type="output">
         <return-value>
-          <type name="TextMark" c:type="GtkTextMark*"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="move_mark_by_name"
-              c:identifier="gtk_text_buffer_move_mark_by_name">
+      </callback>
+      <callback name="value_changed" c:type="value_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
+        </parameters>
+      </callback>
+      <callback name="change_value" c:type="change_value">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
-          <parameter name="where">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="scroll">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="delete_mark_by_name"
-              c:identifier="gtk_text_buffer_delete_mark_by_name">
+      </callback>
+      <callback name="wrapped" c:type="wrapped">
         <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 name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_insert" c:identifier="gtk_text_buffer_get_insert">
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
-          <type name="TextMark" c:type="GtkTextMark*"/>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_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="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="object">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_selection_bound"
-              c:identifier="gtk_text_buffer_get_selection_bound">
+      </glib:signal>
+      <glib:signal name="input">
         <return-value>
-          <type name="TextMark" c:type="GtkTextMark*"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="object">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="place_cursor" c:identifier="gtk_text_buffer_place_cursor">
+      </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="uint" 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">
+        <return-value>
+          <type name="uint" c:type="guint"/>
+        </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
           </parameter>
-          <parameter name="where">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="context_description">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="select_range" c:identifier="gtk_text_buffer_select_range">
+      <method name="push" c:identifier="gtk_statusbar_push">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
           </parameter>
-          <parameter name="ins">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="context_id">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="bound">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="apply_tag" c:identifier="gtk_text_buffer_apply_tag">
+      <method name="pop" c:identifier="gtk_statusbar_pop">
         <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>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="context_id">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_tag" c:identifier="gtk_text_buffer_remove_tag">
+      <method name="remove" c:identifier="gtk_statusbar_remove">
         <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 name="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
           </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="context_id">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="message_id">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="apply_tag_by_name"
-              c:identifier="gtk_text_buffer_apply_tag_by_name">
+      <method name="set_has_resize_grip"
+              c:identifier="gtk_statusbar_set_has_resize_grip">
         <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="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_tag_by_name"
-              c:identifier="gtk_text_buffer_remove_tag_by_name">
+      <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="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 name="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_all_tags"
-              c:identifier="gtk_text_buffer_remove_all_tags">
+      <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" c:type="text_pushed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
           </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="context_id">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="create_tag" c:identifier="gtk_text_buffer_create_tag">
+      </callback>
+      <callback name="text_popped" c:type="text_popped">
         <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 name="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
           </parameter>
-          <parameter name="tag_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="context_id">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="first_property_name">
+          <parameter name="text">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_iter_at_line_offset"
-              c:identifier="gtk_text_buffer_get_iter_at_line_offset">
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <glib:signal name="text-pushed">
         <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 name="object">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="char_offset">
-            <type name="int32" c:type="gint"/>
+          <parameter name="p0">
+            <type name="string" c:type="gchararray"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_iter_at_line_index"
-              c:identifier="gtk_text_buffer_get_iter_at_line_index">
+      </glib:signal>
+      <glib:signal name="text-popped">
         <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 name="object">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="byte_index">
-            <type name="int32" c:type="gint"/>
+          <parameter name="p0">
+            <type name="string" c:type="gchararray"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_iter_at_offset"
-              c:identifier="gtk_text_buffer_get_iter_at_offset">
+      </glib:signal>
+    </class>
+    <function name="statusbar_new" c:identifier="gtk_statusbar_new">
+      <return-value>
+        <type name="Widget" c:type="GtkWidget*"/>
+      </return-value>
+    </function>
+    <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="none" c:type="void"/>
+          <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="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="pixbuf">
+            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
-          <parameter name="char_offset">
-            <type name="int32" c:type="gint"/>
+        </parameters>
+      </constructor>
+      <constructor name="new_from_file"
+                   c:identifier="gtk_status_icon_new_from_file">
+        <return-value>
+          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+        </return-value>
+        <parameters>
+          <parameter name="filename">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_iter_at_line"
-              c:identifier="gtk_text_buffer_get_iter_at_line">
+      </constructor>
+      <constructor name="new_from_stock"
+                   c:identifier="gtk_status_icon_new_from_stock">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
         </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="stock_id">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_start_iter"
-              c:identifier="gtk_text_buffer_get_start_iter">
+      </constructor>
+      <constructor name="new_from_icon_name"
+                   c:identifier="gtk_status_icon_new_from_icon_name">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="StatusIcon" c:type="GtkStatusIcon*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="icon_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_end_iter" c:identifier="gtk_text_buffer_get_end_iter">
+      </constructor>
+      <method name="set_from_pixbuf"
+              c:identifier="gtk_status_icon_set_from_pixbuf">
         <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="pixbuf" allow-none="1">
+            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_bounds" c:identifier="gtk_text_buffer_get_bounds">
+      <method name="set_from_file"
+              c:identifier="gtk_status_icon_set_from_file">
         <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="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="filename">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_iter_at_mark"
-              c:identifier="gtk_text_buffer_get_iter_at_mark">
+      <method name="set_from_stock"
+              c:identifier="gtk_status_icon_set_from_stock">
         <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="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
-          <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_iter_at_child_anchor"
-              c:identifier="gtk_text_buffer_get_iter_at_child_anchor">
+      <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>
         <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="anchor">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          <parameter name="icon_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_modified" c:identifier="gtk_text_buffer_get_modified">
+      <method name="get_storage_type"
+              c:identifier="gtk_status_icon_get_storage_type">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="ImageType" c:type="GtkImageType"/>
         </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_modified" c:identifier="gtk_text_buffer_set_modified">
+      <method name="get_pixbuf" c:identifier="gtk_status_icon_get_pixbuf">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_has_selection"
-              c:identifier="gtk_text_buffer_get_has_selection">
+      <method name="get_stock" c:identifier="gtk_status_icon_get_stock">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </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="add_selection_clipboard"
-              c:identifier="gtk_text_buffer_add_selection_clipboard">
+      <method name="get_icon_name"
+              c:identifier="gtk_status_icon_get_icon_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="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_selection_clipboard"
-              c:identifier="gtk_text_buffer_remove_selection_clipboard">
+      <method name="get_size" c:identifier="gtk_status_icon_get_size">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="cut_clipboard"
-              c:identifier="gtk_text_buffer_cut_clipboard">
+      <method name="set_screen" c:identifier="gtk_status_icon_set_screen">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
-          <parameter name="default_editable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="copy_clipboard"
-              c:identifier="gtk_text_buffer_copy_clipboard">
+      <method name="get_screen" c:identifier="gtk_status_icon_get_screen">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Gdk.Screen" c:type="GdkScreen*"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="paste_clipboard"
-              c:identifier="gtk_text_buffer_paste_clipboard">
+      <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>
-          <parameter name="clipboard">
-            <type name="Clipboard" c:type="GtkClipboard*"/>
-          </parameter>
-          <parameter name="override_location" allow-none="1">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
-          <parameter name="default_editable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="tooltip_text" allow-none="1">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_selection_bounds"
-              c:identifier="gtk_text_buffer_get_selection_bounds">
+      <method name="set_visible" c:identifier="gtk_status_icon_set_visible">
         <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="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="visible">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="delete_selection"
-              c:identifier="gtk_text_buffer_delete_selection">
+      <method name="get_visible" c:identifier="gtk_status_icon_get_visible">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="interactive">
-            <type name="boolean" c:type="gboolean"/>
-          </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="begin_user_action"
-              c:identifier="gtk_text_buffer_begin_user_action">
+      <method name="set_blinking" c:identifier="gtk_status_icon_set_blinking">
         <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>
-        </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="blinking">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_copy_target_list"
-              c:identifier="gtk_text_buffer_get_copy_target_list">
+      <method name="get_blinking" c:identifier="gtk_status_icon_get_blinking">
         <return-value>
-          <type name="TargetList" c:type="GtkTargetList*"/>
+          <type name="boolean" c:type="gboolean"/>
         </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_paste_target_list"
-              c:identifier="gtk_text_buffer_get_paste_target_list">
+      <method name="is_embedded" c:identifier="gtk_status_icon_is_embedded">
         <return-value>
-          <type name="TargetList" c:type="GtkTargetList*"/>
+          <type name="boolean" c:type="gboolean"/>
         </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="register_serialize_format"
-              c:identifier="gtk_text_buffer_register_serialize_format">
+      <method name="get_geometry" c:identifier="gtk_status_icon_get_geometry">
         <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 name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
-          <parameter name="function">
-            <type name="GtkTextBufferSerializeFunc"
-                  c:type="GtkTextBufferSerializeFunc"/>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen**"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
-          <parameter name="user_data_destroy">
-            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+          <parameter name="orientation">
+            <type name="Orientation" c:type="GtkOrientation*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="register_serialize_tagset"
-              c:identifier="gtk_text_buffer_register_serialize_tagset">
+      <property name="pixbuf">
+        <type name="Pixbuf.Pixbuf" 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="int" 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" c:type="activate">
         <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="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="register_deserialize_format"
-              c:identifier="gtk_text_buffer_register_deserialize_format">
+      </callback>
+      <callback name="popup_menu" c:type="popup_menu">
         <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>
-          <parameter name="function">
-            <type name="GtkTextBufferDeserializeFunc"
-                  c:type="GtkTextBufferDeserializeFunc"/>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
-          <parameter name="user_data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="button">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="user_data_destroy">
-            <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+          <parameter name="activate_time">
+            <type name="uint32" c:type="guint32"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="register_deserialize_tagset"
-              c:identifier="gtk_text_buffer_register_deserialize_tagset">
+      </callback>
+      <callback name="size_changed" c:type="size_changed">
         <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 name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
-          <parameter name="tagset_name" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="size">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="unregister_serialize_format"
-              c:identifier="gtk_text_buffer_unregister_serialize_format">
+      </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 name="object">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+          <parameter name="p0">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="unregister_deserialize_format"
-              c:identifier="gtk_text_buffer_unregister_deserialize_format">
+      </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="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="deserialize_set_can_create_tags"
-              c:identifier="gtk_text_buffer_deserialize_set_can_create_tags">
+      </glib:signal>
+    </class>
+    <record name="StatusIconPrivate" c:type="GtkStatusIconPrivate"/>
+    <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="int" c:type="gint*"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+        <parameter name="push_in">
+          <type name="boolean" c:type="gboolean*"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </function>
+    <record name="StockItem" 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="Gdk.ModifierType" c:type="GdkModifierType"/>
+      </field>
+      <field name="keyval">
+        <type name="uint" 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="StockItem" c:type="GtkStockItem*"/>
+        </parameter>
+        <parameter name="n_items">
+          <type name="uint" 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="StockItem" c:type="GtkStockItem*"/>
+        </parameter>
+        <parameter name="n_items">
+          <type name="uint" 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="StockItem" c:type="GtkStockItem*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="stock_list_ids" c:identifier="gtk_stock_list_ids">
+      <return-value>
+        <type name="GLib.SList" c:type="GSList*"/>
+      </return-value>
+    </function>
+    <function name="stock_item_copy" c:identifier="gtk_stock_item_copy">
+      <return-value>
+        <type name="StockItem" c:type="GtkStockItem*"/>
+      </return-value>
+      <parameters>
+        <parameter name="item">
+          <type name="StockItem" 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="StockItem" 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="TranslateFunc" c:type="GtkTranslateFunc"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="notify">
+          <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+        </parameter>
+      </parameters>
+    </function>
+    <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="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>
-          <parameter name="can_create_tags">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
-        </parameters>
-      </method>
-      <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="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="rows">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+          <parameter name="columns">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_serialize_formats"
-              c:identifier="gtk_text_buffer_get_serialize_formats">
+      <method name="attach" c:identifier="gtk_table_attach">
         <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 name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
-          <parameter name="n_formats">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_deserialize_formats"
-              c:identifier="gtk_text_buffer_get_deserialize_formats">
-        <return-value>
-          <type name="GdkAtom" c:type="GdkAtom*"/>
-        </return-value>
-        <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="left_attach">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="n_formats">
-            <type name="GLib.gint" c:type="gint*"/>
+          <parameter name="right_attach">
+            <type name="uint" c:type="guint"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="serialize" c:identifier="gtk_text_buffer_serialize">
-        <return-value>
-          <type name="guint8" c:type="guint8*"/>
-        </return-value>
-        <parameters>
-          <parameter name="register_buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="top_attach">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="content_buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="bottom_attach">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+          <parameter name="xoptions">
+            <type name="AttachOptions" c:type="GtkAttachOptions"/>
           </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="yoptions">
+            <type name="AttachOptions" c:type="GtkAttachOptions"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="xpadding">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="length">
-            <type name="gsize" c:type="gsize*"/>
+          <parameter name="ypadding">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="deserialize" c:identifier="gtk_text_buffer_deserialize">
+      <method name="attach_defaults" c:identifier="gtk_table_attach_defaults">
         <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">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
-          <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="iter">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="left_attach">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="data">
-            <type name="guint8" c:type="guint8*"/>
+          <parameter name="right_attach">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="length">
-            <type name="size" c:type="gsize"/>
+          <parameter name="top_attach">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+          <parameter name="bottom_attach">
+            <type name="uint" c:type="guint"/>
           </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">
+      <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>
-          <parameter name="pos">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="row">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="length">
-            <type name="int32" c:type="gint"/>
+          <parameter name="spacing">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="insert_pixbuf">
+      </method>
+      <method name="get_row_spacing" c:identifier="gtk_table_get_row_spacing">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="pos">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
-          <parameter name="pixbuf">
-            <type name="GdkPixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="row">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="insert_child_anchor">
+      </method>
+      <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="pos">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="column">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="anchor">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor*"/>
+          <parameter name="spacing">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="delete_range">
+      </method>
+      <method name="get_col_spacing" c:identifier="gtk_table_get_col_spacing">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
-          </parameter>
-          <parameter name="start">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
-          <parameter name="end">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="column">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="changed">
+      </method>
+      <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 name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="modified_changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="spacing">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="mark_set">
+      </method>
+      <method name="get_default_row_spacing"
+              c:identifier="gtk_table_get_default_row_spacing">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
-          <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 name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="mark_deleted">
+      </method>
+      <method name="set_col_spacings"
+              c:identifier="gtk_table_set_col_spacings">
         <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="spacing">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="apply_tag">
+      </method>
+      <method name="get_default_col_spacing"
+              c:identifier="gtk_table_get_default_col_spacing">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="uint" c:type="guint"/>
         </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_char">
-            <type name="TextIter" c:type="GtkTextIter*"/>
-          </parameter>
-          <parameter name="end_char">
-            <type name="TextIter" c:type="GtkTextIter*"/>
+          <parameter name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="remove_tag">
+      </method>
+      <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>
-          <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 name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="begin_user_action">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="buffer">
-            <type name="TextBuffer" c:type="GtkTextBuffer*"/>
+          <parameter name="homogeneous">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="end_user_action">
+      </method>
+      <method name="get_homogeneous" c:identifier="gtk_table_get_homogeneous">
         <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 name="table">
+            <type name="Table" c:type="GtkTable*"/>
           </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>
+      <property name="n-rows">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="n-columns">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="column-spacing">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="row-spacing">
+        <type name="uint" c:type="guint"/>
+      </property>
+      <property name="homogeneous">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+    </class>
+    <record name="TableChild" 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="uint" c:type="guint"/>
+      </field>
+      <field name="yexpand">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="xshrink">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="yshrink">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="xfill">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="yfill">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </record>
+    <record name="TableRowCol" 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="uint" c:type="guint"/>
+      </field>
+      <field name="need_shrink">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="expand">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="shrink">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="empty">
+        <type name="uint" c:type="guint"/>
+      </field>
+    </record>
+    <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="uint" c:type="guint"/>
+        </parameter>
+        <parameter name="columns">
+          <type name="uint" 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" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved5">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved6">
+      <callback name="gtk_reserved4" c:type="_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>
-      <glib:signal name="insert-text">
+    </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="TextTagTableForeach" c:type="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>
+    <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="object">
-            <type name="TextIter" c:type="GtkTextIter"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="string" c:type="gchararray"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="p1">
-            <type name="int32" c:type="gint"/>
+          <parameter name="left_gravity">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="insert-pixbuf">
+      </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="object">
-            <type name="TextIter" c:type="GtkTextIter"/>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="GdkPixbuf" c:type="GdkPixbuf"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="insert-child-anchor">
+      </method>
+      <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="object">
-            <type name="TextIter" c:type="GtkTextIter"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="TextChildAnchor" c:type="GtkTextChildAnchor"/>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="delete-range">
+      </method>
+      <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="object">
-            <type name="TextIter" c:type="GtkTextIter"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="TextIter" c:type="GtkTextIter"/>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
           </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_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="object">
-            <type name="TextIter" c:type="GtkTextIter"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="TextMark" c:type="GtkTextMark"/>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="mark-deleted">
+      </method>
+      <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="object">
-            <type name="TextMark" c:type="GtkTextMark"/>
+          <parameter name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="apply-tag">
+      </method>
+      <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="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 name="mark">
+            <type name="TextMark" c:type="GtkTextMark*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="remove-tag">
+      </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" c:type="_gtk_reserved1">
         <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>
-          <parameter name="p1">
-            <type name="TextIter" c:type="GtkTextIter"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="begin-user-action">
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="end-user-action">
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
     </class>
+    <record name="TextBTree" c:type="GtkTextBTree"/>
+    <record name="TextLogAttrCache" c:type="GtkTextLogAttrCache"/>
     <function name="text_buffer_spew" c:identifier="_gtk_text_buffer_spew">
       <return-value>
         <type name="none" c:type="void"/>
@@ -59823,7 +60264,7 @@
     <function name="text_buffer_get_btree"
               c:identifier="_gtk_text_buffer_get_btree">
       <return-value>
-        <type name="GtkTextBTree" c:type="GtkTextBTree*"/>
+        <type name="TextBTree" c:type="GtkTextBTree*"/>
       </return-value>
       <parameters>
         <parameter name="buffer">
@@ -59834,7 +60275,7 @@
     <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*"/>
+        <type name="Pango.LogAttr" c:type="PangoLogAttr*"/>
       </return-value>
       <parameters>
         <parameter name="buffer">
@@ -59844,7 +60285,7 @@
           <type name="TextIter" c:type="GtkTextIter*"/>
         </parameter>
         <parameter name="char_len">
-          <type name="GLib.gint" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -59862,9 +60303,10 @@
         </parameter>
       </parameters>
     </function>
-    <callback name="GtkTextBufferSerializeFunc">
+    <callback name="TextBufferSerializeFunc"
+              c:type="GtkTextBufferSerializeFunc">
       <return-value>
-        <type name="guint8" c:type="guint8*"/>
+        <type name="uint8" c:type="guint8*"/>
       </return-value>
       <parameters>
         <parameter name="register_buffer">
@@ -59880,14 +60322,15 @@
           <type name="TextIter" c:type="GtkTextIter*"/>
         </parameter>
         <parameter name="length">
-          <type name="gsize" c:type="gsize*"/>
+          <type name="size_t" c:type="gsize*"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
-    <callback name="GtkTextBufferDeserializeFunc">
+    <callback name="TextBufferDeserializeFunc"
+              c:type="GtkTextBufferDeserializeFunc">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
@@ -59902,10 +60345,10 @@
           <type name="TextIter" c:type="GtkTextIter*"/>
         </parameter>
         <parameter name="data">
-          <type name="guint8" c:type="guint8*"/>
+          <type name="uint8" c:type="guint8*"/>
         </parameter>
         <parameter name="length">
-          <type name="size" c:type="gsize"/>
+          <type name="size_t" c:type="gsize"/>
         </parameter>
         <parameter name="create_tags">
           <type name="boolean" c:type="gboolean"/>
@@ -59914,12 +60357,10 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="error">
-          <type name="GLib.GError" c:type="GError**"/>
+          <type name="GLib.Error" 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"
@@ -60049,7 +60490,7 @@
             <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
           <parameter name="visible_rect">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
       </method>
@@ -60091,7 +60532,7 @@
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="location">
-            <type name="GdkRectangle" c:type="GdkRectangle*"/>
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
       </method>
@@ -60108,10 +60549,10 @@
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -60128,13 +60569,13 @@
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="trailing">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -60151,10 +60592,10 @@
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="y">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="height">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -60170,10 +60611,10 @@
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="line_top">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -60190,16 +60631,16 @@
             <type name="TextWindowType" c:type="GtkTextWindowType"/>
           </parameter>
           <parameter name="buffer_x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="buffer_y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="window_x">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="window_y">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -60216,16 +60657,16 @@
             <type name="TextWindowType" c:type="GtkTextWindowType"/>
           </parameter>
           <parameter name="window_x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="window_y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="buffer_x">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="buffer_y">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -60269,14 +60710,14 @@
             <type name="TextWindowType" c:type="GtkTextWindowType"/>
           </parameter>
           <parameter name="size">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_border_window_size"
               c:identifier="gtk_text_view_get_border_window_size">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="text_view">
@@ -60369,7 +60810,7 @@
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="count">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -60406,10 +60847,10 @@
             <type name="TextWindowType" c:type="GtkTextWindowType"/>
           </parameter>
           <parameter name="xpos">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="ypos">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -60425,10 +60866,10 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="xpos">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="ypos">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -60536,14 +60977,14 @@
             <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
           <parameter name="pixels_above_lines">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_pixels_above_lines"
               c:identifier="gtk_text_view_get_pixels_above_lines">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="text_view">
@@ -60561,14 +61002,14 @@
             <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
           <parameter name="pixels_below_lines">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_pixels_below_lines"
               c:identifier="gtk_text_view_get_pixels_below_lines">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="text_view">
@@ -60586,14 +61027,14 @@
             <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
           <parameter name="pixels_inside_wrap">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_pixels_inside_wrap"
               c:identifier="gtk_text_view_get_pixels_inside_wrap">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="text_view">
@@ -60636,14 +61077,14 @@
             <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
           <parameter name="left_margin">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_left_margin"
               c:identifier="gtk_text_view_get_left_margin">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="text_view">
@@ -60661,14 +61102,14 @@
             <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
           <parameter name="right_margin">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_right_margin"
               c:identifier="gtk_text_view_get_right_margin">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="text_view">
@@ -60685,13 +61126,13 @@
             <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
           <parameter name="indent">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_indent" c:identifier="gtk_text_view_get_indent">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="text_view">
@@ -60708,13 +61149,13 @@
             <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
           <parameter name="tabs">
-            <type name="PangoTabArray" c:type="PangoTabArray*"/>
+            <type name="Pango.TabArray" c:type="PangoTabArray*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_tabs" c:identifier="gtk_text_view_get_tabs">
         <return-value>
-          <type name="PangoTabArray" c:type="PangoTabArray*"/>
+          <type name="Pango.TabArray" c:type="PangoTabArray*"/>
         </return-value>
         <parameters>
           <parameter name="text_view">
@@ -60734,13 +61175,13 @@
         </parameters>
       </method>
       <property name="pixels-above-lines">
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </property>
       <property name="pixels-below-lines">
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </property>
       <property name="pixels-inside-wrap">
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </property>
       <property name="editable">
         <type name="boolean" c:type="gboolean"/>
@@ -60752,16 +61193,16 @@
         <type name="Justification" c:type="GtkJustification"/>
       </property>
       <property name="left-margin">
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </property>
       <property name="right-margin">
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </property>
       <property name="indent">
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </property>
       <property name="tabs">
-        <type name="PangoTabArray" c:type="PangoTabArray"/>
+        <type name="Pango.TabArray" c:type="PangoTabArray"/>
       </property>
       <property name="cursor-visible">
         <type name="boolean" c:type="gboolean"/>
@@ -60775,7 +61216,7 @@
       <property name="accepts-tab">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <callback name="set_scroll_adjustments">
+      <callback name="set_scroll_adjustments" c:type="set_scroll_adjustments">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -60791,7 +61232,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="populate_popup">
+      <callback name="populate_popup" c:type="populate_popup">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -60804,7 +61245,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="move_cursor">
+      <callback name="move_cursor" c:type="move_cursor">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -60816,14 +61257,14 @@
             <type name="MovementStep" c:type="GtkMovementStep"/>
           </parameter>
           <parameter name="count">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="extend_selection">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="page_horizontally">
+      <callback name="page_horizontally" c:type="page_horizontally">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -60832,14 +61273,14 @@
             <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
           <parameter name="count">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="extend_selection">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_anchor">
+      <callback name="set_anchor" c:type="set_anchor">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -60849,7 +61290,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="insert_at_cursor">
+      <callback name="insert_at_cursor" c:type="insert_at_cursor">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -60862,7 +61303,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="delete_from_cursor">
+      <callback name="delete_from_cursor" c:type="delete_from_cursor">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -60874,11 +61315,11 @@
             <type name="DeleteType" c:type="GtkDeleteType"/>
           </parameter>
           <parameter name="count">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="backspace">
+      <callback name="backspace" c:type="backspace">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -60888,7 +61329,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="cut_clipboard">
+      <callback name="cut_clipboard" c:type="cut_clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -60898,7 +61339,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="copy_clipboard">
+      <callback name="copy_clipboard" c:type="copy_clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -60908,7 +61349,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="paste_clipboard">
+      <callback name="paste_clipboard" c:type="paste_clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -60918,7 +61359,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="toggle_overwrite">
+      <callback name="toggle_overwrite" c:type="toggle_overwrite">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -60928,7 +61369,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="move_focus">
+      <callback name="move_focus" c:type="move_focus">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -60941,37 +61382,37 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved5">
+      <callback name="gtk_reserved5" c:type="_gtk_reserved5">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved6">
+      <callback name="gtk_reserved6" c:type="_gtk_reserved6">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved7">
+      <callback name="gtk_reserved7" c:type="_gtk_reserved7">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -60985,7 +61426,7 @@
             <type name="MovementStep" c:type="GtkMovementStep"/>
           </parameter>
           <parameter name="p0">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="p1">
             <type name="boolean" c:type="gboolean"/>
@@ -61007,6 +61448,29 @@
           </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>
+        <parameters>
+          <parameter name="object">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
       <glib:signal name="insert-at-cursor">
         <return-value>
           <type name="none" c:type="void"/>
@@ -61026,7 +61490,7 @@
             <type name="DeleteType" c:type="GtkDeleteType"/>
           </parameter>
           <parameter name="p0">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -61050,36 +61514,13 @@
           <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="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>
-        <parameters>
-          <parameter name="object">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
       <glib:signal name="page-horizontally">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="p0">
             <type name="boolean" c:type="gboolean"/>
@@ -61095,7 +61536,7 @@
             <type name="ScrollStep" c:type="GtkScrollStep"/>
           </parameter>
           <parameter name="p0">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -61110,6 +61551,8 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="TextWindow" c:type="GtkTextWindow"/>
+    <record name="TextPendingScroll" c:type="GtkTextPendingScroll"/>
     <function name="text_view_new" c:identifier="gtk_text_view_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -61126,63 +61569,99 @@
         </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">
+    <class name="TipsQuery"
+           c:type="GtkTipsQuery"
+           parent="Label"
+           glib:type-name="GtkTipsQuery"
+           glib:get-type="gtk_tips_query_get_type">
+      <method name="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="TipsQuery" c:type="GtkTipsQuery*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="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="TipsQuery" c:type="GtkTipsQuery*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="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="TipsQuery" c:type="GtkTipsQuery*"/>
+          </parameter>
+          <parameter name="caller">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="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="TipsQuery" 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>
+      </method>
+      <property name="emit-always">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="caller">
+        <type name="Widget" c:type="GtkWidget"/>
+      </property>
+      <property name="label-inactive">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <property name="label-no-tip">
+        <type name="string" c:type="gchararray"/>
+      </property>
+      <callback name="start_query" c:type="start_query">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="tips_query">
-            <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
+            <type name="TipsQuery" c:type="GtkTipsQuery*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="stop_query">
+      <callback name="stop_query" c:type="stop_query">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="tips_query">
-            <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
+            <type name="TipsQuery" c:type="GtkTipsQuery*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="widget_entered">
+      <callback name="widget_entered" c:type="widget_entered">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="tips_query">
-            <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
+            <type name="TipsQuery" c:type="GtkTipsQuery*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -61195,13 +61674,13 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="widget_selected">
+      <callback name="widget_selected" c:type="widget_selected">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="tips_query">
-            <type name="GtkTipsQuery" c:type="GtkTipsQuery*"/>
+            <type name="TipsQuery" c:type="GtkTipsQuery*"/>
           </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
@@ -61213,96 +61692,82 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="event">
-            <type name="Gdk.GdkEventButton" c:type="GdkEventButton*"/>
+            <type name="Gdk.EventButton" c:type="GdkEventButton*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_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>
+      <glib:signal name="start-query">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="stop-query">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="widget-entered">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Widget" c:type="GtkWidget"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="string" c:type="gchararray"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="string" c:type="gchararray"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="widget-selected">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Widget" c:type="GtkWidget"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="string" c:type="gchararray"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="string" c:type="gchararray"/>
+          </parameter>
+          <parameter name="p2">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
     <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">
+    <record name="ToolbarChild" c:type="GtkToolbarChild">
       <field name="type">
         <type name="ToolbarChildType" c:type="GtkToolbarChildType"/>
       </field>
@@ -61316,7 +61781,6 @@
         <type name="Widget" c:type="GtkWidget*"/>
       </field>
     </record>
-    <record name="GtkToolbarPrivate" c:type="GtkToolbarPrivate"/>
     <class name="Toolbar"
            c:type="GtkToolbar"
            parent="Container"
@@ -61334,13 +61798,13 @@
             <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
           <parameter name="pos">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_item_index" c:identifier="gtk_toolbar_get_item_index">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="toolbar">
@@ -61353,7 +61817,7 @@
       </method>
       <method name="get_n_items" c:identifier="gtk_toolbar_get_n_items">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="toolbar">
@@ -61370,7 +61834,7 @@
             <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
           <parameter name="n">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -61501,17 +61965,17 @@
       </method>
       <method name="get_drop_index" c:identifier="gtk_toolbar_get_drop_index">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="toolbar">
             <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -61528,7 +61992,7 @@
             <type name="ToolItem" c:type="GtkToolItem*"/>
           </parameter>
           <parameter name="index_">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -61577,7 +62041,7 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+            <type name="SignalFunc" c:type="GtkSignalFunc"/>
           </parameter>
           <parameter name="user_data" allow-none="1">
             <type name="any" c:type="gpointer"/>
@@ -61605,7 +62069,7 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+            <type name="SignalFunc" c:type="GtkSignalFunc"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
@@ -61633,13 +62097,13 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+            <type name="SignalFunc" c:type="GtkSignalFunc"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="position">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -61661,13 +62125,13 @@
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+            <type name="SignalFunc" c:type="GtkSignalFunc"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="position">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -61700,7 +62164,7 @@
             <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
           <parameter name="position">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -61713,7 +62177,7 @@
             <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
           <parameter name="position">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -61744,7 +62208,7 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+            <type name="SignalFunc" c:type="GtkSignalFunc"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
@@ -61779,7 +62243,7 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+            <type name="SignalFunc" c:type="GtkSignalFunc"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
@@ -61813,13 +62277,13 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="callback">
-            <type name="GtkSignalFunc" c:type="GtkSignalFunc"/>
+            <type name="SignalFunc" c:type="GtkSignalFunc"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="position">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -61879,7 +62343,7 @@
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="position">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -61901,7 +62365,7 @@
       <property name="icon-size-set">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <callback name="orientation_changed">
+      <callback name="orientation_changed" c:type="orientation_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -61914,7 +62378,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="style_changed">
+      <callback name="style_changed" c:type="style_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -61927,7 +62391,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="popup_context_menu">
+      <callback name="popup_context_menu" c:type="popup_context_menu">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -61936,27 +62400,27 @@
             <type name="Toolbar" c:type="GtkToolbar*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="button_number">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -61987,13 +62451,13 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="p0">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="p1">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -62008,6 +62472,7 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="ToolbarPrivate" c:type="GtkToolbarPrivate"/>
     <function name="toolbar_new" c:identifier="gtk_toolbar_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -62037,17 +62502,17 @@
           <type name="Toolbar" c:type="GtkToolbar*"/>
         </parameter>
         <parameter name="area">
-          <type name="GdkRectangle" c:type="GdkRectangle*"/>
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
         </parameter>
         <parameter name="allocation">
-          <type name="GtkAllocation" c:type="GtkAllocation*"/>
+          <type name="Allocation" 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"/>
+        <type name="int" c:type="gint"/>
       </return-value>
     </function>
     <function name="toolbar_rebuild_menu"
@@ -62061,12 +62526,11 @@
         </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 name="row_draggable" c:type="row_draggable">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -62079,7 +62543,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="drag_data_get">
+      <callback name="drag_data_get" c:type="drag_data_get">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -62095,7 +62559,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="drag_data_delete">
+      <callback name="drag_data_delete" c:type="drag_data_delete">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -62154,12 +62618,11 @@
         </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="drag_data_received" c:type="drag_data_received">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -62175,7 +62638,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="row_drop_possible">
+      <callback name="row_drop_possible" c:type="row_drop_possible">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -62376,22 +62839,22 @@
       <property name="model">
         <type name="TreeModel" c:type="GtkTreeModel"/>
       </property>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -62408,7 +62871,7 @@
         </parameter>
       </parameters>
     </function>
-    <callback name="GtkTreeSelectionFunc">
+    <callback name="TreeSelectionFunc" c:type="GtkTreeSelectionFunc">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
@@ -62430,7 +62893,8 @@
         </parameter>
       </parameters>
     </callback>
-    <callback name="GtkTreeSelectionForeachFunc">
+    <callback name="TreeSelectionForeachFunc"
+              c:type="GtkTreeSelectionForeachFunc">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -62449,309 +62913,6 @@
         </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">
-        <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="GLib.GList" c:type="GList*"/>
-        </return-value>
-        <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="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>
-        </parameters>
-      </method>
-      <method name="select_path" c:identifier="gtk_tree_selection_select_path">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="unselect_path"
-              c:identifier="gtk_tree_selection_unselect_path">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="path">
-            <type name="TreePath" c:type="GtkTreePath*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="select_iter" c:identifier="gtk_tree_selection_select_iter">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="unselect_iter"
-              c:identifier="gtk_tree_selection_unselect_iter">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-          <parameter name="iter">
-            <type name="TreeIter" c:type="GtkTreeIter*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="path_is_selected"
-              c:identifier="gtk_tree_selection_path_is_selected">
-        <return-value>
-          <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>
-        </parameters>
-      </method>
-      <method name="iter_is_selected"
-              c:identifier="gtk_tree_selection_iter_is_selected">
-        <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>
-        </parameters>
-      </method>
-      <method name="select_all" c:identifier="gtk_tree_selection_select_all">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="unselect_all"
-              c:identifier="gtk_tree_selection_unselect_all">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="select_range"
-              c:identifier="gtk_tree_selection_select_range">
-        <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>
-        </parameters>
-      </method>
-      <method name="unselect_range"
-              c:identifier="gtk_tree_selection_unselect_range">
-        <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>
-        </parameters>
-      </method>
-      <callback name="changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="selection">
-            <type name="TreeSelection" c:type="GtkTreeSelection*"/>
-          </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"
@@ -62763,7 +62924,7 @@
         </return-value>
         <parameters>
           <parameter name="n_columns">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </constructor>
@@ -62773,10 +62934,10 @@
         </return-value>
         <parameters>
           <parameter name="n_columns">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="types">
-            <type name="GObject.GType" c:type="GType*"/>
+            <type name="GObject.Type" c:type="GType*"/>
           </parameter>
         </parameters>
       </constructor>
@@ -62790,10 +62951,10 @@
             <type name="TreeStore" c:type="GtkTreeStore*"/>
           </parameter>
           <parameter name="n_columns">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="types">
-            <type name="GObject.GType" c:type="GType*"/>
+            <type name="GObject.Type" c:type="GType*"/>
           </parameter>
         </parameters>
       </method>
@@ -62809,10 +62970,10 @@
             <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
           <parameter name="column">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="value">
-            <type name="GObject.GValue" c:type="GValue*"/>
+            <type name="GObject.Value" c:type="GValue*"/>
           </parameter>
         </parameters>
       </method>
@@ -62841,13 +63002,13 @@
             <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
           <parameter name="columns">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="values">
-            <type name="GObject.GValue" c:type="GValue*"/>
+            <type name="GObject.Value" c:type="GValue*"/>
           </parameter>
           <parameter name="n_values">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -62879,7 +63040,7 @@
             <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
           <parameter name="position">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -62937,7 +63098,7 @@
             <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
           <parameter name="position">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -62957,16 +63118,16 @@
             <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
           <parameter name="position">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="columns">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
           <parameter name="values">
-            <type name="GObject.GValue" c:type="GValue*"/>
+            <type name="GObject.Value" c:type="GValue*"/>
           </parameter>
           <parameter name="n_values">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -63020,7 +63181,7 @@
       </method>
       <method name="iter_depth" c:identifier="gtk_tree_store_iter_depth">
         <return-value>
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="tree_store">
@@ -63066,7 +63227,7 @@
             <type name="TreeIter" c:type="GtkTreeIter*"/>
           </parameter>
           <parameter name="new_order">
-            <type name="GLib.gint" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -63118,28 +63279,27 @@
           </parameter>
         </parameters>
       </method>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_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"
@@ -63188,7 +63348,7 @@
             <type name="ActionGroup" c:type="GtkActionGroup*"/>
           </parameter>
           <parameter name="pos">
-            <type name="int32" c:type="gint"/>
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
@@ -63209,7 +63369,7 @@
       <method name="get_action_groups"
               c:identifier="gtk_ui_manager_get_action_groups">
         <return-value>
-          <type name="GLib.GList" c:type="GList*"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="self">
@@ -63243,7 +63403,7 @@
       </method>
       <method name="get_toplevels" c:identifier="gtk_ui_manager_get_toplevels">
         <return-value>
-          <type name="GLib.GSList" c:type="GSList*"/>
+          <type name="GLib.SList" c:type="GSList*"/>
         </return-value>
         <parameters>
           <parameter name="self">
@@ -63270,7 +63430,7 @@
       <method name="add_ui_from_string"
               c:identifier="gtk_ui_manager_add_ui_from_string">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="self">
@@ -63280,17 +63440,17 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="length">
-            <type name="ssize" c:type="gssize"/>
+            <type name="ssize_t" c:type="gssize"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
       <method name="add_ui_from_file"
               c:identifier="gtk_ui_manager_add_ui_from_file">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="self">
@@ -63300,7 +63460,7 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="error">
-            <type name="GLib.GError" c:type="GError**"/>
+            <type name="GLib.Error" c:type="GError**"/>
           </parameter>
         </parameters>
       </method>
@@ -63313,7 +63473,7 @@
             <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
           <parameter name="merge_id">
-            <type name="uint32" c:type="guint"/>
+            <type name="uint" c:type="guint"/>
           </parameter>
           <parameter name="path">
             <type name="string" c:type="gchar*"/>
@@ -63341,7 +63501,7 @@
             <type name="UIManager" c:type="GtkUIManager*"/>
           </parameter>
           <parameter name="merge_id">
-            <type name="uint32" c:type="guint"/>
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
@@ -63367,7 +63527,7 @@
       </method>
       <method name="new_merge_id" c:identifier="gtk_ui_manager_new_merge_id">
         <return-value>
-          <type name="uint32" c:type="guint"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
           <parameter name="self">
@@ -63381,7 +63541,7 @@
       <property name="ui">
         <type name="string" c:type="gchararray"/>
       </property>
-      <callback name="add_widget">
+      <callback name="add_widget" c:type="add_widget">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -63394,7 +63554,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="actions_changed">
+      <callback name="actions_changed" c:type="actions_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -63404,7 +63564,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="connect_proxy">
+      <callback name="connect_proxy" c:type="connect_proxy">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -63420,7 +63580,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="disconnect_proxy">
+      <callback name="disconnect_proxy" c:type="disconnect_proxy">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -63436,7 +63596,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="pre_activate">
+      <callback name="pre_activate" c:type="pre_activate">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -63449,7 +63609,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="post_activate">
+      <callback name="post_activate" c:type="post_activate">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -63462,7 +63622,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_widget">
+      <callback name="get_widget" c:type="get_widget">
         <return-value>
           <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
@@ -63475,7 +63635,7 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_action">
+      <callback name="get_action" c:type="get_action">
         <return-value>
           <type name="Action" c:type="GtkAction*"/>
         </return-value>
@@ -63488,12 +63648,12 @@
           </parameter>
         </parameters>
       </callback>
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -63560,6 +63720,7 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="UIManagerPrivate" c:type="GtkUIManagerPrivate"/>
     <class name="VButtonBox"
            c:type="GtkVButtonBox"
            parent="ButtonBox"
@@ -63574,7 +63735,7 @@
     <function name="vbutton_box_get_spacing_default"
               c:identifier="gtk_vbutton_box_get_spacing_default">
       <return-value>
-        <type name="int32" c:type="gint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
     </function>
     <function name="vbutton_box_set_spacing_default"
@@ -63584,7 +63745,7 @@
       </return-value>
       <parameters>
         <parameter name="spacing">
-          <type name="int32" c:type="gint"/>
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
@@ -63610,22 +63771,22 @@
            parent="ScaleButton"
            glib:type-name="GtkVolumeButton"
            glib:get-type="gtk_volume_button_get_type">
-      <callback name="_gtk_reserved1">
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved2">
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved3">
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-      <callback name="_gtk_reserved4">
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -63702,7 +63863,7 @@
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
-    <record name="GtkIMContextInfo" c:type="GtkIMContextInfo">
+    <record name="IMContextInfo" c:type="GtkIMContextInfo">
       <field name="context_id">
         <type name="string" c:type="gchar*"/>
       </field>
@@ -63725,10 +63886,10 @@
       </return-value>
       <parameters>
         <parameter name="contexts">
-          <type name="GtkIMContextInfo" c:type="GtkIMContextInfo***"/>
+          <type name="IMContextInfo" c:type="GtkIMContextInfo***"/>
         </parameter>
         <parameter name="n_contexts">
-          <type name="GLib.guint" c:type="guint*"/>
+          <type name="uint" c:type="guint*"/>
         </parameter>
       </parameters>
     </function>

Modified: trunk/gir/pango.gir
==============================================================================
--- trunk/gir/pango.gir	(original)
+++ trunk/gir/pango.gir	Tue Aug 19 21:36:46 2008
@@ -3,9 +3,9 @@
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
   <namespace name="Pango">
-    <alias name="Glyph" target="guint32" c:type="PangoGlyph"/>
-    <alias name="GlyphUnit" target="gint32" c:type="PangoGlyphUnit"/>
+    <alias name="GlyphUnit" target="int32" c:type="PangoGlyphUnit"/>
     <alias name="LayoutRun" target="GlyphItem" c:type="PangoLayoutRun"/>
+    <alias name="Glyph" target="uint32" c:type="PangoGlyph"/>
     <record name="Coverage" c:type="PangoCoverage"/>
     <enumeration name="CoverageLevel"
                  c:type="PangoCoverageLevel"
@@ -72,7 +72,7 @@
           <type name="Coverage" c:type="PangoCoverage*"/>
         </parameter>
         <parameter name="index_">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -85,7 +85,7 @@
           <type name="Coverage" c:type="PangoCoverage*"/>
         </parameter>
         <parameter name="index_">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="level">
           <type name="CoverageLevel" c:type="PangoCoverageLevel"/>
@@ -131,7 +131,7 @@
           <type name="GLib.uchar" c:type="guchar*"/>
         </parameter>
         <parameter name="n_bytes">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -334,21 +334,21 @@
     </class>
     <record name="Rectangle" c:type="PangoRectangle">
       <field name="x">
-        <type name="int32" c:type="int"/>
+        <type name="int" c:type="int"/>
       </field>
       <field name="y">
-        <type name="int32" c:type="int"/>
+        <type name="int" c:type="int"/>
       </field>
       <field name="width">
-        <type name="int32" c:type="int"/>
+        <type name="int" c:type="int"/>
       </field>
       <field name="height">
-        <type name="int32" c:type="int"/>
+        <type name="int" c:type="int"/>
       </field>
     </record>
     <function name="units_from_double" c:identifier="pango_units_from_double">
       <return-value>
-        <type name="int32" c:type="int"/>
+        <type name="int" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="d">
@@ -362,7 +362,7 @@
       </return-value>
       <parameters>
         <parameter name="i">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -490,7 +490,7 @@
               c:identifier="PANGO_GRAVITY_HINT_LINE"
               glib:nick="line"/>
     </enumeration>
-    <glib:boxed c:type="Matrix"
+    <glib:boxed c:type="PangoMatrix"
                 glib:name="Matrix"
                 glib:type-name="PangoMatrix"
                 glib:get-type="pango_matrix_get_type">
@@ -646,7 +646,7 @@
         </parameters>
       </method>
     </glib:boxed>
-    <glib:boxed c:type="Language"
+    <glib:boxed c:type="PangoLanguage"
                 glib:name="Language"
                 glib:type-name="PangoLanguage"
                 glib:get-type="pango_language_get_type">
@@ -1048,7 +1048,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="length">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -1062,10 +1062,10 @@
           <type name="ScriptIter" c:type="PangoScriptIter*"/>
         </parameter>
         <parameter name="start">
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </parameter>
         <parameter name="end">
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </parameter>
         <parameter name="script">
           <type name="Script" c:type="PangoScript*"/>
@@ -1142,7 +1142,7 @@
         </parameter>
       </parameters>
     </function>
-    <glib:boxed c:type="FontDescription"
+    <glib:boxed c:type="PangoFontDescription"
                 glib:name="FontDescription"
                 glib:type-name="PangoFontDescription"
                 glib:get-type="pango_font_description_get_type">
@@ -1523,7 +1523,7 @@
         </parameters>
       </method>
     </glib:boxed>
-    <glib:boxed c:type="FontMetrics"
+    <glib:boxed c:type="PangoFontMetrics"
                 glib:name="FontMetrics"
                 glib:type-name="PangoFontMetrics"
                 glib:get-type="pango_font_metrics_get_type">
@@ -1549,7 +1549,7 @@
       </method>
       <method name="get_ascent" c:identifier="pango_font_metrics_get_ascent">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="metrics">
@@ -1559,7 +1559,7 @@
       </method>
       <method name="get_descent" c:identifier="pango_font_metrics_get_descent">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="metrics">
@@ -1570,7 +1570,7 @@
       <method name="get_approximate_char_width"
               c:identifier="pango_font_metrics_get_approximate_char_width">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="metrics">
@@ -1581,7 +1581,7 @@
       <method name="get_approximate_digit_width"
               c:identifier="pango_font_metrics_get_approximate_digit_width">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="metrics">
@@ -1592,7 +1592,7 @@
       <method name="get_underline_position"
               c:identifier="pango_font_metrics_get_underline_position">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="metrics">
@@ -1603,7 +1603,7 @@
       <method name="get_underline_thickness"
               c:identifier="pango_font_metrics_get_underline_thickness">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="metrics">
@@ -1614,7 +1614,7 @@
       <method name="get_strikethrough_position"
               c:identifier="pango_font_metrics_get_strikethrough_position">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="metrics">
@@ -1625,7 +1625,7 @@
       <method name="get_strikethrough_thickness"
               c:identifier="pango_font_metrics_get_strikethrough_thickness">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="metrics">
@@ -1781,7 +1781,7 @@
           <type name="FontDescription" c:type="PangoFontDescription**"/>
         </parameter>
         <parameter name="n_descs">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -1882,7 +1882,7 @@
         </parameters>
       </method>
     </class>
-    <glib:boxed c:type="Color"
+    <glib:boxed c:type="PangoColor"
                 glib:name="Color"
                 glib:type-name="PangoColor"
                 glib:get-type="pango_color_get_type">
@@ -2000,7 +2000,7 @@
         <type name="Attribute" c:type="PangoAttribute"/>
       </field>
       <field name="value">
-        <type name="int32" c:type="int"/>
+        <type name="int" c:type="int"/>
       </field>
     </record>
     <record name="AttrSize" c:type="PangoAttrSize">
@@ -2008,7 +2008,7 @@
         <type name="Attribute" c:type="PangoAttribute"/>
       </field>
       <field name="size">
-        <type name="int32" c:type="int"/>
+        <type name="int" c:type="int"/>
       </field>
       <field name="absolute">
         <type name="uint" c:type="guint"/>
@@ -2058,7 +2058,7 @@
         <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
       </field>
     </record>
-    <glib:boxed c:type="AttrList"
+    <glib:boxed c:type="PangoAttrList"
                 glib:name="AttrList"
                 glib:type-name="PangoAttrList"
                 glib:get-type="pango_attr_list_get_type">
@@ -2446,7 +2446,7 @@
       </return-value>
       <parameters>
         <parameter name="size">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -2457,7 +2457,7 @@
       </return-value>
       <parameters>
         <parameter name="size">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -2574,7 +2574,7 @@
       </return-value>
       <parameters>
         <parameter name="rise">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -2605,7 +2605,7 @@
       </return-value>
       <parameters>
         <parameter name="letter_spacing">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -2676,10 +2676,10 @@
           <type name="AttrIterator" c:type="PangoAttrIterator*"/>
         </parameter>
         <parameter name="start">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="end">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -2769,7 +2769,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="length">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="accel_marker">
           <type name="GLib.unichar" c:type="gunichar"/>
@@ -2778,7 +2778,7 @@
           <type name="AttrList" c:type="PangoAttrList**"/>
         </parameter>
         <parameter name="text">
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </parameter>
         <parameter name="accel_char">
           <type name="GLib.unichar" c:type="gunichar*"/>
@@ -2817,7 +2817,7 @@
         <type name="GLib.SList" c:type="GSList*"/>
       </field>
     </record>
-    <glib:boxed c:type="Item"
+    <glib:boxed c:type="PangoItem"
                 glib:name="Item"
                 glib:type-name="PangoItem"
                 glib:get-type="pango_item_get_type">
@@ -2845,10 +2845,10 @@
             <type name="Item" c:type="PangoItem*"/>
           </parameter>
           <parameter name="split_index">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="split_offset">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </constructor>
@@ -2872,7 +2872,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="analysis">
           <type name="Analysis" c:type="PangoAnalysis*"/>
@@ -2881,7 +2881,7 @@
           <type name="LogAttr" c:type="PangoLogAttr*"/>
         </parameter>
         <parameter name="attrs_len">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -2898,10 +2898,10 @@
           <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="paragraph_delimiter_index">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
         <parameter name="next_paragraph_start">
-          <type name="GLib.int" c:type="gint*"/>
+          <type name="int" c:type="gint*"/>
         </parameter>
       </parameters>
     </function>
@@ -2914,10 +2914,10 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="length">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="level">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="language">
           <type name="Language" c:type="PangoLanguage*"/>
@@ -2926,7 +2926,7 @@
           <type name="LogAttr" c:type="PangoLogAttr*"/>
         </parameter>
         <parameter name="attrs_len">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -3234,10 +3234,10 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="start_index">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="length">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="attrs">
           <type name="AttrList" c:type="PangoAttrList*"/>
@@ -3263,10 +3263,10 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="start_index">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="length">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="attrs">
           <type name="AttrList" c:type="PangoAttrList*"/>
@@ -3303,7 +3303,7 @@
         <type name="GlyphVisAttr" c:type="PangoGlyphVisAttr"/>
       </field>
     </record>
-    <glib:boxed c:type="GlyphString"
+    <glib:boxed c:type="PangoGlyphString"
                 glib:name="GlyphString"
                 glib:type-name="PangoGlyphString"
                 glib:get-type="pango_glyph_string_get_type">
@@ -3348,7 +3348,7 @@
       </method>
       <method name="get_width" c:identifier="pango_glyph_string_get_width">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="glyphs">
@@ -3366,10 +3366,10 @@
             <type name="GlyphString" c:type="PangoGlyphString*"/>
           </parameter>
           <parameter name="start">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="end">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="font">
             <type name="Font" c:type="PangoFont*"/>
@@ -3395,10 +3395,10 @@
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="length">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="embedding_level">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="logical_widths">
             <type name="int" c:type="int*"/>
@@ -3417,13 +3417,13 @@
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="length">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="analysis">
             <type name="Analysis" c:type="PangoAnalysis*"/>
           </parameter>
           <parameter name="index_">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="trailing">
             <type name="boolean" c:type="gboolean"/>
@@ -3445,13 +3445,13 @@
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="length">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="analysis">
             <type name="Analysis" c:type="PangoAnalysis*"/>
           </parameter>
           <parameter name="x_pos">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="index_">
             <type name="int" c:type="int*"/>
@@ -3595,7 +3595,7 @@
               c:identifier="PANGO_TAB_LEFT"
               glib:nick="left"/>
     </enumeration>
-    <glib:boxed c:type="GlyphItem"
+    <glib:boxed c:type="PangoGlyphItem"
                 glib:name="GlyphItem"
                 glib:type-name="PangoGlyphItem"
                 glib:get-type="pango_glyph_item_get_type">
@@ -3611,7 +3611,7 @@
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="split_index">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </constructor>
@@ -3666,12 +3666,12 @@
             <type name="LogAttr" c:type="PangoLogAttr*"/>
           </parameter>
           <parameter name="letter_spacing">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </method>
     </glib:boxed>
-    <glib:boxed c:type="TabArray"
+    <glib:boxed c:type="PangoTabArray"
                 glib:name="TabArray"
                 glib:type-name="PangoTabArray"
                 glib:get-type="pango_tab_array_get_type">
@@ -3752,7 +3752,7 @@
             <type name="TabAlign" c:type="PangoTabAlign*"/>
           </parameter>
           <parameter name="location">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -3768,7 +3768,7 @@
             <type name="TabAlign" c:type="PangoTabAlign**"/>
           </parameter>
           <parameter name="locations">
-            <type name="GLib.int" c:type="gint**"/>
+            <type name="int" c:type="gint**"/>
           </parameter>
         </parameters>
       </method>
@@ -3898,7 +3898,7 @@
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="length">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </method>
@@ -3924,7 +3924,7 @@
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="length">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </method>
@@ -3941,7 +3941,7 @@
             <type name="string" c:type="char*"/>
           </parameter>
           <parameter name="length">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="accel_marker">
             <type name="GLib.unichar" c:type="gunichar"/>
@@ -3985,13 +3985,13 @@
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_width" c:identifier="pango_layout_get_width">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4008,13 +4008,13 @@
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_height" c:identifier="pango_layout_get_height">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4064,13 +4064,13 @@
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="indent">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_indent" c:identifier="pango_layout_get_indent">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4087,13 +4087,13 @@
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="spacing">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_spacing" c:identifier="pango_layout_get_spacing">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4254,7 +4254,7 @@
       <method name="get_unknown_glyphs_count"
               c:identifier="pango_layout_get_unknown_glyphs_count">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4285,7 +4285,7 @@
             <type name="LogAttr" c:type="PangoLogAttr**"/>
           </parameter>
           <parameter name="n_attrs">
-            <type name="GLib.int" c:type="gint*"/>
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
@@ -4298,7 +4298,7 @@
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="index_">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="pos">
             <type name="Rectangle" c:type="PangoRectangle*"/>
@@ -4315,7 +4315,7 @@
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="index_">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="trailing">
             <type name="boolean" c:type="gboolean"/>
@@ -4337,7 +4337,7 @@
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="index_">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="strong_pos">
             <type name="Rectangle" c:type="PangoRectangle*"/>
@@ -4360,13 +4360,13 @@
             <type name="boolean" c:type="gboolean"/>
           </parameter>
           <parameter name="old_index">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="old_trailing">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="direction">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="new_index">
             <type name="int" c:type="int*"/>
@@ -4385,10 +4385,10 @@
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="index_">
             <type name="int" c:type="int*"/>
@@ -4465,7 +4465,7 @@
       </method>
       <method name="get_line_count" c:identifier="pango_layout_get_line_count">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="layout">
@@ -4482,7 +4482,7 @@
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="line">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </method>
@@ -4496,7 +4496,7 @@
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="line">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </method>
@@ -4532,7 +4532,7 @@
         </parameters>
       </method>
     </class>
-    <glib:boxed c:type="LayoutLine"
+    <glib:boxed c:type="PangoLayoutLine"
                 glib:name="LayoutLine"
                 glib:type-name="PangoLayoutLine"
                 glib:get-type="pango_layout_line_get_type">
@@ -4565,7 +4565,7 @@
             <type name="LayoutLine" c:type="PangoLayoutLine*"/>
           </parameter>
           <parameter name="x_pos">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="index_">
             <type name="int" c:type="int*"/>
@@ -4584,7 +4584,7 @@
             <type name="LayoutLine" c:type="PangoLayoutLine*"/>
           </parameter>
           <parameter name="index_">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="trailing">
             <type name="boolean" c:type="gboolean"/>
@@ -4604,10 +4604,10 @@
             <type name="LayoutLine" c:type="PangoLayoutLine*"/>
           </parameter>
           <parameter name="start_index">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="end_index">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="ranges">
             <type name="int" c:type="int**"/>
@@ -4651,7 +4651,7 @@
         </parameters>
       </method>
     </glib:boxed>
-    <glib:boxed c:type="LayoutIter"
+    <glib:boxed c:type="PangoLayoutIter"
                 glib:name="LayoutIter"
                 glib:type-name="PangoLayoutIter"
                 glib:get-type="pango_layout_iter_get_type">
@@ -4677,7 +4677,7 @@
       </method>
       <method name="get_index" c:identifier="pango_layout_iter_get_index">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -4881,7 +4881,7 @@
       <method name="get_baseline"
               c:identifier="pango_layout_iter_get_baseline">
         <return-value>
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -4907,10 +4907,10 @@
             <type name="Layout" c:type="PangoLayout*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </method>
@@ -4927,10 +4927,10 @@
             <type name="LayoutLine" c:type="PangoLayoutLine*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </method>
@@ -4949,10 +4949,10 @@
             <type name="GlyphString" c:type="PangoGlyphString*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </method>
@@ -4969,16 +4969,16 @@
             <type name="RenderPart" c:type="PangoRenderPart"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </method>
@@ -4992,16 +4992,16 @@
             <type name="Renderer" c:type="PangoRenderer*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </method>
@@ -5180,10 +5180,10 @@
             <type name="GlyphString" c:type="PangoGlyphString*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </callback>
@@ -5199,16 +5199,16 @@
             <type name="RenderPart" c:type="PangoRenderPart"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </callback>
@@ -5221,16 +5221,16 @@
             <type name="Renderer" c:type="PangoRenderer*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="width">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="height">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </callback>
@@ -5246,10 +5246,10 @@
             <type name="AttrShape" c:type="PangoAttrShape*"/>
           </parameter>
           <parameter name="x">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
           <parameter name="y">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </callback>
@@ -5376,7 +5376,7 @@
     <record name="RendererPrivate" c:type="PangoRendererPrivate"/>
     <function name="split_file_list" c:identifier="pango_split_file_list">
       <return-value>
-        <type name="char" c:type="char**"/>
+        <type name="int8" c:type="char**"/>
       </return-value>
       <parameters>
         <parameter name="str">
@@ -5400,7 +5400,7 @@
       </return-value>
       <parameters>
         <parameter name="pos">
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </parameter>
       </parameters>
     </function>
@@ -5410,10 +5410,10 @@
       </return-value>
       <parameters>
         <parameter name="pos">
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </parameter>
         <parameter name="out">
-          <type name="GLib.String" c:type="GString*"/>
+          <type name="GObject.String" c:type="GString*"/>
         </parameter>
       </parameters>
     </function>
@@ -5423,10 +5423,10 @@
       </return-value>
       <parameters>
         <parameter name="pos">
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </parameter>
         <parameter name="out">
-          <type name="GLib.String" c:type="GString*"/>
+          <type name="GObject.String" c:type="GString*"/>
         </parameter>
       </parameters>
     </function>
@@ -5436,7 +5436,7 @@
       </return-value>
       <parameters>
         <parameter name="pos">
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </parameter>
         <parameter name="out">
           <type name="int" c:type="int*"/>
@@ -5461,7 +5461,7 @@
           <type name="boolean" c:type="gboolean"/>
         </parameter>
         <parameter name="possible_values">
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </parameter>
       </parameters>
     </function>
@@ -5546,14 +5546,14 @@
     <function name="log2vis_get_embedding_levels"
               c:identifier="pango_log2vis_get_embedding_levels">
       <return-value>
-        <type name="guint8" c:type="guint8*"/>
+        <type name="uint8" c:type="guint8*"/>
       </return-value>
       <parameters>
         <parameter name="text">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="length">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="pbase_dir">
           <type name="Direction" c:type="PangoDirection*"/>
@@ -5572,7 +5572,7 @@
     </function>
     <function name="version" c:identifier="pango_version">
       <return-value>
-        <type name="int32" c:type="int"/>
+        <type name="int" c:type="int"/>
       </return-value>
     </function>
     <function name="version_string" c:identifier="pango_version_string">
@@ -5586,13 +5586,13 @@
       </return-value>
       <parameters>
         <parameter name="required_major">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="required_minor">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="required_micro">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>

Modified: trunk/gir/pangocairo.gir
==============================================================================
--- trunk/gir/pangocairo.gir	(original)
+++ trunk/gir/pangocairo.gir	Tue Aug 19 21:36:46 2008
@@ -209,7 +209,7 @@
           <type name="Pango.Context" c:type="PangoContext*"/>
         </parameter>
         <parameter name="data">
-          <type name="gpointer" c:type="gpointer*"/>
+          <type name="any" c:type="gpointer*"/>
         </parameter>
       </parameters>
     </function>

Modified: trunk/gir/pangoft2.gir
==============================================================================
--- trunk/gir/pangoft2.gir	(original)
+++ trunk/gir/pangoft2.gir	Tue Aug 19 21:36:46 2008
@@ -151,10 +151,10 @@
           <type name="Pango.GlyphString" c:type="PangoGlyphString*"/>
         </parameter>
         <parameter name="x">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -171,10 +171,10 @@
           <type name="Pango.LayoutLine" c:type="PangoLayoutLine*"/>
         </parameter>
         <parameter name="x">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -191,10 +191,10 @@
           <type name="Pango.LayoutLine" c:type="PangoLayoutLine*"/>
         </parameter>
         <parameter name="x">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -211,10 +211,10 @@
           <type name="Pango.Layout" c:type="PangoLayout*"/>
         </parameter>
         <parameter name="x">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -231,10 +231,10 @@
           <type name="Pango.Layout" c:type="PangoLayout*"/>
         </parameter>
         <parameter name="x">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -284,7 +284,7 @@
     <function name="pango_ft2_font_get_kerning"
               c:identifier="pango_ft2_font_get_kerning">
       <return-value>
-        <type name="int32" c:type="int"/>
+        <type name="int" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="font">

Modified: trunk/gir/pangox.gir
==============================================================================
--- trunk/gir/pangox.gir	(original)
+++ trunk/gir/pangox.gir	Tue Aug 19 21:36:46 2008
@@ -3,7 +3,7 @@
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
   <namespace name="PangoX">
-    <alias name="Subfont" target="guint16" c:type="PangoXSubfont"/>
+    <alias name="Subfont" target="uint16" c:type="PangoXSubfont"/>
     <callback name="PangoGetGCFunc" c:type="PangoGetGCFunc">
       <return-value>
         <type name="xlib.GC" c:type="GC"/>
@@ -120,10 +120,10 @@
           <type name="Pango.LayoutLine" c:type="PangoLayoutLine*"/>
         </parameter>
         <parameter name="x">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -146,27 +146,27 @@
           <type name="Pango.Layout" c:type="PangoLayout*"/>
         </parameter>
         <parameter name="x">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
     <function name="pango_x_list_subfonts"
               c:identifier="pango_x_list_subfonts">
       <return-value>
-        <type name="int32" c:type="int"/>
+        <type name="int" c:type="int"/>
       </return-value>
       <parameters>
         <parameter name="font">
           <type name="Pango.Font" c:type="PangoFont*"/>
         </parameter>
         <parameter name="charsets">
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </parameter>
         <parameter name="n_charsets">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="subfont_ids">
           <type name="Subfont" c:type="PangoXSubfont**"/>
@@ -308,10 +308,10 @@
           <type name="Pango.Font" c:type="PangoFont*"/>
         </parameter>
         <parameter name="charsets">
-          <type name="char" c:type="char**"/>
+          <type name="int8" c:type="char**"/>
         </parameter>
         <parameter name="n_charsets">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="rfont">
           <type name="Subfont" c:type="PangoXSubfont*"/>
@@ -334,7 +334,7 @@
           <type name="string" c:type="char*"/>
         </parameter>
         <parameter name="n_chars">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>

Modified: trunk/gir/pangoxft.gir
==============================================================================
--- trunk/gir/pangoxft.gir	(original)
+++ trunk/gir/pangoxft.gir	Tue Aug 19 21:36:46 2008
@@ -56,7 +56,7 @@
             <type name="XTrapezoid" c:type="XTrapezoid*"/>
           </parameter>
           <parameter name="n_trapezoids">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </callback>
@@ -75,7 +75,7 @@
             <type name="XftGlyphSpec" c:type="XftGlyphSpec*"/>
           </parameter>
           <parameter name="n_glyphs">
-            <type name="int32" c:type="int"/>
+            <type name="int" c:type="int"/>
           </parameter>
         </parameters>
       </callback>
@@ -91,7 +91,7 @@
           <type name="xlib.Display" c:type="Display*"/>
         </parameter>
         <parameter name="screen">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -171,10 +171,10 @@
           <type name="Pango.GlyphString" c:type="PangoGlyphString*"/>
         </parameter>
         <parameter name="x">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -194,10 +194,10 @@
           <type name="Pango.LayoutLine" c:type="PangoLayoutLine*"/>
         </parameter>
         <parameter name="x">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -217,10 +217,10 @@
           <type name="Pango.Layout" c:type="PangoLayout*"/>
         </parameter>
         <parameter name="x">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="y">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -259,7 +259,7 @@
           <type name="xlib.Display" c:type="Display*"/>
         </parameter>
         <parameter name="screen">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -273,7 +273,7 @@
           <type name="xlib.Display" c:type="Display*"/>
         </parameter>
         <parameter name="screen">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -287,7 +287,7 @@
           <type name="xlib.Display" c:type="Display*"/>
         </parameter>
         <parameter name="screen">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>
@@ -301,7 +301,7 @@
           <type name="xlib.Display" c:type="Display*"/>
         </parameter>
         <parameter name="screen">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
         <parameter name="func">
           <type name="SubstituteFunc" c:type="PangoXftSubstituteFunc"/>
@@ -324,7 +324,7 @@
           <type name="xlib.Display" c:type="Display*"/>
         </parameter>
         <parameter name="screen">
-          <type name="int32" c:type="int"/>
+          <type name="int" c:type="int"/>
         </parameter>
       </parameters>
     </function>



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