gir-repository r39 - in trunk: . gir



Author: johan
Date: Wed Aug 20 13:46:55 2008
New Revision: 39
URL: http://svn.gnome.org/viewvc/gir-repository?rev=39&view=rev

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

    * 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/pangoft2.gir:
    * gir/pangoxft.gir:
    Regenerate.



Modified:
   trunk/ChangeLog
   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/pangoft2.gir
   trunk/gir/pangoxft.gir

Modified: trunk/gir/atk.gir
==============================================================================
--- trunk/gir/atk.gir	(original)
+++ trunk/gir/atk.gir	Wed Aug 20 13:46:55 2008
@@ -1401,2201 +1401,1845 @@
         </parameters>
       </glib:signal>
     </class>
-    <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">
+    <record name="ObjectClass" c:type="AtkObjectClass">
+      <field name="parent">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="get_name" c:type="get_name">
         <return-value>
-          <type name="RelationSet" c:type="AtkRelationSet*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
-      </constructor>
-      <method name="contains" c:identifier="atk_relation_set_contains">
+        <parameters>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_description" c:type="get_description">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="set">
-            <type name="RelationSet" c:type="AtkRelationSet*"/>
-          </parameter>
-          <parameter name="relationship">
-            <type name="RelationType" c:type="AtkRelationType"/>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="remove" c:identifier="atk_relation_set_remove">
+      </callback>
+      <callback name="get_parent" c:type="get_parent">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
-          <parameter name="set">
-            <type name="RelationSet" c:type="AtkRelationSet*"/>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
-          <parameter name="relation">
-            <type name="Relation" c:type="AtkRelation*"/>
+        </parameters>
+      </callback>
+      <callback name="get_n_children" c:type="get_n_children">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="add" c:identifier="atk_relation_set_add">
+      </callback>
+      <callback name="ref_child" c:type="ref_child">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
-          <parameter name="set">
-            <type name="RelationSet" c:type="AtkRelationSet*"/>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
-          <parameter name="relation">
-            <type name="Relation" c:type="AtkRelation*"/>
+          <parameter name="i">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_n_relations"
-              c:identifier="atk_relation_set_get_n_relations">
+      </callback>
+      <callback name="get_index_in_parent" c:type="get_index_in_parent">
         <return-value>
           <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="set">
-            <type name="RelationSet" c:type="AtkRelationSet*"/>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="add_relation_by_type"
-              c:identifier="atk_relation_set_add_relation_by_type">
+      </callback>
+      <callback name="ref_relation_set" c:type="ref_relation_set">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="RelationSet" c:type="AtkRelationSet*"/>
         </return-value>
         <parameters>
-          <parameter name="set">
-            <type name="RelationSet" c:type="AtkRelationSet*"/>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
-          <parameter name="relationship">
-            <type name="RelationType" c:type="AtkRelationType"/>
+        </parameters>
+      </callback>
+      <callback name="get_role" c:type="get_role">
+        <return-value>
+          <type name="Role" c:type="AtkRole"/>
+        </return-value>
+        <parameters>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
-          <parameter name="target">
+        </parameters>
+      </callback>
+      <callback name="get_layer" c:type="get_layer">
+        <return-value>
+          <type name="Layer" c:type="AtkLayer"/>
+        </return-value>
+        <parameters>
+          <parameter name="accessible">
             <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">
+      </callback>
+      <callback name="get_mdi_zorder" c:type="get_mdi_zorder">
         <return-value>
-          <type name="StateSet" c:type="AtkStateSet*"/>
+          <type name="int" c:type="gint"/>
         </return-value>
-      </constructor>
-      <constructor name="and_sets" c:identifier="atk_state_set_and_sets">
+        <parameters>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="ref_state_set" c:type="ref_state_set">
         <return-value>
           <type name="StateSet" c:type="AtkStateSet*"/>
         </return-value>
         <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
-          <parameter name="compare_set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
+        </parameters>
+      </callback>
+      <callback name="set_name" c:type="set_name">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="or_sets" c:identifier="atk_state_set_or_sets">
+      </callback>
+      <callback name="set_description" c:type="set_description">
         <return-value>
-          <type name="StateSet" c:type="AtkStateSet*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
-          <parameter name="compare_set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
+          <parameter name="description">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="xor_sets" c:identifier="atk_state_set_xor_sets">
+      </callback>
+      <callback name="set_parent" c:type="set_parent">
         <return-value>
-          <type name="StateSet" c:type="AtkStateSet*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
-          <parameter name="compare_set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
+          <parameter name="parent">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="is_empty" c:identifier="atk_state_set_is_empty">
+      </callback>
+      <callback name="set_role" c:type="set_role">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
+          </parameter>
+          <parameter name="role">
+            <type name="Role" c:type="AtkRole"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="add_state" c:identifier="atk_state_set_add_state">
+      </callback>
+      <callback name="connect_property_change_handler"
+                c:type="connect_property_change_handler">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
-          <parameter name="type">
-            <type name="StateType" c:type="AtkStateType"/>
+          <parameter name="handler">
+            <type name="PropertyChangeHandler"
+                  c:type="AtkPropertyChangeHandler*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="add_states" c:identifier="atk_state_set_add_states">
+      </callback>
+      <callback name="remove_property_change_handler"
+                c:type="remove_property_change_handler">
         <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 name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
-          <parameter name="n_types">
-            <type name="int" c:type="gint"/>
+          <parameter name="handler_id">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="clear_states" c:identifier="atk_state_set_clear_states">
+      </callback>
+      <callback name="initialize" c:type="initialize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="contains_state"
-              c:identifier="atk_state_set_contains_state">
+      </callback>
+      <callback name="children_changed" c:type="children_changed">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
-          <parameter name="type">
-            <type name="StateType" c:type="AtkStateType"/>
+          <parameter name="change_index">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="changed_child">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="contains_states"
-              c:identifier="atk_state_set_contains_states">
+      </callback>
+      <callback name="focus_event" c:type="focus_event">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <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 name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
-          <parameter name="n_types">
-            <type name="int" c:type="gint"/>
+          <parameter name="focus_in">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="remove_state" c:identifier="atk_state_set_remove_state">
+      </callback>
+      <callback name="property_change" c:type="property_change">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="set">
-            <type name="StateSet" c:type="AtkStateSet*"/>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
-          <parameter name="type">
-            <type name="StateType" c:type="AtkStateType"/>
+          <parameter name="values">
+            <type name="PropertyValues" c:type="AtkPropertyValues*"/>
           </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>
-        <type name="Object" c:type="AtkObject*"/>
-      </return-value>
-      <parameters>
-        <parameter name="implementor">
-          <type name="Implementor" c:type="AtkImplementor*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="role_get_name" c:identifier="atk_role_get_name">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="role">
-          <type name="Role" c:type="AtkRole"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="role_for_name" c:identifier="atk_role_for_name">
-      <return-value>
-        <type name="Role" c:type="AtkRole"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="role_get_localized_name"
-              c:identifier="atk_role_get_localized_name">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="role">
-          <type name="Role" c:type="AtkRole"/>
-        </parameter>
-      </parameters>
-    </function>
-    <interface name="Action"
-               c:type="AtkAction"
-               glib:type-name="AtkAction"
-               glib:get-type="atk_action_get_type">
-      <callback name="do_action" c:type="do_action">
+      </callback>
+      <callback name="state_change" c:type="state_change">
         <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="AtkAction*"/>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
-          <parameter name="i">
-            <type name="int" c:type="gint"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="state_set">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_n_actions" c:type="get_n_actions">
+      <callback name="visible_data_changed" c:type="visible_data_changed">
         <return-value>
-          <type name="int" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="AtkAction*"/>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_description" c:type="get_description">
+      <callback name="active_descendant_changed"
+                c:type="active_descendant_changed">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="AtkAction*"/>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
-          <parameter name="i">
-            <type name="int" c:type="gint"/>
+          <parameter name="child">
+            <type name="any" c:type="gpointer*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_name" c:type="get_name">
+      <callback name="get_attributes" c:type="get_attributes">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="AttributeSet" c:type="AtkAttributeSet*"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="AtkAction*"/>
-          </parameter>
-          <parameter name="i">
-            <type name="int" c:type="gint"/>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_keybinding" c:type="get_keybinding">
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad2">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+    </record>
+    <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="string" c:type="gchar*"/>
+          <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="action">
-            <type name="Action" c:type="AtkAction*"/>
+          <parameter name="set">
+            <type name="RelationSet" c:type="AtkRelationSet*"/>
           </parameter>
-          <parameter name="i">
-            <type name="int" c:type="gint"/>
+          <parameter name="relationship">
+            <type name="RelationType" c:type="AtkRelationType"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="set_description" c:type="set_description">
+      </method>
+      <method name="remove" c:identifier="atk_relation_set_remove">
         <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="AtkAction*"/>
+          <parameter name="set">
+            <type name="RelationSet" c:type="AtkRelationSet*"/>
           </parameter>
-          <parameter name="i">
-            <type name="int" c:type="gint"/>
+          <parameter name="relation">
+            <type name="Relation" c:type="AtkRelation*"/>
           </parameter>
-          <parameter name="desc">
-            <type name="string" c:type="gchar*"/>
+        </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>
-      </callback>
-      <callback name="get_localized_name" c:type="get_localized_name">
+      </method>
+      <method name="get_n_relations"
+              c:identifier="atk_relation_set_get_n_relations">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="action">
-            <type name="Action" c:type="AtkAction*"/>
+          <parameter name="set">
+            <type name="RelationSet" c:type="AtkRelationSet*"/>
           </parameter>
-          <parameter name="i">
-            <type name="int" c:type="gint"/>
+        </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>
-      </callback>
+      </method>
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
       <field name="pad2">
         <type name="Function" c:type="AtkFunction"/>
       </field>
-    </interface>
-    <function name="action_do_action" c:identifier="atk_action_do_action">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="action">
-          <type name="Action" c:type="AtkAction*"/>
-        </parameter>
-        <parameter name="i">
-          <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="int" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="action">
-          <type name="Action" c:type="AtkAction*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="action_get_description"
-              c:identifier="atk_action_get_description">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="action">
-          <type name="Action" c:type="AtkAction*"/>
-        </parameter>
-        <parameter name="i">
-          <type name="int" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="action_get_name" c:identifier="atk_action_get_name">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="action">
-          <type name="Action" c:type="AtkAction*"/>
-        </parameter>
-        <parameter name="i">
-          <type name="int" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="action_get_keybinding"
-              c:identifier="atk_action_get_keybinding">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="action">
-          <type name="Action" c:type="AtkAction*"/>
-        </parameter>
-        <parameter name="i">
-          <type name="int" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="action_set_description"
-              c:identifier="atk_action_set_description">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="action">
-          <type name="Action" c:type="AtkAction*"/>
-        </parameter>
-        <parameter name="i">
-          <type name="int" c:type="gint"/>
-        </parameter>
-        <parameter name="desc">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="action_get_localized_name"
-              c:identifier="atk_action_get_localized_name">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="action">
-          <type name="Action" c:type="AtkAction*"/>
-        </parameter>
-        <parameter name="i">
-          <type name="int" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="Util"
-           c:type="AtkUtil"
+    </class>
+    <class name="StateSet"
+           c:type="AtkStateSet"
            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">
+           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="uint" c:type="guint"/>
+          <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="listener">
-            <type name="GObject.SignalEmissionHook"
-                  c:type="GSignalEmissionHook"/>
+          <parameter name="set">
+            <type name="StateSet" c:type="AtkStateSet*"/>
           </parameter>
-          <parameter name="event_type">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="compare_set">
+            <type name="StateSet" c:type="AtkStateSet*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="remove_global_event_listener"
-                c:type="remove_global_event_listener">
+      </constructor>
+      <constructor name="or_sets" c:identifier="atk_state_set_or_sets">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="StateSet" c:type="AtkStateSet*"/>
         </return-value>
         <parameters>
-          <parameter name="listener_id">
-            <type name="uint" c:type="guint"/>
+          <parameter name="set">
+            <type name="StateSet" c:type="AtkStateSet*"/>
+          </parameter>
+          <parameter name="compare_set">
+            <type name="StateSet" c:type="AtkStateSet*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="add_key_event_listener" c:type="add_key_event_listener">
+      </constructor>
+      <constructor name="xor_sets" c:identifier="atk_state_set_xor_sets">
         <return-value>
-          <type name="uint" c:type="guint"/>
+          <type name="StateSet" c:type="AtkStateSet*"/>
         </return-value>
         <parameters>
-          <parameter name="listener">
-            <type name="KeySnoopFunc" c:type="AtkKeySnoopFunc"/>
+          <parameter name="set">
+            <type name="StateSet" c:type="AtkStateSet*"/>
           </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="compare_set">
+            <type name="StateSet" c:type="AtkStateSet*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="remove_key_event_listener"
-                c:type="remove_key_event_listener">
+      </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="listener_id">
-            <type name="uint" c:type="guint"/>
+          <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>
-      </callback>
-      <callback name="get_root" c:type="get_root">
+      </method>
+      <method name="clear_states" c:identifier="atk_state_set_clear_states">
         <return-value>
-          <type name="Object" c:type="AtkObject*"/>
+          <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="get_toolkit_name" c:type="get_toolkit_name">
+        <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="string" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </callback>
-      <callback name="get_toolkit_version" c:type="get_toolkit_version">
+        <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="string" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </callback>
+        <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="KeyEventStruct" c:type="AtkKeyEventStruct">
-      <field name="type">
-        <type name="int" c:type="gint"/>
-      </field>
-      <field name="state">
-        <type name="uint" c:type="guint"/>
-      </field>
-      <field name="keyval">
-        <type name="uint" c:type="guint"/>
-      </field>
-      <field name="length">
-        <type name="int" c:type="gint"/>
-      </field>
-      <field name="string">
-        <type name="string" c:type="gchar*"/>
-      </field>
-      <field name="keycode">
-        <type name="uint16" c:type="guint16"/>
-      </field>
-      <field name="timestamp">
-        <type name="uint32" c:type="guint32"/>
-      </field>
-    </record>
-    <callback name="EventListener" c:type="AtkEventListener">
+    <record name="PropertyValues" c:type="_AtkPropertyValues"/>
+    <callback name="Function" c:type="AtkFunction">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="obj">
-          <type name="Object" c:type="AtkObject*"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </callback>
-    <callback name="EventListenerInit" c:type="AtkEventListenerInit">
+    <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>
-    <callback name="KeySnoopFunc" c:type="AtkKeySnoopFunc">
+    <function name="implementor_ref_accessible"
+              c:identifier="atk_implementor_ref_accessible">
       <return-value>
-        <type name="int" c:type="gint"/>
+        <type name="Object" c:type="AtkObject*"/>
       </return-value>
       <parameters>
-        <parameter name="event">
-          <type name="KeyEventStruct" c:type="AtkKeyEventStruct*"/>
+        <parameter name="implementor">
+          <type name="Implementor" c:type="AtkImplementor*"/>
         </parameter>
-        <parameter name="func_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <enumeration name="KeyEventType"
-                 c:type="AtkKeyEventType"
-                 glib:type-name="AtkKeyEventType"
-                 glib:get-type="atk_key_event_type_get_type">
-      <member name="press"
-              value="0"
-              c:identifier="ATK_KEY_EVENT_PRESS"
-              glib:nick="press"/>
-      <member name="release"
-              value="1"
-              c:identifier="ATK_KEY_EVENT_RELEASE"
-              glib:nick="release"/>
-      <member name="last-defined"
-              value="2"
-              c:identifier="ATK_KEY_EVENT_LAST_DEFINED"
-              glib:nick="last-defined"/>
-    </enumeration>
-    <enumeration name="CoordType"
-                 c:type="AtkCoordType"
-                 glib:type-name="AtkCoordType"
-                 glib:get-type="atk_coord_type_get_type">
-      <member name="screen"
-              value="0"
-              c:identifier="ATK_XY_SCREEN"
-              glib:nick="screen"/>
-      <member name="window"
-              value="1"
-              c:identifier="ATK_XY_WINDOW"
-              glib:nick="window"/>
-    </enumeration>
-    <function name="add_focus_tracker" c:identifier="atk_add_focus_tracker">
-      <return-value>
-        <type name="uint" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="focus_tracker">
-          <type name="EventListener" c:type="AtkEventListener"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="remove_focus_tracker"
-              c:identifier="atk_remove_focus_tracker">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="tracker_id">
-          <type name="uint" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="focus_tracker_init" c:identifier="atk_focus_tracker_init">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="init">
-          <type name="EventListenerInit" c:type="AtkEventListenerInit"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="focus_tracker_notify"
-              c:identifier="atk_focus_tracker_notify">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="AtkObject*"/>
+      </parameters>
+    </function>
+    <function name="role_get_name" c:identifier="atk_role_get_name">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="role">
+          <type name="Role" c:type="AtkRole"/>
         </parameter>
       </parameters>
     </function>
-    <function name="add_global_event_listener"
-              c:identifier="atk_add_global_event_listener">
+    <function name="role_for_name" c:identifier="atk_role_for_name">
       <return-value>
-        <type name="uint" c:type="guint"/>
+        <type name="Role" c:type="AtkRole"/>
       </return-value>
       <parameters>
-        <parameter name="listener">
-          <type name="GObject.SignalEmissionHook"
-                c:type="GSignalEmissionHook"/>
-        </parameter>
-        <parameter name="event_type">
+        <parameter name="name">
           <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="remove_global_event_listener"
-              c:identifier="atk_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>
-    </function>
-    <function name="add_key_event_listener"
-              c:identifier="atk_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>
-    </function>
-    <function name="remove_key_event_listener"
-              c:identifier="atk_remove_key_event_listener">
+    <function name="role_get_localized_name"
+              c:identifier="atk_role_get_localized_name">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="listener_id">
-          <type name="uint" c:type="guint"/>
+        <parameter name="role">
+          <type name="Role" c:type="AtkRole"/>
         </parameter>
       </parameters>
     </function>
-    <function name="get_root" c:identifier="atk_get_root">
-      <return-value>
-        <type name="Object" c:type="AtkObject*"/>
-      </return-value>
-    </function>
-    <function name="get_focus_object" c:identifier="atk_get_focus_object">
-      <return-value>
-        <type name="Object" c:type="AtkObject*"/>
-      </return-value>
-    </function>
-    <function name="get_toolkit_name" c:identifier="atk_get_toolkit_name">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-    </function>
-    <function name="get_toolkit_version"
-              c:identifier="atk_get_toolkit_version">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-    </function>
-    <function name="get_version" c:identifier="atk_get_version">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-    </function>
-    <interface name="Component"
-               c:type="AtkComponent"
-               glib:type-name="AtkComponent"
-               glib:get-type="atk_component_get_type">
-      <callback name="add_focus_handler" c:type="add_focus_handler">
+    <interface name="Action"
+               c:type="AtkAction"
+               glib:type-name="AtkAction"
+               glib:get-type="atk_action_get_type">
+      <callback name="do_action" c:type="do_action">
         <return-value>
-          <type name="uint" c:type="guint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="component">
-            <type name="Component" c:type="AtkComponent*"/>
+          <parameter name="action">
+            <type name="Action" c:type="AtkAction*"/>
           </parameter>
-          <parameter name="handler">
-            <type name="FocusHandler" c:type="AtkFocusHandler"/>
+          <parameter name="i">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="contains" c:type="contains">
+      <callback name="get_n_actions" c:type="get_n_actions">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="component">
-            <type name="Component" c:type="AtkComponent*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="coord_type">
-            <type name="CoordType" c:type="AtkCoordType"/>
+          <parameter name="action">
+            <type name="Action" c:type="AtkAction*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="ref_accessible_at_point"
-                c:type="ref_accessible_at_point">
+      <callback name="get_description" c:type="get_description">
         <return-value>
-          <type name="Object" c:type="AtkObject*"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="component">
-            <type name="Component" c:type="AtkComponent*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="int" c:type="gint"/>
+          <parameter name="action">
+            <type name="Action" c:type="AtkAction*"/>
           </parameter>
-          <parameter name="y">
+          <parameter name="i">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="coord_type">
-            <type name="CoordType" c:type="AtkCoordType"/>
-          </parameter>
         </parameters>
       </callback>
-      <callback name="get_extents" c:type="get_extents">
+      <callback name="get_name" c:type="get_name">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="component">
-            <type name="Component" c:type="AtkComponent*"/>
-          </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 name="action">
+            <type name="Action" c:type="AtkAction*"/>
           </parameter>
-          <parameter name="coord_type">
-            <type name="CoordType" c:type="AtkCoordType"/>
+          <parameter name="i">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_position" c:type="get_position">
+      <callback name="get_keybinding" c:type="get_keybinding">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="component">
-            <type name="Component" c:type="AtkComponent*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="int" c:type="gint*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="int" c:type="gint*"/>
+          <parameter name="action">
+            <type name="Action" c:type="AtkAction*"/>
           </parameter>
-          <parameter name="coord_type">
-            <type name="CoordType" c:type="AtkCoordType"/>
+          <parameter name="i">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_size" c:type="get_size">
+      <callback name="set_description" c:type="set_description">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="component">
-            <type name="Component" c:type="AtkComponent*"/>
+          <parameter name="action">
+            <type name="Action" c:type="AtkAction*"/>
           </parameter>
-          <parameter name="width">
-            <type name="int" c:type="gint*"/>
+          <parameter name="i">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="height">
-            <type name="int" c:type="gint*"/>
+          <parameter name="desc">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="grab_focus" c:type="grab_focus">
+      <callback name="get_localized_name" c:type="get_localized_name">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="component">
-            <type name="Component" c:type="AtkComponent*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="remove_focus_handler" c:type="remove_focus_handler">
-        <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="component">
-            <type name="Component" c:type="AtkComponent*"/>
+          <parameter name="action">
+            <type name="Action" c:type="AtkAction*"/>
           </parameter>
-          <parameter name="handler_id">
-            <type name="uint" c:type="guint"/>
+          <parameter name="i">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_extents" c:type="set_extents">
+      <field name="pad2">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+    </interface>
+    <record name="ActionIface" c:type="AtkActionIface">
+      <field name="parent">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="do_action" c:type="do_action">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="component">
-            <type name="Component" c:type="AtkComponent*"/>
-          </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 name="action">
+            <type name="Action" c:type="AtkAction*"/>
           </parameter>
-          <parameter name="height">
+          <parameter name="i">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="coord_type">
-            <type name="CoordType" c:type="AtkCoordType"/>
-          </parameter>
         </parameters>
       </callback>
-      <callback name="set_position" c:type="set_position">
+      <callback name="get_n_actions" c:type="get_n_actions">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="component">
-            <type name="Component" c:type="AtkComponent*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="coord_type">
-            <type name="CoordType" c:type="AtkCoordType"/>
+          <parameter name="action">
+            <type name="Action" c:type="AtkAction*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_size" c:type="set_size">
+      <callback name="get_description" c:type="get_description">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="component">
-            <type name="Component" c:type="AtkComponent*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="int" c:type="gint"/>
+          <parameter name="action">
+            <type name="Action" c:type="AtkAction*"/>
           </parameter>
-          <parameter name="height">
+          <parameter name="i">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_layer" c:type="get_layer">
+      <callback name="get_name" c:type="get_name">
         <return-value>
-          <type name="Layer" c:type="AtkLayer"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="component">
-            <type name="Component" c:type="AtkComponent*"/>
+          <parameter name="action">
+            <type name="Action" c:type="AtkAction*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_mdi_zorder" c:type="get_mdi_zorder">
-        <return-value>
-          <type name="int" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="component">
-            <type name="Component" c:type="AtkComponent*"/>
+          <parameter name="i">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="bounds_changed" c:type="bounds_changed">
+      <callback name="get_keybinding" c:type="get_keybinding">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="component">
-            <type name="Component" c:type="AtkComponent*"/>
+          <parameter name="action">
+            <type name="Action" c:type="AtkAction*"/>
           </parameter>
-          <parameter name="bounds">
-            <type name="Rectangle" c:type="AtkRectangle*"/>
+          <parameter name="i">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_alpha" c:type="get_alpha">
+      <callback name="set_description" c:type="set_description">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="component">
-            <type name="Component" c:type="AtkComponent*"/>
+          <parameter name="action">
+            <type name="Action" c:type="AtkAction*"/>
+          </parameter>
+          <parameter name="i">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="desc">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <glib:signal name="bounds-changed">
+      <callback name="get_localized_name" c:type="get_localized_name">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Rectangle" c:type="AtkRectangle"/>
+          <parameter name="action">
+            <type name="Action" c:type="AtkAction*"/>
+          </parameter>
+          <parameter name="i">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </interface>
-    <callback name="FocusHandler" c:type="AtkFocusHandler">
+      </callback>
+      <field name="pad2">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+    </record>
+    <function name="action_do_action" c:identifier="atk_action_do_action">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter>
-          <type name="Object" c:type="AtkObject*"/>
+        <parameter name="action">
+          <type name="Action" c:type="AtkAction*"/>
         </parameter>
-        <parameter>
-          <type name="boolean" c:type="gboolean"/>
+        <parameter name="i">
+          <type name="int" c:type="gint"/>
         </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">
+    </function>
+    <function name="action_get_n_actions"
+              c:identifier="atk_action_get_n_actions">
       <return-value>
-        <type name="uint" c:type="guint"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-        <parameter name="handler">
-          <type name="FocusHandler" c:type="AtkFocusHandler"/>
+        <parameter name="action">
+          <type name="Action" c:type="AtkAction*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="component_contains" c:identifier="atk_component_contains">
+    <function name="action_get_description"
+              c:identifier="atk_action_get_description">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int" c:type="gint"/>
+        <parameter name="action">
+          <type name="Action" c:type="AtkAction*"/>
         </parameter>
-        <parameter name="y">
+        <parameter name="i">
           <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="coord_type">
-          <type name="CoordType" c:type="AtkCoordType"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="component_ref_accessible_at_point"
-              c:identifier="atk_component_ref_accessible_at_point">
+    <function name="action_get_name" c:identifier="atk_action_get_name">
       <return-value>
-        <type name="Object" c:type="AtkObject*"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int" c:type="gint"/>
+        <parameter name="action">
+          <type name="Action" c:type="AtkAction*"/>
         </parameter>
-        <parameter name="y">
+        <parameter name="i">
           <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="coord_type">
-          <type name="CoordType" c:type="AtkCoordType"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="component_get_extents"
-              c:identifier="atk_component_get_extents">
+    <function name="action_get_keybinding"
+              c:identifier="atk_action_get_keybinding">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </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 name="action">
+          <type name="Action" c:type="AtkAction*"/>
         </parameter>
-        <parameter name="coord_type">
-          <type name="CoordType" c:type="AtkCoordType"/>
+        <parameter name="i">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="component_get_position"
-              c:identifier="atk_component_get_position">
+    <function name="action_set_description"
+              c:identifier="atk_action_set_description">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int" c:type="gint*"/>
+        <parameter name="action">
+          <type name="Action" c:type="AtkAction*"/>
         </parameter>
-        <parameter name="y">
-          <type name="int" c:type="gint*"/>
+        <parameter name="i">
+          <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="coord_type">
-          <type name="CoordType" c:type="AtkCoordType"/>
+        <parameter name="desc">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="component_get_size" c:identifier="atk_component_get_size">
+    <function name="action_get_localized_name"
+              c:identifier="atk_action_get_localized_name">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </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="component_get_layer"
-              c:identifier="atk_component_get_layer">
-      <return-value>
-        <type name="Layer" c:type="AtkLayer"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="component_get_mdi_zorder"
-              c:identifier="atk_component_get_mdi_zorder">
-      <return-value>
-        <type name="int" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="component_grab_focus"
-              c:identifier="atk_component_grab_focus">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="component_remove_focus_handler"
-              c:identifier="atk_component_remove_focus_handler">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-        <parameter name="handler_id">
-          <type name="uint" c:type="guint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="component_set_extents"
-              c:identifier="atk_component_set_extents">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </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="coord_type">
-          <type name="CoordType" c:type="AtkCoordType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="component_set_position"
-              c:identifier="atk_component_set_position">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int" c:type="gint"/>
-        </parameter>
-        <parameter name="coord_type">
-          <type name="CoordType" c:type="AtkCoordType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="component_set_size" c:identifier="atk_component_set_size">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-        <parameter name="width">
-          <type name="int" c:type="gint"/>
+        <parameter name="action">
+          <type name="Action" c:type="AtkAction*"/>
         </parameter>
-        <parameter name="height">
+        <parameter name="i">
           <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="component_get_alpha"
-              c:identifier="atk_component_get_alpha">
-      <return-value>
-        <type name="double" c:type="gdouble"/>
-      </return-value>
-      <parameters>
-        <parameter name="component">
-          <type name="Component" c:type="AtkComponent*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <interface name="Document"
-               c:type="AtkDocument"
-               glib:type-name="AtkDocument"
-               glib:get-type="atk_document_get_type">
-      <callback name="get_document_type" c:type="get_document_type">
+    <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="string" c:type="gchar*"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
-          <parameter name="document">
-            <type name="Document" c:type="AtkDocument*"/>
+          <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="get_document" c:type="get_document">
+      <callback name="remove_global_event_listener"
+                c:type="remove_global_event_listener">
         <return-value>
-          <type name="any" c:type="gpointer"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="document">
-            <type name="Document" c:type="AtkDocument*"/>
+          <parameter name="listener_id">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_document_locale" c:type="get_document_locale">
+      <callback name="add_key_event_listener" c:type="add_key_event_listener">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
-          <parameter name="document">
-            <type name="Document" c:type="AtkDocument*"/>
+          <parameter name="listener">
+            <type name="KeySnoopFunc" c:type="AtkKeySnoopFunc"/>
+          </parameter>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_document_attributes"
-                c:type="get_document_attributes">
+      <callback name="remove_key_event_listener"
+                c:type="remove_key_event_listener">
         <return-value>
-          <type name="AttributeSet" c:type="AtkAttributeSet*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="document">
-            <type name="Document" c:type="AtkDocument*"/>
+          <parameter name="listener_id">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_document_attribute_value"
-                c:type="get_document_attribute_value">
+      <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="UtilClass" c:type="AtkUtilClass">
+      <field name="parent">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <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="document">
-            <type name="Document" c:type="AtkDocument*"/>
+          <parameter name="listener">
+            <type name="GObject.SignalEmissionHook"
+                  c:type="GSignalEmissionHook"/>
           </parameter>
-          <parameter name="attribute_name">
+          <parameter name="event_type">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_document_attribute" c:type="set_document_attribute">
+      <callback name="remove_global_event_listener"
+                c:type="remove_global_event_listener">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="document">
-            <type name="Document" c:type="AtkDocument*"/>
+          <parameter name="listener_id">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="attribute_name">
-            <type name="string" c:type="gchar*"/>
+        </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="attribute_value">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </callback>
-      <field name="pad1">
-        <type name="Function" c:type="AtkFunction"/>
-      </field>
-      <field name="pad2">
-        <type name="Function" c:type="AtkFunction"/>
-      </field>
-      <field name="pad3">
-        <type name="Function" c:type="AtkFunction"/>
-      </field>
-      <field name="pad4">
-        <type name="Function" c:type="AtkFunction"/>
-      </field>
-      <glib:signal name="load-complete">
+      <callback name="remove_key_event_listener"
+                c:type="remove_key_event_listener">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="reload">
+        <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="none" c:type="void"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="load-stopped">
+      </callback>
+      <callback name="get_toolkit_name" c:type="get_toolkit_name">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
-      </glib:signal>
-    </interface>
-    <function name="document_get_document_type"
-              c:identifier="atk_document_get_document_type">
-      <return-value>
+      </callback>
+      <callback name="get_toolkit_version" c:type="get_toolkit_version">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+      </callback>
+    </record>
+    <record name="KeyEventStruct" c:type="AtkKeyEventStruct">
+      <field name="type">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="state">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="keyval">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <field name="length">
+        <type name="int" c:type="gint"/>
+      </field>
+      <field name="string">
         <type name="string" c:type="gchar*"/>
+      </field>
+      <field name="keycode">
+        <type name="uint16" c:type="guint16"/>
+      </field>
+      <field name="timestamp">
+        <type name="uint32" c:type="guint32"/>
+      </field>
+    </record>
+    <callback name="EventListener" c:type="AtkEventListener">
+      <return-value>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="document">
-          <type name="Document" c:type="AtkDocument*"/>
+        <parameter name="obj">
+          <type name="Object" c:type="AtkObject*"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="EventListenerInit" c:type="AtkEventListenerInit">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+    </callback>
+    <callback name="KeySnoopFunc" c:type="AtkKeySnoopFunc">
+      <return-value>
+        <type name="int" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="event">
+          <type name="KeyEventStruct" c:type="AtkKeyEventStruct*"/>
+        </parameter>
+        <parameter name="func_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <enumeration name="KeyEventType"
+                 c:type="AtkKeyEventType"
+                 glib:type-name="AtkKeyEventType"
+                 glib:get-type="atk_key_event_type_get_type">
+      <member name="press"
+              value="0"
+              c:identifier="ATK_KEY_EVENT_PRESS"
+              glib:nick="press"/>
+      <member name="release"
+              value="1"
+              c:identifier="ATK_KEY_EVENT_RELEASE"
+              glib:nick="release"/>
+      <member name="last-defined"
+              value="2"
+              c:identifier="ATK_KEY_EVENT_LAST_DEFINED"
+              glib:nick="last-defined"/>
+    </enumeration>
+    <enumeration name="CoordType"
+                 c:type="AtkCoordType"
+                 glib:type-name="AtkCoordType"
+                 glib:get-type="atk_coord_type_get_type">
+      <member name="screen"
+              value="0"
+              c:identifier="ATK_XY_SCREEN"
+              glib:nick="screen"/>
+      <member name="window"
+              value="1"
+              c:identifier="ATK_XY_WINDOW"
+              glib:nick="window"/>
+    </enumeration>
+    <function name="add_focus_tracker" c:identifier="atk_add_focus_tracker">
+      <return-value>
+        <type name="uint" c:type="guint"/>
+      </return-value>
+      <parameters>
+        <parameter name="focus_tracker">
+          <type name="EventListener" c:type="AtkEventListener"/>
         </parameter>
       </parameters>
     </function>
-    <function name="document_get_document"
-              c:identifier="atk_document_get_document">
+    <function name="remove_focus_tracker"
+              c:identifier="atk_remove_focus_tracker">
       <return-value>
-        <type name="any" c:type="gpointer"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="document">
-          <type name="Document" c:type="AtkDocument*"/>
+        <parameter name="tracker_id">
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="document_get_locale"
-              c:identifier="atk_document_get_locale">
+    <function name="focus_tracker_init" c:identifier="atk_focus_tracker_init">
       <return-value>
-        <type name="string" c:type="gchar*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="document">
-          <type name="Document" c:type="AtkDocument*"/>
+        <parameter name="init">
+          <type name="EventListenerInit" c:type="AtkEventListenerInit"/>
         </parameter>
       </parameters>
     </function>
-    <function name="document_get_attributes"
-              c:identifier="atk_document_get_attributes">
+    <function name="focus_tracker_notify"
+              c:identifier="atk_focus_tracker_notify">
       <return-value>
-        <type name="AttributeSet" c:type="AtkAttributeSet*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="document">
-          <type name="Document" c:type="AtkDocument*"/>
+        <parameter name="object">
+          <type name="Object" c:type="AtkObject*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="document_get_attribute_value"
-              c:identifier="atk_document_get_attribute_value">
+    <function name="add_global_event_listener"
+              c:identifier="atk_add_global_event_listener">
       <return-value>
-        <type name="string" c:type="gchar*"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
-        <parameter name="document">
-          <type name="Document" c:type="AtkDocument*"/>
+        <parameter name="listener">
+          <type name="GObject.SignalEmissionHook"
+                c:type="GSignalEmissionHook"/>
         </parameter>
-        <parameter name="attribute_name">
+        <parameter name="event_type">
           <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="document_set_attribute_value"
-              c:identifier="atk_document_set_attribute_value">
+    <function name="remove_global_event_listener"
+              c:identifier="atk_remove_global_event_listener">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="document">
-          <type name="Document" c:type="AtkDocument*"/>
+        <parameter name="listener_id">
+          <type name="uint" c:type="guint"/>
         </parameter>
-        <parameter name="attribute_name">
-          <type name="string" c:type="gchar*"/>
+      </parameters>
+    </function>
+    <function name="add_key_event_listener"
+              c:identifier="atk_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="attribute_value">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
         </parameter>
       </parameters>
     </function>
-    <enumeration name="TextAttribute"
-                 c:type="AtkTextAttribute"
-                 glib:type-name="AtkTextAttribute"
-                 glib:get-type="atk_text_attribute_get_type">
-      <member name="invalid"
-              value="0"
-              c:identifier="ATK_TEXT_ATTR_INVALID"
-              glib:nick="invalid"/>
-      <member name="left-margin"
-              value="1"
-              c:identifier="ATK_TEXT_ATTR_LEFT_MARGIN"
-              glib:nick="left-margin"/>
-      <member name="right-margin"
-              value="2"
-              c:identifier="ATK_TEXT_ATTR_RIGHT_MARGIN"
-              glib:nick="right-margin"/>
-      <member name="indent"
-              value="3"
-              c:identifier="ATK_TEXT_ATTR_INDENT"
-              glib:nick="indent"/>
-      <member name="invisible"
-              value="4"
-              c:identifier="ATK_TEXT_ATTR_INVISIBLE"
-              glib:nick="invisible"/>
-      <member name="editable"
-              value="5"
-              c:identifier="ATK_TEXT_ATTR_EDITABLE"
-              glib:nick="editable"/>
-      <member name="pixels-above-lines"
-              value="6"
-              c:identifier="ATK_TEXT_ATTR_PIXELS_ABOVE_LINES"
-              glib:nick="pixels-above-lines"/>
-      <member name="pixels-below-lines"
-              value="7"
-              c:identifier="ATK_TEXT_ATTR_PIXELS_BELOW_LINES"
-              glib:nick="pixels-below-lines"/>
-      <member name="pixels-inside-wrap"
-              value="8"
-              c:identifier="ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP"
-              glib:nick="pixels-inside-wrap"/>
-      <member name="bg-full-height"
-              value="9"
-              c:identifier="ATK_TEXT_ATTR_BG_FULL_HEIGHT"
-              glib:nick="bg-full-height"/>
-      <member name="rise"
-              value="10"
-              c:identifier="ATK_TEXT_ATTR_RISE"
-              glib:nick="rise"/>
-      <member name="underline"
-              value="11"
-              c:identifier="ATK_TEXT_ATTR_UNDERLINE"
-              glib:nick="underline"/>
-      <member name="strikethrough"
-              value="12"
-              c:identifier="ATK_TEXT_ATTR_STRIKETHROUGH"
-              glib:nick="strikethrough"/>
-      <member name="size"
-              value="13"
-              c:identifier="ATK_TEXT_ATTR_SIZE"
-              glib:nick="size"/>
-      <member name="scale"
-              value="14"
-              c:identifier="ATK_TEXT_ATTR_SCALE"
-              glib:nick="scale"/>
-      <member name="weight"
-              value="15"
-              c:identifier="ATK_TEXT_ATTR_WEIGHT"
-              glib:nick="weight"/>
-      <member name="language"
-              value="16"
-              c:identifier="ATK_TEXT_ATTR_LANGUAGE"
-              glib:nick="language"/>
-      <member name="family-name"
-              value="17"
-              c:identifier="ATK_TEXT_ATTR_FAMILY_NAME"
-              glib:nick="family-name"/>
-      <member name="bg-color"
-              value="18"
-              c:identifier="ATK_TEXT_ATTR_BG_COLOR"
-              glib:nick="bg-color"/>
-      <member name="fg-color"
-              value="19"
-              c:identifier="ATK_TEXT_ATTR_FG_COLOR"
-              glib:nick="fg-color"/>
-      <member name="bg-stipple"
-              value="20"
-              c:identifier="ATK_TEXT_ATTR_BG_STIPPLE"
-              glib:nick="bg-stipple"/>
-      <member name="fg-stipple"
-              value="21"
-              c:identifier="ATK_TEXT_ATTR_FG_STIPPLE"
-              glib:nick="fg-stipple"/>
-      <member name="wrap-mode"
-              value="22"
-              c:identifier="ATK_TEXT_ATTR_WRAP_MODE"
-              glib:nick="wrap-mode"/>
-      <member name="direction"
-              value="23"
-              c:identifier="ATK_TEXT_ATTR_DIRECTION"
-              glib:nick="direction"/>
-      <member name="justification"
-              value="24"
-              c:identifier="ATK_TEXT_ATTR_JUSTIFICATION"
-              glib:nick="justification"/>
-      <member name="stretch"
-              value="25"
-              c:identifier="ATK_TEXT_ATTR_STRETCH"
-              glib:nick="stretch"/>
-      <member name="variant"
-              value="26"
-              c:identifier="ATK_TEXT_ATTR_VARIANT"
-              glib:nick="variant"/>
-      <member name="style"
-              value="27"
-              c:identifier="ATK_TEXT_ATTR_STYLE"
-              glib:nick="style"/>
-      <member name="last-defined"
-              value="28"
-              c:identifier="ATK_TEXT_ATTR_LAST_DEFINED"
-              glib:nick="last-defined"/>
-    </enumeration>
-    <function name="text_attribute_register"
-              c:identifier="atk_text_attribute_register">
+    <function name="remove_key_event_listener"
+              c:identifier="atk_remove_key_event_listener">
       <return-value>
-        <type name="TextAttribute" c:type="AtkTextAttribute"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="listener_id">
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
-    <interface name="Text"
-               c:type="AtkText"
-               glib:type-name="AtkText"
-               glib:get-type="atk_text_get_type">
-      <callback name="get_text" c:type="get_text">
+    <function name="get_root" c:identifier="atk_get_root">
+      <return-value>
+        <type name="Object" c:type="AtkObject*"/>
+      </return-value>
+    </function>
+    <function name="get_focus_object" c:identifier="atk_get_focus_object">
+      <return-value>
+        <type name="Object" c:type="AtkObject*"/>
+      </return-value>
+    </function>
+    <function name="get_toolkit_name" c:identifier="atk_get_toolkit_name">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+    </function>
+    <function name="get_toolkit_version"
+              c:identifier="atk_get_toolkit_version">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+    </function>
+    <function name="get_version" c:identifier="atk_get_version">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+    </function>
+    <interface name="Component"
+               c:type="AtkComponent"
+               glib:type-name="AtkComponent"
+               glib:get-type="atk_component_get_type">
+      <callback name="add_focus_handler" c:type="add_focus_handler">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
-          </parameter>
-          <parameter name="start_offset">
-            <type name="int" c:type="gint"/>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
-          <parameter name="end_offset">
-            <type name="int" c:type="gint"/>
+          <parameter name="handler">
+            <type name="FocusHandler" c:type="AtkFocusHandler"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_text_after_offset" c:type="get_text_after_offset">
+      <callback name="contains" c:type="contains">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
-          <parameter name="offset">
+          <parameter name="x">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="boundary_type">
-            <type name="TextBoundary" c:type="AtkTextBoundary"/>
-          </parameter>
-          <parameter name="start_offset">
-            <type name="int" c:type="gint*"/>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="end_offset">
-            <type name="int" c:type="gint*"/>
+          <parameter name="coord_type">
+            <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_text_at_offset" c:type="get_text_at_offset">
+      <callback name="ref_accessible_at_point"
+                c:type="ref_accessible_at_point">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
-          <parameter name="offset">
+          <parameter name="x">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="boundary_type">
-            <type name="TextBoundary" c:type="AtkTextBoundary"/>
-          </parameter>
-          <parameter name="start_offset">
-            <type name="int" c:type="gint*"/>
-          </parameter>
-          <parameter name="end_offset">
-            <type name="int" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_character_at_offset"
-                c:type="get_character_at_offset">
-        <return-value>
-          <type name="GLib.unichar" c:type="gunichar"/>
-        </return-value>
-        <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
-          </parameter>
-          <parameter name="offset">
+          <parameter name="y">
             <type name="int" c:type="gint"/>
           </parameter>
+          <parameter name="coord_type">
+            <type name="CoordType" c:type="AtkCoordType"/>
+          </parameter>
         </parameters>
       </callback>
-      <callback name="get_text_before_offset" c:type="get_text_before_offset">
+      <callback name="get_extents" c:type="get_extents">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
-          <parameter name="offset">
-            <type name="int" c:type="gint"/>
+          <parameter name="x">
+            <type name="int" c:type="gint*"/>
           </parameter>
-          <parameter name="boundary_type">
-            <type name="TextBoundary" c:type="AtkTextBoundary"/>
+          <parameter name="y">
+            <type name="int" c:type="gint*"/>
           </parameter>
-          <parameter name="start_offset">
+          <parameter name="width">
             <type name="int" c:type="gint*"/>
           </parameter>
-          <parameter name="end_offset">
+          <parameter name="height">
             <type name="int" c:type="gint*"/>
           </parameter>
+          <parameter name="coord_type">
+            <type name="CoordType" c:type="AtkCoordType"/>
+          </parameter>
         </parameters>
       </callback>
-      <callback name="get_caret_offset" c:type="get_caret_offset">
+      <callback name="get_position" c:type="get_position">
         <return-value>
-          <type name="int" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="coord_type">
+            <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_run_attributes" c:type="get_run_attributes">
+      <callback name="get_size" c:type="get_size">
         <return-value>
-          <type name="AttributeSet" c:type="AtkAttributeSet*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
-          </parameter>
-          <parameter name="offset">
-            <type name="int" c:type="gint"/>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
-          <parameter name="start_offset">
+          <parameter name="width">
             <type name="int" c:type="gint*"/>
           </parameter>
-          <parameter name="end_offset">
+          <parameter name="height">
             <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_default_attributes" c:type="get_default_attributes">
+      <callback name="grab_focus" c:type="grab_focus">
         <return-value>
-          <type name="AttributeSet" c:type="AtkAttributeSet*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_character_extents" c:type="get_character_extents">
+      <callback name="remove_focus_handler" c:type="remove_focus_handler">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
-          <parameter name="offset">
-            <type name="int" c:type="gint"/>
+          <parameter name="handler_id">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_extents" c:type="set_extents">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
           <parameter name="x">
-            <type name="int" c:type="gint*"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="y">
-            <type name="int" c:type="gint*"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="width">
-            <type name="int" c:type="gint*"/>
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="height">
-            <type name="int" c:type="gint*"/>
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="coords">
+          <parameter name="coord_type">
             <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_character_count" c:type="get_character_count">
+      <callback name="set_position" c:type="set_position">
         <return-value>
-          <type name="int" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
-          </parameter>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="coord_type">
+            <type name="CoordType" c:type="AtkCoordType"/>
+          </parameter>
         </parameters>
       </callback>
-      <callback name="get_offset_at_point" c:type="get_offset_at_point">
+      <callback name="set_size" c:type="set_size">
         <return-value>
-          <type name="int" c:type="gint"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
-          <parameter name="x">
+          <parameter name="width">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="y">
+          <parameter name="height">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="coords">
-            <type name="CoordType" c:type="AtkCoordType"/>
+        </parameters>
+      </callback>
+      <callback name="get_layer" c:type="get_layer">
+        <return-value>
+          <type name="Layer" c:type="AtkLayer"/>
+        </return-value>
+        <parameters>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_n_selections" c:type="get_n_selections">
+      <callback name="get_mdi_zorder" c:type="get_mdi_zorder">
         <return-value>
           <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_selection" c:type="get_selection">
+      <callback name="bounds_changed" c:type="bounds_changed">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
-          </parameter>
-          <parameter name="selection_num">
-            <type name="int" c:type="gint"/>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
-          <parameter name="start_offset">
-            <type name="int" c:type="gint*"/>
+          <parameter name="bounds">
+            <type name="Rectangle" c:type="AtkRectangle*"/>
           </parameter>
-          <parameter name="end_offset">
-            <type name="int" c:type="gint*"/>
+        </parameters>
+      </callback>
+      <callback name="get_alpha" c:type="get_alpha">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="add_selection" c:type="add_selection">
+      <glib:signal name="bounds-changed">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
+          <parameter name="object">
+            <type name="Rectangle" c:type="AtkRectangle"/>
           </parameter>
-          <parameter name="start_offset">
-            <type name="int" c:type="gint"/>
+        </parameters>
+      </glib:signal>
+    </interface>
+    <record name="ComponentIface" c:type="AtkComponentIface">
+      <field name="parent">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="add_focus_handler" c:type="add_focus_handler">
+        <return-value>
+          <type name="uint" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
-          <parameter name="end_offset">
-            <type name="int" c:type="gint"/>
+          <parameter name="handler">
+            <type name="FocusHandler" c:type="AtkFocusHandler"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="remove_selection" c:type="remove_selection">
+      <callback name="contains" c:type="contains">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
-          <parameter name="selection_num">
+          <parameter name="x">
             <type name="int" c:type="gint"/>
           </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="coord_type">
+            <type name="CoordType" c:type="AtkCoordType"/>
+          </parameter>
         </parameters>
       </callback>
-      <callback name="set_selection" c:type="set_selection">
+      <callback name="ref_accessible_at_point"
+                c:type="ref_accessible_at_point">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
-          <parameter name="selection_num">
+          <parameter name="x">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="start_offset">
+          <parameter name="y">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="end_offset">
-            <type name="int" c:type="gint"/>
+          <parameter name="coord_type">
+            <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_caret_offset" c:type="set_caret_offset">
+      <callback name="get_extents" c:type="get_extents">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
-          <parameter name="offset">
-            <type name="int" 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="width">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="height">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="coord_type">
+            <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="text_changed" c:type="text_changed">
+      <callback name="get_position" c:type="get_position">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
-          <parameter name="position">
-            <type name="int" c:type="gint"/>
+          <parameter name="x">
+            <type name="int" c:type="gint*"/>
           </parameter>
-          <parameter name="length">
-            <type name="int" c:type="gint"/>
+          <parameter name="y">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="coord_type">
+            <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="text_caret_moved" c:type="text_caret_moved">
+      <callback name="get_size" c:type="get_size">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
-          <parameter name="location">
-            <type name="int" c:type="gint"/>
+          <parameter name="width">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="height">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="text_selection_changed" c:type="text_selection_changed">
+      <callback name="grab_focus" c:type="grab_focus">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="text_attributes_changed"
-                c:type="text_attributes_changed">
+      <callback name="remove_focus_handler" c:type="remove_focus_handler">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
+          </parameter>
+          <parameter name="handler_id">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_range_extents" c:type="get_range_extents">
+      <callback name="set_extents" c:type="set_extents">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
-          <parameter name="start_offset">
+          <parameter name="x">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="end_offset">
+          <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="coord_type">
             <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
-          <parameter name="rect">
-            <type name="TextRectangle" c:type="AtkTextRectangle*"/>
-          </parameter>
         </parameters>
       </callback>
-      <callback name="get_bounded_ranges" c:type="get_bounded_ranges">
+      <callback name="set_position" c:type="set_position">
         <return-value>
-          <type name="TextRange" c:type="AtkTextRange**"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="Text" c:type="AtkText*"/>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
-          <parameter name="rect">
-            <type name="TextRectangle" c:type="AtkTextRectangle*"/>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
           </parameter>
           <parameter name="coord_type">
             <type name="CoordType" c:type="AtkCoordType"/>
           </parameter>
-          <parameter name="x_clip_type">
-            <type name="TextClipType" c:type="AtkTextClipType"/>
-          </parameter>
-          <parameter name="y_clip_type">
-            <type name="TextClipType" c:type="AtkTextClipType"/>
-          </parameter>
         </parameters>
       </callback>
-      <field name="pad4">
-        <type name="Function" c:type="AtkFunction"/>
-      </field>
-      <glib:signal name="text-changed">
+      <callback name="set_size" c:type="set_size">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
+          </parameter>
+          <parameter name="width">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="p0">
+          <parameter name="height">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="text-caret-moved">
+      </callback>
+      <callback name="get_layer" c:type="get_layer">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Layer" c:type="AtkLayer"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="int" c:type="gint"/>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="text-selection-changed">
+      </callback>
+      <callback name="get_mdi_zorder" c:type="get_mdi_zorder">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="text-attributes-changed">
+        <parameters>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="bounds_changed" c:type="bounds_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </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>
+        <parameters>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
+          </parameter>
+          <parameter name="bounds">
+            <type name="Rectangle" c:type="AtkRectangle*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_alpha" c:type="get_alpha">
+        <return-value>
+          <type name="double" c:type="gdouble"/>
+        </return-value>
+        <parameters>
+          <parameter name="component">
+            <type name="Component" c:type="AtkComponent*"/>
+          </parameter>
+        </parameters>
+      </callback>
     </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">
+    <callback name="FocusHandler" c:type="AtkFocusHandler">
       <return-value>
-        <type name="string" c:type="gchar*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="start_offset">
-          <type name="int" c:type="gint"/>
+        <parameter>
+          <type name="Object" c:type="AtkObject*"/>
         </parameter>
-        <parameter name="end_offset">
-          <type name="int" c:type="gint"/>
+        <parameter>
+          <type name="boolean" c:type="gboolean"/>
         </parameter>
       </parameters>
-    </function>
-    <function name="text_get_character_at_offset"
-              c:identifier="atk_text_get_character_at_offset">
+    </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="GLib.unichar" c:type="gunichar"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
+        <parameter name="component">
+          <type name="Component" c:type="AtkComponent*"/>
         </parameter>
-        <parameter name="offset">
-          <type name="int" c:type="gint"/>
+        <parameter name="handler">
+          <type name="FocusHandler" c:type="AtkFocusHandler"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_get_text_after_offset"
-              c:identifier="atk_text_get_text_after_offset">
+    <function name="component_contains" c:identifier="atk_component_contains">
       <return-value>
-        <type name="string" c:type="gchar*"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
+        <parameter name="component">
+          <type name="Component" c:type="AtkComponent*"/>
         </parameter>
-        <parameter name="offset">
+        <parameter name="x">
           <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="boundary_type">
-          <type name="TextBoundary" c:type="AtkTextBoundary"/>
-        </parameter>
-        <parameter name="start_offset">
-          <type name="int" c:type="gint*"/>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="end_offset">
-          <type name="int" c:type="gint*"/>
+        <parameter name="coord_type">
+          <type name="CoordType" c:type="AtkCoordType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_get_text_at_offset"
-              c:identifier="atk_text_get_text_at_offset">
+    <function name="component_ref_accessible_at_point"
+              c:identifier="atk_component_ref_accessible_at_point">
       <return-value>
-        <type name="string" c:type="gchar*"/>
+        <type name="Object" c:type="AtkObject*"/>
       </return-value>
       <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
+        <parameter name="component">
+          <type name="Component" c:type="AtkComponent*"/>
         </parameter>
-        <parameter name="offset">
+        <parameter name="x">
           <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="boundary_type">
-          <type name="TextBoundary" c:type="AtkTextBoundary"/>
-        </parameter>
-        <parameter name="start_offset">
-          <type name="int" c:type="gint*"/>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="end_offset">
-          <type name="int" c:type="gint*"/>
+        <parameter name="coord_type">
+          <type name="CoordType" c:type="AtkCoordType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_get_text_before_offset"
-              c:identifier="atk_text_get_text_before_offset">
+    <function name="component_get_extents"
+              c:identifier="atk_component_get_extents">
       <return-value>
-        <type name="string" c:type="gchar*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
+        <parameter name="component">
+          <type name="Component" c:type="AtkComponent*"/>
         </parameter>
-        <parameter name="offset">
-          <type name="int" c:type="gint"/>
+        <parameter name="x">
+          <type name="int" c:type="gint*"/>
         </parameter>
-        <parameter name="boundary_type">
-          <type name="TextBoundary" c:type="AtkTextBoundary"/>
+        <parameter name="y">
+          <type name="int" c:type="gint*"/>
         </parameter>
-        <parameter name="start_offset">
+        <parameter name="width">
           <type name="int" c:type="gint*"/>
         </parameter>
-        <parameter name="end_offset">
+        <parameter name="height">
           <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="int" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
+        <parameter name="coord_type">
+          <type name="CoordType" c:type="AtkCoordType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_get_character_extents"
-              c:identifier="atk_text_get_character_extents">
+    <function name="component_get_position"
+              c:identifier="atk_component_get_position">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="offset">
-          <type name="int" c:type="gint"/>
+        <parameter name="component">
+          <type name="Component" c:type="AtkComponent*"/>
         </parameter>
         <parameter name="x">
           <type name="int" c:type="gint*"/>
@@ -3603,253 +3247,3268 @@
         <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="coords">
+        <parameter name="coord_type">
           <type name="CoordType" c:type="AtkCoordType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_get_run_attributes"
-              c:identifier="atk_text_get_run_attributes">
+    <function name="component_get_size" c:identifier="atk_component_get_size">
       <return-value>
-        <type name="AttributeSet" c:type="AtkAttributeSet*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="offset">
-          <type name="int" c:type="gint"/>
+        <parameter name="component">
+          <type name="Component" c:type="AtkComponent*"/>
         </parameter>
-        <parameter name="start_offset">
+        <parameter name="width">
           <type name="int" c:type="gint*"/>
         </parameter>
-        <parameter name="end_offset">
+        <parameter name="height">
           <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="AttributeSet" c:type="AtkAttributeSet*"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_get_character_count"
-              c:identifier="atk_text_get_character_count">
+    <function name="component_get_layer"
+              c:identifier="atk_component_get_layer">
       <return-value>
-        <type name="int" c:type="gint"/>
+        <type name="Layer" c:type="AtkLayer"/>
       </return-value>
       <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
+        <parameter name="component">
+          <type name="Component" c:type="AtkComponent*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_get_offset_at_point"
-              c:identifier="atk_text_get_offset_at_point">
+    <function name="component_get_mdi_zorder"
+              c:identifier="atk_component_get_mdi_zorder">
       <return-value>
         <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int" c:type="gint"/>
-        </parameter>
-        <parameter name="coords">
-          <type name="CoordType" c:type="AtkCoordType"/>
+        <parameter name="component">
+          <type name="Component" c:type="AtkComponent*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_get_n_selections"
-              c:identifier="atk_text_get_n_selections">
+    <function name="component_grab_focus"
+              c:identifier="atk_component_grab_focus">
       <return-value>
-        <type name="int" c:type="gint"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
+        <parameter name="component">
+          <type name="Component" c:type="AtkComponent*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_get_selection" c:identifier="atk_text_get_selection">
+    <function name="component_remove_focus_handler"
+              c:identifier="atk_component_remove_focus_handler">
       <return-value>
-        <type name="string" c:type="gchar*"/>
+        <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="selection_num">
-          <type name="int" c:type="gint"/>
-        </parameter>
-        <parameter name="start_offset">
-          <type name="int" c:type="gint*"/>
+        <parameter name="component">
+          <type name="Component" c:type="AtkComponent*"/>
         </parameter>
-        <parameter name="end_offset">
-          <type name="int" c:type="gint*"/>
+        <parameter name="handler_id">
+          <type name="uint" c:type="guint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_add_selection" c:identifier="atk_text_add_selection">
+    <function name="component_set_extents"
+              c:identifier="atk_component_set_extents">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="start_offset">
-          <type name="int" c:type="gint"/>
+        <parameter name="component">
+          <type name="Component" c:type="AtkComponent*"/>
         </parameter>
-        <parameter name="end_offset">
+        <parameter name="x">
           <type name="int" c:type="gint"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="text_remove_selection"
-              c:identifier="atk_text_remove_selection">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="selection_num">
+        <parameter name="y">
           <type name="int" c:type="gint"/>
         </parameter>
-      </parameters>
-    </function>
-    <function name="text_set_selection" c:identifier="atk_text_set_selection">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="selection_num">
+        <parameter name="width">
           <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="start_offset">
+        <parameter name="height">
           <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="end_offset">
-          <type name="int" c:type="gint"/>
+        <parameter name="coord_type">
+          <type name="CoordType" c:type="AtkCoordType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_set_caret_offset"
-              c:identifier="atk_text_set_caret_offset">
+    <function name="component_set_position"
+              c:identifier="atk_component_set_position">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="offset">
-          <type name="int" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="text_get_range_extents"
-              c:identifier="atk_text_get_range_extents">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
+        <parameter name="component">
+          <type name="Component" c:type="AtkComponent*"/>
         </parameter>
-        <parameter name="start_offset">
+        <parameter name="x">
           <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="end_offset">
+        <parameter name="y">
           <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="coord_type">
           <type name="CoordType" c:type="AtkCoordType"/>
         </parameter>
-        <parameter name="rect">
-          <type name="TextRectangle" c:type="AtkTextRectangle*"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="text_get_bounded_ranges"
-              c:identifier="atk_text_get_bounded_ranges">
+    <function name="component_set_size" c:identifier="atk_component_set_size">
       <return-value>
-        <type name="TextRange" c:type="AtkTextRange**"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="text">
-          <type name="Text" c:type="AtkText*"/>
-        </parameter>
-        <parameter name="rect">
-          <type name="TextRectangle" c:type="AtkTextRectangle*"/>
-        </parameter>
-        <parameter name="coord_type">
-          <type name="CoordType" c:type="AtkCoordType"/>
+        <parameter name="component">
+          <type name="Component" c:type="AtkComponent*"/>
         </parameter>
-        <parameter name="x_clip_type">
-          <type name="TextClipType" c:type="AtkTextClipType"/>
+        <parameter name="width">
+          <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="y_clip_type">
-          <type name="TextClipType" c:type="AtkTextClipType"/>
+        <parameter name="height">
+          <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_free_ranges" c:identifier="atk_text_free_ranges">
+    <function name="component_get_alpha"
+              c:identifier="atk_component_get_alpha">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="double" c:type="gdouble"/>
       </return-value>
       <parameters>
-        <parameter name="ranges">
-          <type name="TextRange" c:type="AtkTextRange**"/>
+        <parameter name="component">
+          <type name="Component" c:type="AtkComponent*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="attribute_set_free" c:identifier="atk_attribute_set_free">
+    <interface name="Document"
+               c:type="AtkDocument"
+               glib:type-name="AtkDocument"
+               glib:get-type="atk_document_get_type">
+      <callback name="get_document_type" c:type="get_document_type">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="document">
+            <type name="Document" c:type="AtkDocument*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_document" c:type="get_document">
+        <return-value>
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="document">
+            <type name="Document" c:type="AtkDocument*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_document_locale" c:type="get_document_locale">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="document">
+            <type name="Document" c:type="AtkDocument*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_document_attributes"
+                c:type="get_document_attributes">
+        <return-value>
+          <type name="AttributeSet" c:type="AtkAttributeSet*"/>
+        </return-value>
+        <parameters>
+          <parameter name="document">
+            <type name="Document" c:type="AtkDocument*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_document_attribute_value"
+                c:type="get_document_attribute_value">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="document">
+            <type name="Document" c:type="AtkDocument*"/>
+          </parameter>
+          <parameter name="attribute_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_document_attribute" c:type="set_document_attribute">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="document">
+            <type name="Document" c:type="AtkDocument*"/>
+          </parameter>
+          <parameter name="attribute_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="attribute_value">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad2">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad3">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad4">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <glib:signal name="load-complete">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="reload">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="load-stopped">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </interface>
+    <record name="DocumentIface" c:type="AtkDocumentIface">
+      <field name="parent">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="get_document_type" c:type="get_document_type">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="document">
+            <type name="Document" c:type="AtkDocument*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_document" c:type="get_document">
+        <return-value>
+          <type name="any" c:type="gpointer"/>
+        </return-value>
+        <parameters>
+          <parameter name="document">
+            <type name="Document" c:type="AtkDocument*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_document_locale" c:type="get_document_locale">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="document">
+            <type name="Document" c:type="AtkDocument*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_document_attributes"
+                c:type="get_document_attributes">
+        <return-value>
+          <type name="AttributeSet" c:type="AtkAttributeSet*"/>
+        </return-value>
+        <parameters>
+          <parameter name="document">
+            <type name="Document" c:type="AtkDocument*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_document_attribute_value"
+                c:type="get_document_attribute_value">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="document">
+            <type name="Document" c:type="AtkDocument*"/>
+          </parameter>
+          <parameter name="attribute_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_document_attribute" c:type="set_document_attribute">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="document">
+            <type name="Document" c:type="AtkDocument*"/>
+          </parameter>
+          <parameter name="attribute_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="attribute_value">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad2">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad3">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad4">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+    </record>
+    <function name="document_get_document_type"
+              c:identifier="atk_document_get_document_type">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="document">
+          <type name="Document" c:type="AtkDocument*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="document_get_document"
+              c:identifier="atk_document_get_document">
+      <return-value>
+        <type name="any" c:type="gpointer"/>
+      </return-value>
+      <parameters>
+        <parameter name="document">
+          <type name="Document" c:type="AtkDocument*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="document_get_locale"
+              c:identifier="atk_document_get_locale">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="document">
+          <type name="Document" c:type="AtkDocument*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="document_get_attributes"
+              c:identifier="atk_document_get_attributes">
+      <return-value>
+        <type name="AttributeSet" c:type="AtkAttributeSet*"/>
+      </return-value>
+      <parameters>
+        <parameter name="document">
+          <type name="Document" c:type="AtkDocument*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="document_get_attribute_value"
+              c:identifier="atk_document_get_attribute_value">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="document">
+          <type name="Document" c:type="AtkDocument*"/>
+        </parameter>
+        <parameter name="attribute_name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="document_set_attribute_value"
+              c:identifier="atk_document_set_attribute_value">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="document">
+          <type name="Document" c:type="AtkDocument*"/>
+        </parameter>
+        <parameter name="attribute_name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="attribute_value">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <enumeration name="TextAttribute"
+                 c:type="AtkTextAttribute"
+                 glib:type-name="AtkTextAttribute"
+                 glib:get-type="atk_text_attribute_get_type">
+      <member name="invalid"
+              value="0"
+              c:identifier="ATK_TEXT_ATTR_INVALID"
+              glib:nick="invalid"/>
+      <member name="left-margin"
+              value="1"
+              c:identifier="ATK_TEXT_ATTR_LEFT_MARGIN"
+              glib:nick="left-margin"/>
+      <member name="right-margin"
+              value="2"
+              c:identifier="ATK_TEXT_ATTR_RIGHT_MARGIN"
+              glib:nick="right-margin"/>
+      <member name="indent"
+              value="3"
+              c:identifier="ATK_TEXT_ATTR_INDENT"
+              glib:nick="indent"/>
+      <member name="invisible"
+              value="4"
+              c:identifier="ATK_TEXT_ATTR_INVISIBLE"
+              glib:nick="invisible"/>
+      <member name="editable"
+              value="5"
+              c:identifier="ATK_TEXT_ATTR_EDITABLE"
+              glib:nick="editable"/>
+      <member name="pixels-above-lines"
+              value="6"
+              c:identifier="ATK_TEXT_ATTR_PIXELS_ABOVE_LINES"
+              glib:nick="pixels-above-lines"/>
+      <member name="pixels-below-lines"
+              value="7"
+              c:identifier="ATK_TEXT_ATTR_PIXELS_BELOW_LINES"
+              glib:nick="pixels-below-lines"/>
+      <member name="pixels-inside-wrap"
+              value="8"
+              c:identifier="ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP"
+              glib:nick="pixels-inside-wrap"/>
+      <member name="bg-full-height"
+              value="9"
+              c:identifier="ATK_TEXT_ATTR_BG_FULL_HEIGHT"
+              glib:nick="bg-full-height"/>
+      <member name="rise"
+              value="10"
+              c:identifier="ATK_TEXT_ATTR_RISE"
+              glib:nick="rise"/>
+      <member name="underline"
+              value="11"
+              c:identifier="ATK_TEXT_ATTR_UNDERLINE"
+              glib:nick="underline"/>
+      <member name="strikethrough"
+              value="12"
+              c:identifier="ATK_TEXT_ATTR_STRIKETHROUGH"
+              glib:nick="strikethrough"/>
+      <member name="size"
+              value="13"
+              c:identifier="ATK_TEXT_ATTR_SIZE"
+              glib:nick="size"/>
+      <member name="scale"
+              value="14"
+              c:identifier="ATK_TEXT_ATTR_SCALE"
+              glib:nick="scale"/>
+      <member name="weight"
+              value="15"
+              c:identifier="ATK_TEXT_ATTR_WEIGHT"
+              glib:nick="weight"/>
+      <member name="language"
+              value="16"
+              c:identifier="ATK_TEXT_ATTR_LANGUAGE"
+              glib:nick="language"/>
+      <member name="family-name"
+              value="17"
+              c:identifier="ATK_TEXT_ATTR_FAMILY_NAME"
+              glib:nick="family-name"/>
+      <member name="bg-color"
+              value="18"
+              c:identifier="ATK_TEXT_ATTR_BG_COLOR"
+              glib:nick="bg-color"/>
+      <member name="fg-color"
+              value="19"
+              c:identifier="ATK_TEXT_ATTR_FG_COLOR"
+              glib:nick="fg-color"/>
+      <member name="bg-stipple"
+              value="20"
+              c:identifier="ATK_TEXT_ATTR_BG_STIPPLE"
+              glib:nick="bg-stipple"/>
+      <member name="fg-stipple"
+              value="21"
+              c:identifier="ATK_TEXT_ATTR_FG_STIPPLE"
+              glib:nick="fg-stipple"/>
+      <member name="wrap-mode"
+              value="22"
+              c:identifier="ATK_TEXT_ATTR_WRAP_MODE"
+              glib:nick="wrap-mode"/>
+      <member name="direction"
+              value="23"
+              c:identifier="ATK_TEXT_ATTR_DIRECTION"
+              glib:nick="direction"/>
+      <member name="justification"
+              value="24"
+              c:identifier="ATK_TEXT_ATTR_JUSTIFICATION"
+              glib:nick="justification"/>
+      <member name="stretch"
+              value="25"
+              c:identifier="ATK_TEXT_ATTR_STRETCH"
+              glib:nick="stretch"/>
+      <member name="variant"
+              value="26"
+              c:identifier="ATK_TEXT_ATTR_VARIANT"
+              glib:nick="variant"/>
+      <member name="style"
+              value="27"
+              c:identifier="ATK_TEXT_ATTR_STYLE"
+              glib:nick="style"/>
+      <member name="last-defined"
+              value="28"
+              c:identifier="ATK_TEXT_ATTR_LAST_DEFINED"
+              glib:nick="last-defined"/>
+    </enumeration>
+    <function name="text_attribute_register"
+              c:identifier="atk_text_attribute_register">
+      <return-value>
+        <type name="TextAttribute" c:type="AtkTextAttribute"/>
+      </return-value>
+      <parameters>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <interface name="Text"
+               c:type="AtkText"
+               glib:type-name="AtkText"
+               glib:get-type="atk_text_get_type">
+      <callback name="get_text" c:type="get_text">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="start_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="end_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_text_after_offset" c:type="get_text_after_offset">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="boundary_type">
+            <type name="TextBoundary" c:type="AtkTextBoundary"/>
+          </parameter>
+          <parameter name="start_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="end_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_text_at_offset" c:type="get_text_at_offset">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="boundary_type">
+            <type name="TextBoundary" c:type="AtkTextBoundary"/>
+          </parameter>
+          <parameter name="start_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="end_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_character_at_offset"
+                c:type="get_character_at_offset">
+        <return-value>
+          <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="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_text_before_offset" c:type="get_text_before_offset">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="boundary_type">
+            <type name="TextBoundary" c:type="AtkTextBoundary"/>
+          </parameter>
+          <parameter name="start_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="end_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_caret_offset" c:type="get_caret_offset">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_run_attributes" c:type="get_run_attributes">
+        <return-value>
+          <type name="AttributeSet" c:type="AtkAttributeSet*"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="start_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="end_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_default_attributes" c:type="get_default_attributes">
+        <return-value>
+          <type name="AttributeSet" c:type="AtkAttributeSet*"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_character_extents" c:type="get_character_extents">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="int" c:type="gint"/>
+          </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="coords">
+            <type name="CoordType" c:type="AtkCoordType"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_character_count" c:type="get_character_count">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_offset_at_point" c:type="get_offset_at_point">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="coords">
+            <type name="CoordType" c:type="AtkCoordType"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_n_selections" c:type="get_n_selections">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_selection" c:type="get_selection">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="selection_num">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="start_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="end_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="add_selection" c:type="add_selection">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="start_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="end_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="remove_selection" c:type="remove_selection">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="selection_num">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_selection" c:type="set_selection">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="selection_num">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="start_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="end_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_caret_offset" c:type="set_caret_offset">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="text_changed" c:type="text_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="length">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="text_caret_moved" c:type="text_caret_moved">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="location">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="text_selection_changed" c:type="text_selection_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="text_attributes_changed"
+                c:type="text_attributes_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_range_extents" c:type="get_range_extents">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="start_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="end_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="coord_type">
+            <type name="CoordType" c:type="AtkCoordType"/>
+          </parameter>
+          <parameter name="rect">
+            <type name="TextRectangle" c:type="AtkTextRectangle*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_bounded_ranges" c:type="get_bounded_ranges">
+        <return-value>
+          <type name="TextRange" c:type="AtkTextRange**"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="rect">
+            <type name="TextRectangle" c:type="AtkTextRectangle*"/>
+          </parameter>
+          <parameter name="coord_type">
+            <type name="CoordType" c:type="AtkCoordType"/>
+          </parameter>
+          <parameter name="x_clip_type">
+            <type name="TextClipType" c:type="AtkTextClipType"/>
+          </parameter>
+          <parameter name="y_clip_type">
+            <type name="TextClipType" c:type="AtkTextClipType"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <field name="pad4">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <glib:signal name="text-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <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="text-caret-moved">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="text-selection-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="text-attributes-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </interface>
+    <record name="TextIface" c:type="AtkTextIface">
+      <field name="parent">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="get_text" c:type="get_text">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="start_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="end_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_text_after_offset" c:type="get_text_after_offset">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="boundary_type">
+            <type name="TextBoundary" c:type="AtkTextBoundary"/>
+          </parameter>
+          <parameter name="start_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="end_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_text_at_offset" c:type="get_text_at_offset">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="boundary_type">
+            <type name="TextBoundary" c:type="AtkTextBoundary"/>
+          </parameter>
+          <parameter name="start_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="end_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_character_at_offset"
+                c:type="get_character_at_offset">
+        <return-value>
+          <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="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_text_before_offset" c:type="get_text_before_offset">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="boundary_type">
+            <type name="TextBoundary" c:type="AtkTextBoundary"/>
+          </parameter>
+          <parameter name="start_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="end_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_caret_offset" c:type="get_caret_offset">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_run_attributes" c:type="get_run_attributes">
+        <return-value>
+          <type name="AttributeSet" c:type="AtkAttributeSet*"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="start_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="end_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_default_attributes" c:type="get_default_attributes">
+        <return-value>
+          <type name="AttributeSet" c:type="AtkAttributeSet*"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_character_extents" c:type="get_character_extents">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="int" c:type="gint"/>
+          </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="coords">
+            <type name="CoordType" c:type="AtkCoordType"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_character_count" c:type="get_character_count">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_offset_at_point" c:type="get_offset_at_point">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="coords">
+            <type name="CoordType" c:type="AtkCoordType"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_n_selections" c:type="get_n_selections">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_selection" c:type="get_selection">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="selection_num">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="start_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="end_offset">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="add_selection" c:type="add_selection">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="start_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="end_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="remove_selection" c:type="remove_selection">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="selection_num">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_selection" c:type="set_selection">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="selection_num">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="start_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="end_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_caret_offset" c:type="set_caret_offset">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="text_changed" c:type="text_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="length">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="text_caret_moved" c:type="text_caret_moved">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="location">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="text_selection_changed" c:type="text_selection_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="text_attributes_changed"
+                c:type="text_attributes_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_range_extents" c:type="get_range_extents">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="start_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="end_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="coord_type">
+            <type name="CoordType" c:type="AtkCoordType"/>
+          </parameter>
+          <parameter name="rect">
+            <type name="TextRectangle" c:type="AtkTextRectangle*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_bounded_ranges" c:type="get_bounded_ranges">
+        <return-value>
+          <type name="TextRange" c:type="AtkTextRange**"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="Text" c:type="AtkText*"/>
+          </parameter>
+          <parameter name="rect">
+            <type name="TextRectangle" c:type="AtkTextRectangle*"/>
+          </parameter>
+          <parameter name="coord_type">
+            <type name="CoordType" c:type="AtkCoordType"/>
+          </parameter>
+          <parameter name="x_clip_type">
+            <type name="TextClipType" c:type="AtkTextClipType"/>
+          </parameter>
+          <parameter name="y_clip_type">
+            <type name="TextClipType" c:type="AtkTextClipType"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <field name="pad4">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+    </record>
+    <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*"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="Text" c:type="AtkText*"/>
+        </parameter>
+        <parameter name="start_offset">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="end_offset">
+          <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.unichar" c:type="gunichar"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="Text" c:type="AtkText*"/>
+        </parameter>
+        <parameter name="offset">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_get_text_after_offset"
+              c:identifier="atk_text_get_text_after_offset">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="Text" c:type="AtkText*"/>
+        </parameter>
+        <parameter name="offset">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="boundary_type">
+          <type name="TextBoundary" c:type="AtkTextBoundary"/>
+        </parameter>
+        <parameter name="start_offset">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+        <parameter name="end_offset">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_get_text_at_offset"
+              c:identifier="atk_text_get_text_at_offset">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="Text" c:type="AtkText*"/>
+        </parameter>
+        <parameter name="offset">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="boundary_type">
+          <type name="TextBoundary" c:type="AtkTextBoundary"/>
+        </parameter>
+        <parameter name="start_offset">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+        <parameter name="end_offset">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_get_text_before_offset"
+              c:identifier="atk_text_get_text_before_offset">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="Text" c:type="AtkText*"/>
+        </parameter>
+        <parameter name="offset">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="boundary_type">
+          <type name="TextBoundary" c:type="AtkTextBoundary"/>
+        </parameter>
+        <parameter name="start_offset">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+        <parameter name="end_offset">
+          <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="int" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="Text" c:type="AtkText*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_get_character_extents"
+              c:identifier="atk_text_get_character_extents">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="Text" c:type="AtkText*"/>
+        </parameter>
+        <parameter name="offset">
+          <type name="int" c:type="gint"/>
+        </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="coords">
+          <type name="CoordType" c:type="AtkCoordType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_get_run_attributes"
+              c:identifier="atk_text_get_run_attributes">
+      <return-value>
+        <type name="AttributeSet" c:type="AtkAttributeSet*"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="Text" c:type="AtkText*"/>
+        </parameter>
+        <parameter name="offset">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="start_offset">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+        <parameter name="end_offset">
+          <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="AttributeSet" c:type="AtkAttributeSet*"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="Text" c:type="AtkText*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_get_character_count"
+              c:identifier="atk_text_get_character_count">
+      <return-value>
+        <type name="int" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="Text" c:type="AtkText*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_get_offset_at_point"
+              c:identifier="atk_text_get_offset_at_point">
+      <return-value>
+        <type name="int" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="Text" c:type="AtkText*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="coords">
+          <type name="CoordType" c:type="AtkCoordType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_get_n_selections"
+              c:identifier="atk_text_get_n_selections">
+      <return-value>
+        <type name="int" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="Text" c:type="AtkText*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_get_selection" c:identifier="atk_text_get_selection">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="Text" c:type="AtkText*"/>
+        </parameter>
+        <parameter name="selection_num">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="start_offset">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+        <parameter name="end_offset">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_add_selection" c:identifier="atk_text_add_selection">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="Text" c:type="AtkText*"/>
+        </parameter>
+        <parameter name="start_offset">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="end_offset">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_remove_selection"
+              c:identifier="atk_text_remove_selection">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="Text" c:type="AtkText*"/>
+        </parameter>
+        <parameter name="selection_num">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_set_selection" c:identifier="atk_text_set_selection">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="Text" c:type="AtkText*"/>
+        </parameter>
+        <parameter name="selection_num">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="start_offset">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="end_offset">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_set_caret_offset"
+              c:identifier="atk_text_set_caret_offset">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="Text" c:type="AtkText*"/>
+        </parameter>
+        <parameter name="offset">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_get_range_extents"
+              c:identifier="atk_text_get_range_extents">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="Text" c:type="AtkText*"/>
+        </parameter>
+        <parameter name="start_offset">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="end_offset">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="coord_type">
+          <type name="CoordType" c:type="AtkCoordType"/>
+        </parameter>
+        <parameter name="rect">
+          <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="TextRange" c:type="AtkTextRange**"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="Text" c:type="AtkText*"/>
+        </parameter>
+        <parameter name="rect">
+          <type name="TextRectangle" c:type="AtkTextRectangle*"/>
+        </parameter>
+        <parameter name="coord_type">
+          <type name="CoordType" c:type="AtkCoordType"/>
+        </parameter>
+        <parameter name="x_clip_type">
+          <type name="TextClipType" c:type="AtkTextClipType"/>
+        </parameter>
+        <parameter name="y_clip_type">
+          <type name="TextClipType" c:type="AtkTextClipType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_free_ranges" c:identifier="atk_text_free_ranges">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="ranges">
+          <type name="TextRange" c:type="AtkTextRange**"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="attribute_set_free" c:identifier="atk_attribute_set_free">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="attrib_set">
+          <type name="AttributeSet" c:type="AtkAttributeSet*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_attribute_get_name"
+              c:identifier="atk_text_attribute_get_name">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="attr">
+          <type name="TextAttribute" c:type="AtkTextAttribute"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_attribute_for_name"
+              c:identifier="atk_text_attribute_for_name">
+      <return-value>
+        <type name="TextAttribute" c:type="AtkTextAttribute"/>
+      </return-value>
+      <parameters>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="text_attribute_get_value"
+              c:identifier="atk_text_attribute_get_value">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="attr">
+          <type name="TextAttribute" c:type="AtkTextAttribute"/>
+        </parameter>
+        <parameter name="index_">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <interface name="EditableText"
+               c:type="AtkEditableText"
+               glib:type-name="AtkEditableText"
+               glib:get-type="atk_editable_text_get_type">
+      <callback name="set_run_attributes" c:type="set_run_attributes">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="EditableText" c:type="AtkEditableText*"/>
+          </parameter>
+          <parameter name="attrib_set">
+            <type name="AttributeSet" c:type="AtkAttributeSet*"/>
+          </parameter>
+          <parameter name="start_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="end_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_text_contents" c:type="set_text_contents">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="EditableText" c:type="AtkEditableText*"/>
+          </parameter>
+          <parameter name="string">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="insert_text" c:type="insert_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="EditableText" c:type="AtkEditableText*"/>
+          </parameter>
+          <parameter name="string">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="copy_text" c:type="copy_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="EditableText" c:type="AtkEditableText*"/>
+          </parameter>
+          <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="cut_text" c:type="cut_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="EditableText" c:type="AtkEditableText*"/>
+          </parameter>
+          <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="delete_text" c:type="delete_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="EditableText" c:type="AtkEditableText*"/>
+          </parameter>
+          <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="paste_text" c:type="paste_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="EditableText" c:type="AtkEditableText*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad2">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+    </interface>
+    <record name="EditableTextIface" c:type="AtkEditableTextIface">
+      <field name="parent_interface">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="set_run_attributes" c:type="set_run_attributes">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="EditableText" c:type="AtkEditableText*"/>
+          </parameter>
+          <parameter name="attrib_set">
+            <type name="AttributeSet" c:type="AtkAttributeSet*"/>
+          </parameter>
+          <parameter name="start_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="end_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_text_contents" c:type="set_text_contents">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="EditableText" c:type="AtkEditableText*"/>
+          </parameter>
+          <parameter name="string">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="insert_text" c:type="insert_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="EditableText" c:type="AtkEditableText*"/>
+          </parameter>
+          <parameter name="string">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="copy_text" c:type="copy_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="EditableText" c:type="AtkEditableText*"/>
+          </parameter>
+          <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="cut_text" c:type="cut_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="EditableText" c:type="AtkEditableText*"/>
+          </parameter>
+          <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="delete_text" c:type="delete_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="EditableText" c:type="AtkEditableText*"/>
+          </parameter>
+          <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="paste_text" c:type="paste_text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text">
+            <type name="EditableText" c:type="AtkEditableText*"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad2">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+    </record>
+    <function name="editable_text_set_run_attributes"
+              c:identifier="atk_editable_text_set_run_attributes">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="EditableText" c:type="AtkEditableText*"/>
+        </parameter>
+        <parameter name="attrib_set">
+          <type name="AttributeSet" c:type="AtkAttributeSet*"/>
+        </parameter>
+        <parameter name="start_offset">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="end_offset">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_text_set_text_contents"
+              c:identifier="atk_editable_text_set_text_contents">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="EditableText" c:type="AtkEditableText*"/>
+        </parameter>
+        <parameter name="string">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_text_insert_text"
+              c:identifier="atk_editable_text_insert_text">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="EditableText" c:type="AtkEditableText*"/>
+        </parameter>
+        <parameter name="string">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+        <parameter name="length">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="position">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="editable_text_copy_text"
+              c:identifier="atk_editable_text_copy_text">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="EditableText" c:type="AtkEditableText*"/>
+        </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_text_cut_text"
+              c:identifier="atk_editable_text_cut_text">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="EditableText" c:type="AtkEditableText*"/>
+        </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_text_delete_text"
+              c:identifier="atk_editable_text_delete_text">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="EditableText" c:type="AtkEditableText*"/>
+        </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_text_paste_text"
+              c:identifier="atk_editable_text_paste_text">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="text">
+          <type name="EditableText" c:type="AtkEditableText*"/>
+        </parameter>
+        <parameter name="position">
+          <type name="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <bitfield name="HyperlinkStateFlags"
+              c:type="AtkHyperlinkStateFlags"
+              glib:type-name="AtkHyperlinkStateFlags"
+              glib:get-type="atk_hyperlink_state_flags_get_type">
+      <member name="inline"
+              value="1"
+              c:identifier="ATK_HYPERLINK_IS_INLINE"
+              glib:nick="inline"/>
+    </bitfield>
+    <class name="Hyperlink"
+           c:type="AtkHyperlink"
+           parent="GObject.Object"
+           glib:type-name="AtkHyperlink"
+           glib:get-type="atk_hyperlink_get_type">
+      <constructor name="impl_get_hyperlink"
+                   c:identifier="atk_hyperlink_impl_get_hyperlink">
+        <return-value>
+          <type name="Hyperlink" c:type="AtkHyperlink*"/>
+        </return-value>
+        <parameters>
+          <parameter name="obj">
+            <type name="HyperlinkImpl" c:type="AtkHyperlinkImpl*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="get_uri" c:identifier="atk_hyperlink_get_uri">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+          <parameter name="i">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_object" c:identifier="atk_hyperlink_get_object">
+        <return-value>
+          <type name="Object" c:type="AtkObject*"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+          <parameter name="i">
+            <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="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_start_index"
+              c:identifier="atk_hyperlink_get_start_index">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="is_valid" c:identifier="atk_hyperlink_is_valid">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="is_inline" c:identifier="atk_hyperlink_is_inline">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_n_anchors" c:identifier="atk_hyperlink_get_n_anchors">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="is_selected_link"
+              c:identifier="atk_hyperlink_is_selected_link">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="selected-link">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="number-of-anchors">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="end-index">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="start-index">
+        <type name="int" c:type="gint"/>
+      </property>
+      <callback name="get_uri" c:type="get_uri">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+          <parameter name="i">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_object" c:type="get_object">
+        <return-value>
+          <type name="Object" c:type="AtkObject*"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+          <parameter name="i">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_end_index" c:type="get_end_index">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_start_index" c:type="get_start_index">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="is_valid" c:type="is_valid">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_n_anchors" c:type="get_n_anchors">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="link_state" c:type="link_state">
+        <return-value>
+          <type name="uint" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="is_selected_link" c:type="is_selected_link">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="link_activated" c:type="link_activated">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <glib:signal name="link-activated">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <record name="HyperlinkClass" c:type="AtkHyperlinkClass">
+      <field name="parent">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="get_uri" c:type="get_uri">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+          <parameter name="i">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_object" c:type="get_object">
+        <return-value>
+          <type name="Object" c:type="AtkObject*"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+          <parameter name="i">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_end_index" c:type="get_end_index">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_start_index" c:type="get_start_index">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="is_valid" c:type="is_valid">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_n_anchors" c:type="get_n_anchors">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="link_state" c:type="link_state">
+        <return-value>
+          <type name="uint" c:type="guint"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="is_selected_link" c:type="is_selected_link">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="link_activated" c:type="link_activated">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="link_">
+            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+    </record>
+    <interface name="HyperlinkImpl"
+               c:type="AtkHyperlinkImpl"
+               glib:type-name="AtkHyperlinkImpl"
+               glib:get-type="atk_hyperlink_impl_get_type">
+      <callback name="get_hyperlink" c:type="get_hyperlink">
+        <return-value>
+          <type name="Hyperlink" c:type="AtkHyperlink*"/>
+        </return-value>
+        <parameters>
+          <parameter name="impl">
+            <type name="HyperlinkImpl" c:type="AtkHyperlinkImpl*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+    </interface>
+    <record name="HyperlinkImplIface" c:type="AtkHyperlinkImplIface">
+      <field name="parent">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="get_hyperlink" c:type="get_hyperlink">
+        <return-value>
+          <type name="Hyperlink" c:type="AtkHyperlink*"/>
+        </return-value>
+        <parameters>
+          <parameter name="impl">
+            <type name="HyperlinkImpl" c:type="AtkHyperlinkImpl*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+    </record>
+    <interface name="Hypertext"
+               c:type="AtkHypertext"
+               glib:type-name="AtkHypertext"
+               glib:get-type="atk_hypertext_get_type">
+      <callback name="get_link" c:type="get_link">
+        <return-value>
+          <type name="Hyperlink" c:type="AtkHyperlink*"/>
+        </return-value>
+        <parameters>
+          <parameter name="hypertext">
+            <type name="Hypertext" c:type="AtkHypertext*"/>
+          </parameter>
+          <parameter name="link_index">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_n_links" c:type="get_n_links">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="hypertext">
+            <type name="Hypertext" c:type="AtkHypertext*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_link_index" c:type="get_link_index">
+        <return-value>
+          <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="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="link_selected" c:type="link_selected">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="hypertext">
+            <type name="Hypertext" c:type="AtkHypertext*"/>
+          </parameter>
+          <parameter name="link_index">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad2">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad3">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <glib:signal name="link-selected">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </interface>
+    <record name="HypertextIface" c:type="AtkHypertextIface">
+      <field name="parent">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="get_link" c:type="get_link">
+        <return-value>
+          <type name="Hyperlink" c:type="AtkHyperlink*"/>
+        </return-value>
+        <parameters>
+          <parameter name="hypertext">
+            <type name="Hypertext" c:type="AtkHypertext*"/>
+          </parameter>
+          <parameter name="link_index">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_n_links" c:type="get_n_links">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="hypertext">
+            <type name="Hypertext" c:type="AtkHypertext*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_link_index" c:type="get_link_index">
+        <return-value>
+          <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="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="link_selected" c:type="link_selected">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="hypertext">
+            <type name="Hypertext" c:type="AtkHypertext*"/>
+          </parameter>
+          <parameter name="link_index">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad2">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad3">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+    </record>
+    <function name="hypertext_get_link" c:identifier="atk_hypertext_get_link">
+      <return-value>
+        <type name="Hyperlink" c:type="AtkHyperlink*"/>
+      </return-value>
+      <parameters>
+        <parameter name="hypertext">
+          <type name="Hypertext" c:type="AtkHypertext*"/>
+        </parameter>
+        <parameter name="link_index">
+          <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="int" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="hypertext">
+          <type name="Hypertext" c:type="AtkHypertext*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="hypertext_get_link_index"
+              c:identifier="atk_hypertext_get_link_index">
+      <return-value>
+        <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="int" c:type="gint"/>
+        </parameter>
+      </parameters>
+    </function>
+    <interface name="Image"
+               c:type="AtkImage"
+               glib:type-name="AtkImage"
+               glib:get-type="atk_image_get_type">
+      <callback name="get_image_position" c:type="get_image_position">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="AtkImage*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="y">
+            <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" c:type="get_image_description">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="AtkImage*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_image_size" c:type="get_image_size">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="AtkImage*"/>
+          </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="set_image_description" c:type="set_image_description">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="AtkImage*"/>
+          </parameter>
+          <parameter name="description">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_image_locale" c:type="get_image_locale">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="AtkImage*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+    </interface>
+    <record name="ImageIface" c:type="AtkImageIface">
+      <field name="parent">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="get_image_position" c:type="get_image_position">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="AtkImage*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="y">
+            <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" c:type="get_image_description">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="AtkImage*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_image_size" c:type="get_image_size">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="AtkImage*"/>
+          </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="set_image_description" c:type="set_image_description">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="AtkImage*"/>
+          </parameter>
+          <parameter name="description">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_image_locale" c:type="get_image_locale">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="image">
+            <type name="Image" c:type="AtkImage*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+    </record>
+    <function name="image_get_image_description"
+              c:identifier="atk_image_get_image_description">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="image">
+          <type name="Image" c:type="AtkImage*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="image_get_image_size"
+              c:identifier="atk_image_get_image_size">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="image">
+          <type name="Image" c:type="AtkImage*"/>
+        </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="image_set_image_description"
+              c:identifier="atk_image_set_image_description">
+      <return-value>
+        <type name="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="image">
+          <type name="Image" c:type="AtkImage*"/>
+        </parameter>
+        <parameter name="description">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="image_get_image_position"
+              c:identifier="atk_image_get_image_position">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="image">
+          <type name="Image" c:type="AtkImage*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+        <parameter name="y">
+          <type name="int" c:type="gint*"/>
+        </parameter>
+        <parameter name="coord_type">
+          <type name="CoordType" c:type="AtkCoordType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="image_get_image_locale"
+              c:identifier="atk_image_get_image_locale">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="image">
+          <type name="Image" c:type="AtkImage*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="NoOpObject"
+           c:type="AtkNoOpObject"
+           parent="Object"
+           glib:type-name="AtkNoOpObject"
+           glib:get-type="atk_no_op_object_get_type">
+    </class>
+    <record name="NoOpObjectClass" c:type="AtkNoOpObjectClass">
+      <field name="parent_class">
+        <type name="ObjectClass" c:type="AtkObjectClass"/>
+      </field>
+    </record>
+    <function name="no_op_object_new" c:identifier="atk_no_op_object_new">
+      <return-value>
+        <type name="Object" c:type="AtkObject*"/>
+      </return-value>
+      <parameters>
+        <parameter name="obj">
+          <type name="GObject.Object" c:type="GObject*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <class name="ObjectFactory"
+           c:type="AtkObjectFactory"
+           parent="GObject.Object"
+           glib:type-name="AtkObjectFactory"
+           glib:get-type="atk_object_factory_get_type">
+      <method name="invalidate" c:identifier="atk_object_factory_invalidate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="factory">
+            <type name="ObjectFactory" c:type="AtkObjectFactory*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_accessible_type"
+              c:identifier="atk_object_factory_get_accessible_type">
+        <return-value>
+          <type name="GObject.Type" c:type="GType"/>
+        </return-value>
+        <parameters>
+          <parameter name="factory">
+            <type name="ObjectFactory" c:type="AtkObjectFactory*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <callback name="create_accessible" c:type="create_accessible">
+        <return-value>
+          <type name="Object" c:type="AtkObject*"/>
+        </return-value>
+        <parameters>
+          <parameter name="obj">
+            <type name="GObject.Object" c:type="GObject*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="invalidate" c:type="invalidate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="factory">
+            <type name="ObjectFactory" c:type="AtkObjectFactory*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_accessible_type" c:type="get_accessible_type">
+        <return-value>
+          <type name="GObject.Type" c:type="GType"/>
+        </return-value>
+      </callback>
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad2">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+    </class>
+    <record name="ObjectFactoryClass" c:type="AtkObjectFactoryClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="create_accessible" c:type="create_accessible">
+        <return-value>
+          <type name="Object" c:type="AtkObject*"/>
+        </return-value>
+        <parameters>
+          <parameter name="obj">
+            <type name="GObject.Object" c:type="GObject*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="invalidate" c:type="invalidate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="factory">
+            <type name="ObjectFactory" c:type="AtkObjectFactory*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_accessible_type" c:type="get_accessible_type">
+        <return-value>
+          <type name="GObject.Type" c:type="GType"/>
+        </return-value>
+      </callback>
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad2">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+    </record>
+    <class name="NoOpObjectFactory"
+           c:type="AtkNoOpObjectFactory"
+           parent="ObjectFactory"
+           glib:type-name="AtkNoOpObjectFactory"
+           glib:get-type="atk_no_op_object_factory_get_type">
+    </class>
+    <record name="NoOpObjectFactoryClass" c:type="AtkNoOpObjectFactoryClass">
+      <field name="parent_class">
+        <type name="ObjectFactoryClass" c:type="AtkObjectFactoryClass"/>
+      </field>
+    </record>
+    <function name="no_op_object_factory_new"
+              c:identifier="atk_no_op_object_factory_new">
+      <return-value>
+        <type name="ObjectFactory" c:type="AtkObjectFactory*"/>
+      </return-value>
+    </function>
+    <class name="Registry"
+           c:type="AtkRegistry"
+           parent="GObject.Object"
+           glib:type-name="AtkRegistry"
+           glib:get-type="atk_registry_get_type">
+      <method name="set_factory_type"
+              c:identifier="atk_registry_set_factory_type">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="registry">
+            <type name="Registry" c:type="AtkRegistry*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="GObject.Type" c:type="GType"/>
+          </parameter>
+          <parameter name="factory_type">
+            <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.Type" c:type="GType"/>
+        </return-value>
+        <parameters>
+          <parameter name="registry">
+            <type name="Registry" c:type="AtkRegistry*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="GObject.Type" c:type="GType"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_factory" c:identifier="atk_registry_get_factory">
+        <return-value>
+          <type name="ObjectFactory" c:type="AtkObjectFactory*"/>
+        </return-value>
+        <parameters>
+          <parameter name="registry">
+            <type name="Registry" c:type="AtkRegistry*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="GObject.Type" c:type="GType"/>
+          </parameter>
+        </parameters>
+      </method>
+    </class>
+    <record name="RegistryClass" c:type="_AtkRegistryClass"/>
+    <function name="get_default_registry"
+              c:identifier="atk_get_default_registry">
+      <return-value>
+        <type name="Registry" c:type="AtkRegistry*"/>
+      </return-value>
+    </function>
+    <class name="Relation"
+           c:type="AtkRelation"
+           parent="GObject.Object"
+           glib:type-name="AtkRelation"
+           glib:get-type="atk_relation_get_type">
+      <constructor name="new" c:identifier="atk_relation_new">
+        <return-value>
+          <type name="Relation" c:type="AtkRelation*"/>
+        </return-value>
+        <parameters>
+          <parameter name="targets">
+            <type name="Object" c:type="AtkObject**"/>
+          </parameter>
+          <parameter name="n_targets">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="relationship">
+            <type name="RelationType" c:type="AtkRelationType"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="set_get_relation"
+                   c:identifier="atk_relation_set_get_relation">
+        <return-value>
+          <type name="Relation" c:type="AtkRelation*"/>
+        </return-value>
+        <parameters>
+          <parameter name="set">
+            <type name="RelationSet" c:type="AtkRelationSet*"/>
+          </parameter>
+          <parameter name="i">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="set_get_relation_by_type"
+                   c:identifier="atk_relation_set_get_relation_by_type">
+        <return-value>
+          <type name="Relation" c:type="AtkRelation*"/>
+        </return-value>
+        <parameters>
+          <parameter name="set">
+            <type name="RelationSet" c:type="AtkRelationSet*"/>
+          </parameter>
+          <parameter name="relationship">
+            <type name="RelationType" c:type="AtkRelationType"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="get_relation_type"
+              c:identifier="atk_relation_get_relation_type">
+        <return-value>
+          <type name="RelationType" c:type="AtkRelationType"/>
+        </return-value>
+        <parameters>
+          <parameter name="relation">
+            <type name="Relation" c:type="AtkRelation*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_target" c:identifier="atk_relation_get_target">
+        <return-value>
+          <type name="GLib.PtrArray" c:type="GPtrArray*"/>
+        </return-value>
+        <parameters>
+          <parameter name="relation">
+            <type name="Relation" c:type="AtkRelation*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_target" c:identifier="atk_relation_add_target">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="relation">
+            <type name="Relation" c:type="AtkRelation*"/>
+          </parameter>
+          <parameter name="target">
+            <type name="Object" c:type="AtkObject*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <property name="relation-type">
+        <type name="RelationType" c:type="AtkRelationType"/>
+      </property>
+      <property name="target">
+        <type name="GObject.ValueArray" c:type="GValueArray"/>
+      </property>
+    </class>
+    <record name="RelationClass" c:type="AtkRelationClass">
+      <field name="parent">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+    </record>
+    <function name="relation_type_register"
+              c:identifier="atk_relation_type_register">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="RelationType" c:type="AtkRelationType"/>
       </return-value>
       <parameters>
-        <parameter name="attrib_set">
-          <type name="AttributeSet" c:type="AtkAttributeSet*"/>
+        <parameter name="name">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_attribute_get_name"
-              c:identifier="atk_text_attribute_get_name">
+    <function name="relation_type_get_name"
+              c:identifier="atk_relation_type_get_name">
       <return-value>
         <type name="string" c:type="gchar*"/>
       </return-value>
       <parameters>
-        <parameter name="attr">
-          <type name="TextAttribute" c:type="AtkTextAttribute"/>
+        <parameter name="type">
+          <type name="RelationType" c:type="AtkRelationType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="text_attribute_for_name"
-              c:identifier="atk_text_attribute_for_name">
+    <function name="relation_type_for_name"
+              c:identifier="atk_relation_type_for_name">
       <return-value>
-        <type name="TextAttribute" c:type="AtkTextAttribute"/>
+        <type name="RelationType" c:type="AtkRelationType"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -3857,133 +6516,218 @@
         </parameter>
       </parameters>
     </function>
-    <function name="text_attribute_get_value"
-              c:identifier="atk_text_attribute_get_value">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="attr">
-          <type name="TextAttribute" c:type="AtkTextAttribute"/>
-        </parameter>
-        <parameter name="index_">
-          <type name="int" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <interface name="EditableText"
-               c:type="AtkEditableText"
-               glib:type-name="AtkEditableText"
-               glib:get-type="atk_editable_text_get_type">
-      <callback name="set_run_attributes" c:type="set_run_attributes">
+    <record name="RelationSetClass" c:type="AtkRelationSetClass">
+      <field name="parent">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad2">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+    </record>
+    <interface name="Selection"
+               c:type="AtkSelection"
+               glib:type-name="AtkSelection"
+               glib:get-type="atk_selection_get_type">
+      <callback name="add_selection" c:type="add_selection">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="EditableText" c:type="AtkEditableText*"/>
-          </parameter>
-          <parameter name="attrib_set">
-            <type name="AttributeSet" c:type="AtkAttributeSet*"/>
+          <parameter name="selection">
+            <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
-          <parameter name="start_offset">
+          <parameter name="i">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="end_offset">
-            <type name="int" c:type="gint"/>
+        </parameters>
+      </callback>
+      <callback name="clear_selection" c:type="clear_selection">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_text_contents" c:type="set_text_contents">
+      <callback name="ref_selection" c:type="ref_selection">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="EditableText" c:type="AtkEditableText*"/>
+          <parameter name="selection">
+            <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
-          <parameter name="string">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="i">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="insert_text" c:type="insert_text">
+      <callback name="get_selection_count" c:type="get_selection_count">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="EditableText" c:type="AtkEditableText*"/>
+          <parameter name="selection">
+            <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
-          <parameter name="string">
-            <type name="string" c:type="gchar*"/>
+        </parameters>
+      </callback>
+      <callback name="is_child_selected" c:type="is_child_selected">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
-          <parameter name="length">
+          <parameter name="i">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="position">
-            <type name="int" c:type="gint*"/>
+        </parameters>
+      </callback>
+      <callback name="remove_selection" c:type="remove_selection">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="Selection" c:type="AtkSelection*"/>
+          </parameter>
+          <parameter name="i">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="copy_text" c:type="copy_text">
+      <callback name="select_all_selection" c:type="select_all_selection">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="Selection" c:type="AtkSelection*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="selection_changed" c:type="selection_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="EditableText" c:type="AtkEditableText*"/>
+          <parameter name="selection">
+            <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
-          <parameter name="start_pos">
-            <type name="int" c:type="gint"/>
+        </parameters>
+      </callback>
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad2">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <glib:signal name="selection-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </interface>
+    <record name="SelectionIface" c:type="AtkSelectionIface">
+      <field name="parent">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="add_selection" c:type="add_selection">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
-          <parameter name="end_pos">
+          <parameter name="i">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="cut_text" c:type="cut_text">
+      <callback name="clear_selection" c:type="clear_selection">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="EditableText" c:type="AtkEditableText*"/>
+          <parameter name="selection">
+            <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
-          <parameter name="start_pos">
+        </parameters>
+      </callback>
+      <callback name="ref_selection" c:type="ref_selection">
+        <return-value>
+          <type name="Object" c:type="AtkObject*"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="Selection" c:type="AtkSelection*"/>
+          </parameter>
+          <parameter name="i">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="end_pos">
+        </parameters>
+      </callback>
+      <callback name="get_selection_count" c:type="get_selection_count">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="Selection" c:type="AtkSelection*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="is_child_selected" c:type="is_child_selected">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="Selection" c:type="AtkSelection*"/>
+          </parameter>
+          <parameter name="i">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="delete_text" c:type="delete_text">
+      <callback name="remove_selection" c:type="remove_selection">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="EditableText" c:type="AtkEditableText*"/>
+          <parameter name="selection">
+            <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
-          <parameter name="start_pos">
+          <parameter name="i">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="end_pos">
-            <type name="int" c:type="gint"/>
+        </parameters>
+      </callback>
+      <callback name="select_all_selection" c:type="select_all_selection">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="selection">
+            <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="paste_text" c:type="paste_text">
+      <callback name="selection_changed" c:type="selection_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="text">
-            <type name="EditableText" c:type="AtkEditableText*"/>
-          </parameter>
-          <parameter name="position">
-            <type name="int" c:type="gint"/>
+          <parameter name="selection">
+            <type name="Selection" c:type="AtkSelection*"/>
           </parameter>
         </parameters>
       </callback>
@@ -3993,992 +6737,768 @@
       <field name="pad2">
         <type name="Function" c:type="AtkFunction"/>
       </field>
-    </interface>
-    <function name="editable_text_set_run_attributes"
-              c:identifier="atk_editable_text_set_run_attributes">
+    </record>
+    <function name="selection_add_selection"
+              c:identifier="atk_selection_add_selection">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="text">
-          <type name="EditableText" c:type="AtkEditableText*"/>
-        </parameter>
-        <parameter name="attrib_set">
-          <type name="AttributeSet" c:type="AtkAttributeSet*"/>
-        </parameter>
-        <parameter name="start_offset">
-          <type name="int" c:type="gint"/>
+        <parameter name="selection">
+          <type name="Selection" c:type="AtkSelection*"/>
         </parameter>
-        <parameter name="end_offset">
+        <parameter name="i">
           <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="editable_text_set_text_contents"
-              c:identifier="atk_editable_text_set_text_contents">
+    <function name="selection_clear_selection"
+              c:identifier="atk_selection_clear_selection">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="text">
-          <type name="EditableText" c:type="AtkEditableText*"/>
-        </parameter>
-        <parameter name="string">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="selection">
+          <type name="Selection" c:type="AtkSelection*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="editable_text_insert_text"
-              c:identifier="atk_editable_text_insert_text">
+    <function name="selection_ref_selection"
+              c:identifier="atk_selection_ref_selection">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Object" c:type="AtkObject*"/>
       </return-value>
       <parameters>
-        <parameter name="text">
-          <type name="EditableText" c:type="AtkEditableText*"/>
-        </parameter>
-        <parameter name="string">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="selection">
+          <type name="Selection" c:type="AtkSelection*"/>
         </parameter>
-        <parameter name="length">
+        <parameter name="i">
           <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="position">
-          <type name="int" c:type="gint*"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="editable_text_copy_text"
-              c:identifier="atk_editable_text_copy_text">
+    <function name="selection_get_selection_count"
+              c:identifier="atk_selection_get_selection_count">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="int" c:type="gint"/>
       </return-value>
       <parameters>
-        <parameter name="text">
-          <type name="EditableText" c:type="AtkEditableText*"/>
-        </parameter>
-        <parameter name="start_pos">
-          <type name="int" c:type="gint"/>
-        </parameter>
-        <parameter name="end_pos">
-          <type name="int" c:type="gint"/>
+        <parameter name="selection">
+          <type name="Selection" c:type="AtkSelection*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="editable_text_cut_text"
-              c:identifier="atk_editable_text_cut_text">
+    <function name="selection_is_child_selected"
+              c:identifier="atk_selection_is_child_selected">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="text">
-          <type name="EditableText" c:type="AtkEditableText*"/>
-        </parameter>
-        <parameter name="start_pos">
-          <type name="int" c:type="gint"/>
+        <parameter name="selection">
+          <type name="Selection" c:type="AtkSelection*"/>
         </parameter>
-        <parameter name="end_pos">
+        <parameter name="i">
           <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="editable_text_delete_text"
-              c:identifier="atk_editable_text_delete_text">
+    <function name="selection_remove_selection"
+              c:identifier="atk_selection_remove_selection">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="text">
-          <type name="EditableText" c:type="AtkEditableText*"/>
-        </parameter>
-        <parameter name="start_pos">
-          <type name="int" c:type="gint"/>
+        <parameter name="selection">
+          <type name="Selection" c:type="AtkSelection*"/>
         </parameter>
-        <parameter name="end_pos">
+        <parameter name="i">
           <type name="int" c:type="gint"/>
         </parameter>
       </parameters>
     </function>
-    <function name="editable_text_paste_text"
-              c:identifier="atk_editable_text_paste_text">
+    <function name="selection_select_all_selection"
+              c:identifier="atk_selection_select_all_selection">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
-        <parameter name="text">
-          <type name="EditableText" c:type="AtkEditableText*"/>
-        </parameter>
-        <parameter name="position">
-          <type name="int" c:type="gint"/>
+        <parameter name="selection">
+          <type name="Selection" c:type="AtkSelection*"/>
         </parameter>
       </parameters>
     </function>
-    <bitfield name="HyperlinkStateFlags"
-              c:type="AtkHyperlinkStateFlags"
-              glib:type-name="AtkHyperlinkStateFlags"
-              glib:get-type="atk_hyperlink_state_flags_get_type">
-      <member name="inline"
-              value="1"
-              c:identifier="ATK_HYPERLINK_IS_INLINE"
-              glib:nick="inline"/>
-    </bitfield>
-    <class name="Hyperlink"
-           c:type="AtkHyperlink"
-           parent="GObject.Object"
-           glib:type-name="AtkHyperlink"
-           glib:get-type="atk_hyperlink_get_type">
-      <constructor name="impl_get_hyperlink"
-                   c:identifier="atk_hyperlink_impl_get_hyperlink">
-        <return-value>
-          <type name="Hyperlink" c:type="AtkHyperlink*"/>
-        </return-value>
-        <parameters>
-          <parameter name="obj">
-            <type name="HyperlinkImpl" c:type="AtkHyperlinkImpl*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="get_uri" c:identifier="atk_hyperlink_get_uri">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
-          </parameter>
-          <parameter name="i">
-            <type name="int" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_object" c:identifier="atk_hyperlink_get_object">
-        <return-value>
-          <type name="Object" c:type="AtkObject*"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
-          </parameter>
-          <parameter name="i">
-            <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="int" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_start_index"
-              c:identifier="atk_hyperlink_get_start_index">
-        <return-value>
-          <type name="int" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="is_valid" c:identifier="atk_hyperlink_is_valid">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="is_inline" c:identifier="atk_hyperlink_is_inline">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_n_anchors" c:identifier="atk_hyperlink_get_n_anchors">
+    <record name="StateSetClass" c:type="AtkStateSetClass">
+      <field name="parent">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+    </record>
+    <interface name="StreamableContent"
+               c:type="AtkStreamableContent"
+               glib:type-name="AtkStreamableContent"
+               glib:get-type="atk_streamable_content_get_type">
+      <callback name="get_n_mime_types" c:type="get_n_mime_types">
         <return-value>
           <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="is_selected_link"
-              c:identifier="atk_hyperlink_is_selected_link">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          <parameter name="streamable">
+            <type name="StreamableContent" c:type="AtkStreamableContent*"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="selected-link">
-        <type name="boolean" c:type="gboolean"/>
-      </property>
-      <property name="number-of-anchors">
-        <type name="int" c:type="gint"/>
-      </property>
-      <property name="end-index">
-        <type name="int" c:type="gint"/>
-      </property>
-      <property name="start-index">
-        <type name="int" c:type="gint"/>
-      </property>
-      <callback name="get_uri" c:type="get_uri">
+      </callback>
+      <callback name="get_mime_type" c:type="get_mime_type">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          <parameter name="streamable">
+            <type name="StreamableContent" c:type="AtkStreamableContent*"/>
           </parameter>
           <parameter name="i">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_object" c:type="get_object">
+      <callback name="get_stream" c:type="get_stream">
         <return-value>
-          <type name="Object" c:type="AtkObject*"/>
+          <type name="GObject.IOChannel" c:type="GIOChannel*"/>
         </return-value>
         <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          <parameter name="streamable">
+            <type name="StreamableContent" c:type="AtkStreamableContent*"/>
           </parameter>
-          <parameter name="i">
-            <type name="int" c:type="gint"/>
+          <parameter name="mime_type">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_end_index" c:type="get_end_index">
+      <callback name="get_uri" c:type="get_uri">
         <return-value>
-          <type name="int" c:type="gint"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          <parameter name="streamable">
+            <type name="StreamableContent" c:type="AtkStreamableContent*"/>
+          </parameter>
+          <parameter name="mime_type">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_start_index" c:type="get_start_index">
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad2">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad3">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+    </interface>
+    <record name="StreamableContentIface" c:type="AtkStreamableContentIface">
+      <field name="parent">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="get_n_mime_types" c:type="get_n_mime_types">
         <return-value>
           <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          <parameter name="streamable">
+            <type name="StreamableContent" c:type="AtkStreamableContent*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="is_valid" c:type="is_valid">
+      <callback name="get_mime_type" c:type="get_mime_type">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          <parameter name="streamable">
+            <type name="StreamableContent" c:type="AtkStreamableContent*"/>
+          </parameter>
+          <parameter name="i">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_n_anchors" c:type="get_n_anchors">
+      <callback name="get_stream" c:type="get_stream">
         <return-value>
-          <type name="int" c:type="gint"/>
+          <type name="GObject.IOChannel" c:type="GIOChannel*"/>
         </return-value>
         <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          <parameter name="streamable">
+            <type name="StreamableContent" c:type="AtkStreamableContent*"/>
+          </parameter>
+          <parameter name="mime_type">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="link_state" c:type="link_state">
+      <callback name="get_uri" c:type="get_uri">
         <return-value>
-          <type name="uint" c:type="guint"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          <parameter name="streamable">
+            <type name="StreamableContent" c:type="AtkStreamableContent*"/>
+          </parameter>
+          <parameter name="mime_type">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="is_selected_link" c:type="is_selected_link">
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad2">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad3">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+    </record>
+    <function name="streamable_content_get_n_mime_types"
+              c:identifier="atk_streamable_content_get_n_mime_types">
+      <return-value>
+        <type name="int" c:type="gint"/>
+      </return-value>
+      <parameters>
+        <parameter name="streamable">
+          <type name="StreamableContent" c:type="AtkStreamableContent*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="streamable_content_get_mime_type"
+              c:identifier="atk_streamable_content_get_mime_type">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="streamable">
+          <type name="StreamableContent" c:type="AtkStreamableContent*"/>
+        </parameter>
+        <parameter name="i">
+          <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="GObject.IOChannel" c:type="GIOChannel*"/>
+      </return-value>
+      <parameters>
+        <parameter name="streamable">
+          <type name="StreamableContent" c:type="AtkStreamableContent*"/>
+        </parameter>
+        <parameter name="mime_type">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="streamable_content_get_uri"
+              c:identifier="atk_streamable_content_get_uri">
+      <return-value>
+        <type name="string" c:type="gchar*"/>
+      </return-value>
+      <parameters>
+        <parameter name="streamable">
+          <type name="StreamableContent" c:type="AtkStreamableContent*"/>
+        </parameter>
+        <parameter name="mime_type">
+          <type name="string" c:type="gchar*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <interface name="Table"
+               c:type="AtkTable"
+               glib:type-name="AtkTable"
+               glib:get-type="atk_table_get_type">
+      <callback name="ref_at" c:type="ref_at">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="link_activated" c:type="link_activated">
+      <callback name="get_index_at" c:type="get_index_at">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="link_">
-            <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <field name="pad1">
-        <type name="Function" c:type="AtkFunction"/>
-      </field>
-      <glib:signal name="link-activated">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
-    <interface name="HyperlinkImpl"
-               c:type="AtkHyperlinkImpl"
-               glib:type-name="AtkHyperlinkImpl"
-               glib:get-type="atk_hyperlink_impl_get_type">
-      <callback name="get_hyperlink" c:type="get_hyperlink">
+      <callback name="get_column_at_index" c:type="get_column_at_index">
         <return-value>
-          <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="impl">
-            <type name="HyperlinkImpl" c:type="AtkHyperlinkImpl*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
+          </parameter>
+          <parameter name="index_">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <field name="pad1">
-        <type name="Function" c:type="AtkFunction"/>
-      </field>
-    </interface>
-    <interface name="Hypertext"
-               c:type="AtkHypertext"
-               glib:type-name="AtkHypertext"
-               glib:get-type="atk_hypertext_get_type">
-      <callback name="get_link" c:type="get_link">
+      <callback name="get_row_at_index" c:type="get_row_at_index">
         <return-value>
-          <type name="Hyperlink" c:type="AtkHyperlink*"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="hypertext">
-            <type name="Hypertext" c:type="AtkHypertext*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
-          <parameter name="link_index">
+          <parameter name="index_">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_n_links" c:type="get_n_links">
+      <callback name="get_n_columns" c:type="get_n_columns">
         <return-value>
           <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="hypertext">
-            <type name="Hypertext" c:type="AtkHypertext*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_link_index" c:type="get_link_index">
+      <callback name="get_n_rows" c:type="get_n_rows">
         <return-value>
           <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="int" c:type="gint"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="link_selected" c:type="link_selected">
+      <callback name="get_column_extent_at" c:type="get_column_extent_at">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="hypertext">
-            <type name="Hypertext" c:type="AtkHypertext*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="link_index">
+          <parameter name="column">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <field name="pad1">
-        <type name="Function" c:type="AtkFunction"/>
-      </field>
-      <field name="pad2">
-        <type name="Function" c:type="AtkFunction"/>
-      </field>
-      <field name="pad3">
-        <type name="Function" c:type="AtkFunction"/>
-      </field>
-      <glib:signal name="link-selected">
+      <callback name="get_row_extent_at" c:type="get_row_extent_at">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="object">
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="column">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </interface>
-    <function name="hypertext_get_link" c:identifier="atk_hypertext_get_link">
-      <return-value>
-        <type name="Hyperlink" c:type="AtkHyperlink*"/>
-      </return-value>
-      <parameters>
-        <parameter name="hypertext">
-          <type name="Hypertext" c:type="AtkHypertext*"/>
-        </parameter>
-        <parameter name="link_index">
-          <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="int" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="hypertext">
-          <type name="Hypertext" c:type="AtkHypertext*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="hypertext_get_link_index"
-              c:identifier="atk_hypertext_get_link_index">
-      <return-value>
-        <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="int" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <interface name="Image"
-               c:type="AtkImage"
-               glib:type-name="AtkImage"
-               glib:get-type="atk_image_get_type">
-      <callback name="get_image_position" c:type="get_image_position">
+      </callback>
+      <callback name="get_caption" c:type="get_caption">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="AtkImage*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="int" c:type="gint*"/>
-          </parameter>
-          <parameter name="y">
-            <type name="int" c:type="gint*"/>
-          </parameter>
-          <parameter name="coord_type">
-            <type name="CoordType" c:type="AtkCoordType"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_image_description" c:type="get_image_description">
+      <callback name="get_column_description" c:type="get_column_description">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="AtkImage*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_image_size" c:type="get_image_size">
+      <callback name="get_column_header" c:type="get_column_header">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="AtkImage*"/>
-          </parameter>
-          <parameter name="width">
-            <type name="int" c:type="gint*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
-          <parameter name="height">
-            <type name="int" c:type="gint*"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="set_image_description" c:type="set_image_description">
+      <callback name="get_row_description" c:type="get_row_description">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="AtkImage*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
-          <parameter name="description">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_image_locale" c:type="get_image_locale">
+      <callback name="get_row_header" c:type="get_row_header">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
-          <parameter name="image">
-            <type name="Image" c:type="AtkImage*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <field name="pad1">
-        <type name="Function" c:type="AtkFunction"/>
-      </field>
-    </interface>
-    <function name="image_get_image_description"
-              c:identifier="atk_image_get_image_description">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="image">
-          <type name="Image" c:type="AtkImage*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="image_get_image_size"
-              c:identifier="atk_image_get_image_size">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="image">
-          <type name="Image" c:type="AtkImage*"/>
-        </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="image_set_image_description"
-              c:identifier="atk_image_set_image_description">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="image">
-          <type name="Image" c:type="AtkImage*"/>
-        </parameter>
-        <parameter name="description">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="image_get_image_position"
-              c:identifier="atk_image_get_image_position">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="image">
-          <type name="Image" c:type="AtkImage*"/>
-        </parameter>
-        <parameter name="x">
-          <type name="int" c:type="gint*"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int" c:type="gint*"/>
-        </parameter>
-        <parameter name="coord_type">
-          <type name="CoordType" c:type="AtkCoordType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="image_get_image_locale"
-              c:identifier="atk_image_get_image_locale">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="image">
-          <type name="Image" c:type="AtkImage*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="NoOpObject"
-           c:type="AtkNoOpObject"
-           parent="Object"
-           glib:type-name="AtkNoOpObject"
-           glib:get-type="atk_no_op_object_get_type">
-    </class>
-    <function name="no_op_object_new" c:identifier="atk_no_op_object_new">
-      <return-value>
-        <type name="Object" c:type="AtkObject*"/>
-      </return-value>
-      <parameters>
-        <parameter name="obj">
-          <type name="GObject.Object" c:type="GObject*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <class name="ObjectFactory"
-           c:type="AtkObjectFactory"
-           parent="GObject.Object"
-           glib:type-name="AtkObjectFactory"
-           glib:get-type="atk_object_factory_get_type">
-      <method name="invalidate" c:identifier="atk_object_factory_invalidate">
+      <callback name="get_summary" c:type="get_summary">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
-          <parameter name="factory">
-            <type name="ObjectFactory" c:type="AtkObjectFactory*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_accessible_type"
-              c:identifier="atk_object_factory_get_accessible_type">
+      </callback>
+      <callback name="set_caption" c:type="set_caption">
         <return-value>
-          <type name="GObject.Type" c:type="GType"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="factory">
-            <type name="ObjectFactory" c:type="AtkObjectFactory*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
-        </parameters>
-      </method>
-      <callback name="create_accessible" c:type="create_accessible">
+          <parameter name="caption">
+            <type name="Object" c:type="AtkObject*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_column_description" c:type="set_column_description">
         <return-value>
-          <type name="Object" c:type="AtkObject*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="obj">
-            <type name="GObject.Object" c:type="GObject*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="description">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="invalidate" c:type="invalidate">
+      <callback name="set_column_header" c:type="set_column_header">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="factory">
-            <type name="ObjectFactory" c:type="AtkObjectFactory*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="header">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_accessible_type" c:type="get_accessible_type">
+      <callback name="set_row_description" c:type="set_row_description">
         <return-value>
-          <type name="GObject.Type" c:type="GType"/>
+          <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="description">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <field name="pad1">
-        <type name="Function" c:type="AtkFunction"/>
-      </field>
-      <field name="pad2">
-        <type name="Function" c:type="AtkFunction"/>
-      </field>
-    </class>
-    <class name="NoOpObjectFactory"
-           c:type="AtkNoOpObjectFactory"
-           parent="ObjectFactory"
-           glib:type-name="AtkNoOpObjectFactory"
-           glib:get-type="atk_no_op_object_factory_get_type">
-    </class>
-    <function name="no_op_object_factory_new"
-              c:identifier="atk_no_op_object_factory_new">
-      <return-value>
-        <type name="ObjectFactory" c:type="AtkObjectFactory*"/>
-      </return-value>
-    </function>
-    <class name="Registry"
-           c:type="AtkRegistry"
-           parent="GObject.Object"
-           glib:type-name="AtkRegistry"
-           glib:get-type="atk_registry_get_type">
-      <method name="set_factory_type"
-              c:identifier="atk_registry_set_factory_type">
+      <callback name="set_row_header" c:type="set_row_header">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="registry">
-            <type name="Registry" c:type="AtkRegistry*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
-          <parameter name="type">
-            <type name="GObject.Type" c:type="GType"/>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="factory_type">
-            <type name="GObject.Type" c:type="GType"/>
+          <parameter name="header">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_factory_type"
-              c:identifier="atk_registry_get_factory_type">
+      </callback>
+      <callback name="set_summary" c:type="set_summary">
         <return-value>
-          <type name="GObject.Type" c:type="GType"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="registry">
-            <type name="Registry" c:type="AtkRegistry*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
-          <parameter name="type">
-            <type name="GObject.Type" c:type="GType"/>
+          <parameter name="accessible">
+            <type name="Object" c:type="AtkObject*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_factory" c:identifier="atk_registry_get_factory">
+      </callback>
+      <callback name="get_selected_columns" c:type="get_selected_columns">
         <return-value>
-          <type name="ObjectFactory" c:type="AtkObjectFactory*"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="registry">
-            <type name="Registry" c:type="AtkRegistry*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
-          <parameter name="type">
-            <type name="GObject.Type" c:type="GType"/>
+          <parameter name="selected">
+            <type name="int" c:type="gint**"/>
           </parameter>
         </parameters>
-      </method>
-    </class>
-    <function name="get_default_registry"
-              c:identifier="atk_get_default_registry">
-      <return-value>
-        <type name="Registry" c:type="AtkRegistry*"/>
-      </return-value>
-    </function>
-    <class name="Relation"
-           c:type="AtkRelation"
-           parent="GObject.Object"
-           glib:type-name="AtkRelation"
-           glib:get-type="atk_relation_get_type">
-      <constructor name="new" c:identifier="atk_relation_new">
+      </callback>
+      <callback name="get_selected_rows" c:type="get_selected_rows">
         <return-value>
-          <type name="Relation" c:type="AtkRelation*"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="targets">
-            <type name="Object" c:type="AtkObject**"/>
-          </parameter>
-          <parameter name="n_targets">
-            <type name="int" c:type="gint"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
-          <parameter name="relationship">
-            <type name="RelationType" c:type="AtkRelationType"/>
+          <parameter name="selected">
+            <type name="int" c:type="gint**"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="set_get_relation"
-                   c:identifier="atk_relation_set_get_relation">
+      </callback>
+      <callback name="is_column_selected" c:type="is_column_selected">
         <return-value>
-          <type name="Relation" c:type="AtkRelation*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="set">
-            <type name="RelationSet" c:type="AtkRelationSet*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
-          <parameter name="i">
+          <parameter name="column">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </constructor>
-      <constructor name="set_get_relation_by_type"
-                   c:identifier="atk_relation_set_get_relation_by_type">
+      </callback>
+      <callback name="is_row_selected" c:type="is_row_selected">
         <return-value>
-          <type name="Relation" c:type="AtkRelation*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="set">
-            <type name="RelationSet" c:type="AtkRelationSet*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
-          <parameter name="relationship">
-            <type name="RelationType" c:type="AtkRelationType"/>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="get_relation_type"
-              c:identifier="atk_relation_get_relation_type">
+      </callback>
+      <callback name="is_selected" c:type="is_selected">
         <return-value>
-          <type name="RelationType" c:type="AtkRelationType"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="relation">
-            <type name="Relation" c:type="AtkRelation*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
+          </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="get_target" c:identifier="atk_relation_get_target">
+      </callback>
+      <callback name="add_row_selection" c:type="add_row_selection">
         <return-value>
-          <type name="GLib.PtrArray" c:type="GPtrArray*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="relation">
-            <type name="Relation" c:type="AtkRelation*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="add_target" c:identifier="atk_relation_add_target">
+      </callback>
+      <callback name="remove_row_selection" c:type="remove_row_selection">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="relation">
-            <type name="Relation" c:type="AtkRelation*"/>
-          </parameter>
-          <parameter name="target">
-            <type name="Object" c:type="AtkObject*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <property name="relation-type">
-        <type name="RelationType" c:type="AtkRelationType"/>
-      </property>
-      <property name="target">
-        <type name="GObject.ValueArray" c:type="GValueArray"/>
-      </property>
-    </class>
-    <function name="relation_type_register"
-              c:identifier="atk_relation_type_register">
-      <return-value>
-        <type name="RelationType" c:type="AtkRelationType"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="relation_type_get_name"
-              c:identifier="atk_relation_type_get_name">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="type">
-          <type name="RelationType" c:type="AtkRelationType"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="relation_type_for_name"
-              c:identifier="atk_relation_type_for_name">
-      <return-value>
-        <type name="RelationType" c:type="AtkRelationType"/>
-      </return-value>
-      <parameters>
-        <parameter name="name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <interface name="Selection"
-               c:type="AtkSelection"
-               glib:type-name="AtkSelection"
-               glib:get-type="atk_selection_get_type">
-      <callback name="add_selection" c:type="add_selection">
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="add_column_selection" c:type="add_column_selection">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="Selection" c:type="AtkSelection*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
-          <parameter name="i">
+          <parameter name="column">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="clear_selection" c:type="clear_selection">
+      <callback name="remove_column_selection"
+                c:type="remove_column_selection">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="Selection" c:type="AtkSelection*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="ref_selection" c:type="ref_selection">
+      <callback name="row_inserted" c:type="row_inserted">
         <return-value>
-          <type name="Object" c:type="AtkObject*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="Selection" c:type="AtkSelection*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
-          <parameter name="i">
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="num_inserted">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="get_selection_count" c:type="get_selection_count">
+      <callback name="column_inserted" c:type="column_inserted">
         <return-value>
-          <type name="int" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="Selection" c:type="AtkSelection*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="num_inserted">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="is_child_selected" c:type="is_child_selected">
+      <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="selection">
-            <type name="Selection" c:type="AtkSelection*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
-          <parameter name="i">
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="num_deleted">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="remove_selection" c:type="remove_selection">
+      <callback name="column_deleted" c:type="column_deleted">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="Selection" c:type="AtkSelection*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
-          <parameter name="i">
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="num_deleted">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="select_all_selection" c:type="select_all_selection">
+      <callback name="row_reordered" c:type="row_reordered">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="Selection" c:type="AtkSelection*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="selection_changed" c:type="selection_changed">
+      <callback name="column_reordered" c:type="column_reordered">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="selection">
-            <type name="Selection" c:type="AtkSelection*"/>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="model_changed" c:type="model_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="table">
+            <type name="Table" c:type="AtkTable*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4988,221 +7508,84 @@
       <field name="pad2">
         <type name="Function" c:type="AtkFunction"/>
       </field>
-      <glib:signal name="selection-changed">
+      <field name="pad3">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad4">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <glib:signal name="row-inserted">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-    </interface>
-    <function name="selection_add_selection"
-              c:identifier="atk_selection_add_selection">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection">
-          <type name="Selection" c:type="AtkSelection*"/>
-        </parameter>
-        <parameter name="i">
-          <type name="int" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_clear_selection"
-              c:identifier="atk_selection_clear_selection">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection">
-          <type name="Selection" c:type="AtkSelection*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_ref_selection"
-              c:identifier="atk_selection_ref_selection">
-      <return-value>
-        <type name="Object" c:type="AtkObject*"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection">
-          <type name="Selection" c:type="AtkSelection*"/>
-        </parameter>
-        <parameter name="i">
-          <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="int" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection">
-          <type name="Selection" c:type="AtkSelection*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_is_child_selected"
-              c:identifier="atk_selection_is_child_selected">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection">
-          <type name="Selection" c:type="AtkSelection*"/>
-        </parameter>
-        <parameter name="i">
-          <type name="int" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_remove_selection"
-              c:identifier="atk_selection_remove_selection">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection">
-          <type name="Selection" c:type="AtkSelection*"/>
-        </parameter>
-        <parameter name="i">
-          <type name="int" c:type="gint"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="selection_select_all_selection"
-              c:identifier="atk_selection_select_all_selection">
-      <return-value>
-        <type name="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="selection">
-          <type name="Selection" c:type="AtkSelection*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <interface name="StreamableContent"
-               c:type="AtkStreamableContent"
-               glib:type-name="AtkStreamableContent"
-               glib:get-type="atk_streamable_content_get_type">
-      <callback name="get_n_mime_types" c:type="get_n_mime_types">
-        <return-value>
-          <type name="int" c:type="gint"/>
-        </return-value>
         <parameters>
-          <parameter name="streamable">
-            <type name="StreamableContent" c:type="AtkStreamableContent*"/>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_mime_type" c:type="get_mime_type">
+      </glib:signal>
+      <glib:signal name="column-inserted">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="streamable">
-            <type name="StreamableContent" c:type="AtkStreamableContent*"/>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="i">
+          <parameter name="p0">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_stream" c:type="get_stream">
+      </glib:signal>
+      <glib:signal name="row-deleted">
         <return-value>
-          <type name="GObject.IOChannel" c:type="GIOChannel*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="streamable">
-            <type name="StreamableContent" c:type="AtkStreamableContent*"/>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="mime_type">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_uri" c:type="get_uri">
+      </glib:signal>
+      <glib:signal name="column-deleted">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="streamable">
-            <type name="StreamableContent" c:type="AtkStreamableContent*"/>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="mime_type">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <field name="pad1">
-        <type name="Function" c:type="AtkFunction"/>
-      </field>
-      <field name="pad2">
-        <type name="Function" c:type="AtkFunction"/>
-      </field>
-      <field name="pad3">
-        <type name="Function" c:type="AtkFunction"/>
-      </field>
+      </glib:signal>
+      <glib:signal name="row-reordered">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="column-reordered">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="model-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
     </interface>
-    <function name="streamable_content_get_n_mime_types"
-              c:identifier="atk_streamable_content_get_n_mime_types">
-      <return-value>
-        <type name="int" c:type="gint"/>
-      </return-value>
-      <parameters>
-        <parameter name="streamable">
-          <type name="StreamableContent" c:type="AtkStreamableContent*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="streamable_content_get_mime_type"
-              c:identifier="atk_streamable_content_get_mime_type">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="streamable">
-          <type name="StreamableContent" c:type="AtkStreamableContent*"/>
-        </parameter>
-        <parameter name="i">
-          <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="GObject.IOChannel" c:type="GIOChannel*"/>
-      </return-value>
-      <parameters>
-        <parameter name="streamable">
-          <type name="StreamableContent" c:type="AtkStreamableContent*"/>
-        </parameter>
-        <parameter name="mime_type">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="streamable_content_get_uri"
-              c:identifier="atk_streamable_content_get_uri">
-      <return-value>
-        <type name="string" c:type="gchar*"/>
-      </return-value>
-      <parameters>
-        <parameter name="streamable">
-          <type name="StreamableContent" c:type="AtkStreamableContent*"/>
-        </parameter>
-        <parameter name="mime_type">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-      </parameters>
-    </function>
-    <interface name="Table"
-               c:type="AtkTable"
-               glib:type-name="AtkTable"
-               glib:get-type="atk_table_get_type">
+    <record name="TableIface" c:type="AtkTableIface">
+      <field name="parent">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
       <callback name="ref_at" c:type="ref_at">
         <return-value>
           <type name="Object" c:type="AtkObject*"/>
@@ -5702,74 +8085,7 @@
       <field name="pad4">
         <type name="Function" c:type="AtkFunction"/>
       </field>
-      <glib:signal name="row-inserted">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <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="column-inserted">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <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="row-deleted">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <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="column-deleted">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <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="row-reordered">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="column-reordered">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="model-changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </interface>
+    </record>
     <function name="table_ref_at" c:identifier="atk_table_ref_at">
       <return-value>
         <type name="Object" c:type="AtkObject*"/>
@@ -6237,6 +8553,34 @@
         <type name="any" c:type="gpointer"/>
       </field>
     </class>
+    <record name="MiscClass" c:type="AtkMiscClass">
+      <field name="parent">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="threads_enter" c:type="threads_enter">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="misc">
+            <type name="Misc" c:type="AtkMisc*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="threads_leave" c:type="threads_leave">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="misc">
+            <type name="Misc" c:type="AtkMisc*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <field name="vfuncs">
+        <type name="any" c:type="gpointer"/>
+      </field>
+    </record>
     <interface name="Value"
                c:type="AtkValue"
                glib:type-name="AtkValue"
@@ -6310,6 +8654,79 @@
         <type name="Function" c:type="AtkFunction"/>
       </field>
     </interface>
+    <record name="ValueIface" c:type="AtkValueIface">
+      <field name="parent">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="get_current_value" c:type="get_current_value">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="obj">
+            <type name="Value" c:type="AtkValue*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="GObject.Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_maximum_value" c:type="get_maximum_value">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="obj">
+            <type name="Value" c:type="AtkValue*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="GObject.Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_minimum_value" c:type="get_minimum_value">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="obj">
+            <type name="Value" c:type="AtkValue*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="GObject.Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_current_value" c:type="set_current_value">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="obj">
+            <type name="Value" c:type="AtkValue*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="GObject.Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_minimum_increment" c:type="get_minimum_increment">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="obj">
+            <type name="Value" c:type="AtkValue*"/>
+          </parameter>
+          <parameter name="value">
+            <type name="GObject.Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+    </record>
     <function name="value_get_current_value"
               c:identifier="atk_value_get_current_value">
       <return-value>
@@ -6403,6 +8820,17 @@
         <type name="Function" c:type="AtkFunction"/>
       </field>
     </class>
+    <record name="GObjectAccessibleClass" c:type="AtkGObjectAccessibleClass">
+      <field name="parent_class">
+        <type name="ObjectClass" c:type="AtkObjectClass"/>
+      </field>
+      <field name="pad1">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+      <field name="pad2">
+        <type name="Function" c:type="AtkFunction"/>
+      </field>
+    </record>
     <function name="gobject_accessible_for_object"
               c:identifier="atk_gobject_accessible_for_object">
       <return-value>

Modified: trunk/gir/gdk-pixbuf-2.0.gir
==============================================================================
--- trunk/gir/gdk-pixbuf-2.0.gir	(original)
+++ trunk/gir/gdk-pixbuf-2.0.gir	Wed Aug 20 13:46:55 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="Pixbuf">
+  <namespace name="GdkPixbuf">
     <enumeration name="AlphaMode"
                  c:type="GdkPixbufAlphaMode"
                  glib:type-name="GdkPixbufAlphaMode"
@@ -16,7 +16,7 @@
               c:identifier="GDK_PIXBUF_ALPHA_FULL"
               glib:nick="full"/>
     </enumeration>
-    <enumeration name="GdkColorspace"
+    <enumeration name="Colorspace"
                  c:type="GdkColorspace"
                  glib:type-name="GdkColorspace"
                  glib:get-type="gdk_colorspace_get_type">
@@ -28,7 +28,7 @@
     <class name="Pixbuf"
            c:type="GdkPixbuf"
            parent="GObject.Object"
-           glib:type-name="Pixbuf"
+           glib:type-name="GdkPixbuf"
            glib:get-type="gdk_pixbuf_get_type">
       <constructor name="ref" c:identifier="gdk_pixbuf_ref">
         <return-value>
@@ -46,7 +46,7 @@
         </return-value>
         <parameters>
           <parameter name="colorspace">
-            <type name="GdkColorspace" c:type="GdkColorspace"/>
+            <type name="Colorspace" c:type="GdkColorspace"/>
           </parameter>
           <parameter name="has_alpha">
             <type name="boolean" c:type="gboolean"/>
@@ -162,7 +162,7 @@
             <type name="GLib.uchar" c:type="guchar*"/>
           </parameter>
           <parameter name="colorspace">
-            <type name="GdkColorspace" c:type="GdkColorspace"/>
+            <type name="Colorspace" c:type="GdkColorspace"/>
           </parameter>
           <parameter name="has_alpha">
             <type name="boolean" c:type="gboolean"/>
@@ -288,7 +288,7 @@
             <type name="int" c:type="int"/>
           </parameter>
           <parameter name="interp_type">
-            <type name="GdkInterpType" c:type="GdkInterpType"/>
+            <type name="InterpType" c:type="GdkInterpType"/>
           </parameter>
         </parameters>
       </constructor>
@@ -308,7 +308,7 @@
             <type name="int" c:type="int"/>
           </parameter>
           <parameter name="interp_type">
-            <type name="GdkInterpType" c:type="GdkInterpType"/>
+            <type name="InterpType" c:type="GdkInterpType"/>
           </parameter>
           <parameter name="overall_alpha">
             <type name="int" c:type="int"/>
@@ -368,7 +368,7 @@
         </return-value>
         <parameters>
           <parameter name="pixdata">
-            <type name="GdkPixdata" c:type="GdkPixdata*"/>
+            <type name="Pixdata" c:type="GdkPixdata*"/>
           </parameter>
           <parameter name="copy_pixels">
             <type name="boolean" c:type="gboolean"/>
@@ -390,7 +390,7 @@
       </method>
       <method name="get_colorspace" c:identifier="gdk_pixbuf_get_colorspace">
         <return-value>
-          <type name="GdkColorspace" c:type="GdkColorspace"/>
+          <type name="Colorspace" c:type="GdkColorspace"/>
         </return-value>
         <parameters>
           <parameter name="pixbuf">
@@ -728,7 +728,7 @@
             <type name="double" c:type="double"/>
           </parameter>
           <parameter name="interp_type">
-            <type name="GdkInterpType" c:type="GdkInterpType"/>
+            <type name="InterpType" c:type="GdkInterpType"/>
           </parameter>
         </parameters>
       </method>
@@ -768,7 +768,7 @@
             <type name="double" c:type="double"/>
           </parameter>
           <parameter name="interp_type">
-            <type name="GdkInterpType" c:type="GdkInterpType"/>
+            <type name="InterpType" c:type="GdkInterpType"/>
           </parameter>
           <parameter name="overall_alpha">
             <type name="int" c:type="int"/>
@@ -811,7 +811,7 @@
             <type name="double" c:type="double"/>
           </parameter>
           <parameter name="interp_type">
-            <type name="GdkInterpType" c:type="GdkInterpType"/>
+            <type name="InterpType" c:type="GdkInterpType"/>
           </parameter>
           <parameter name="overall_alpha">
             <type name="int" c:type="int"/>
@@ -834,7 +834,7 @@
         </parameters>
       </method>
       <property name="colorspace">
-        <type name="GdkColorspace" c:type="GdkColorspace"/>
+        <type name="Colorspace" c:type="GdkColorspace"/>
       </property>
       <property name="n-channels">
         <type name="int" c:type="gint"/>
@@ -900,8 +900,7 @@
               c:identifier="GDK_PIXBUF_ERROR_FAILED"
               glib:nick="failed"/>
     </enumeration>
-    <function name="gdk_pixbuf_error_quark"
-              c:identifier="gdk_pixbuf_error_quark">
+    <function name="pixbuf_error_quark" c:identifier="gdk_pixbuf_error_quark">
       <return-value>
         <type name="GLib.Quark" c:type="GQuark"/>
       </return-value>
@@ -1050,7 +1049,7 @@
         </parameters>
       </method>
     </class>
-    <enumeration name="GdkInterpType"
+    <enumeration name="InterpType"
                  c:type="GdkInterpType"
                  glib:type-name="GdkInterpType"
                  glib:get-type="gdk_interp_type_get_type">
@@ -1127,6 +1126,7 @@
         </parameters>
       </method>
     </class>
+    <record name="SimpleAnimClass" c:type="GdkPixbufSimpleAnimClass"/>
     <class name="SimpleAnimIter"
            c:type="GdkPixbufSimpleAnimIter"
            parent="AnimationIter"
@@ -1134,13 +1134,12 @@
            glib:get-type="gdk_pixbuf_simple_anim_iter_get_type">
     </class>
     <record name="Format" c:type="GdkPixbufFormat"/>
-    <function name="gdk_pixbuf_get_formats"
-              c:identifier="gdk_pixbuf_get_formats">
+    <function name="pixbuf_get_formats" c:identifier="gdk_pixbuf_get_formats">
       <return-value>
         <type name="GLib.SList" c:type="GSList*"/>
       </return-value>
     </function>
-    <function name="gdk_pixbuf_format_get_name"
+    <function name="pixbuf_format_get_name"
               c:identifier="gdk_pixbuf_format_get_name">
       <return-value>
         <type name="string" c:type="gchar*"/>
@@ -1151,7 +1150,7 @@
         </parameter>
       </parameters>
     </function>
-    <function name="gdk_pixbuf_format_get_description"
+    <function name="pixbuf_format_get_description"
               c:identifier="gdk_pixbuf_format_get_description">
       <return-value>
         <type name="string" c:type="gchar*"/>
@@ -1162,7 +1161,7 @@
         </parameter>
       </parameters>
     </function>
-    <function name="gdk_pixbuf_format_get_mime_types"
+    <function name="pixbuf_format_get_mime_types"
               c:identifier="gdk_pixbuf_format_get_mime_types">
       <return-value>
         <type name="GLib.char" c:type="gchar**"/>
@@ -1173,7 +1172,7 @@
         </parameter>
       </parameters>
     </function>
-    <function name="gdk_pixbuf_format_get_extensions"
+    <function name="pixbuf_format_get_extensions"
               c:identifier="gdk_pixbuf_format_get_extensions">
       <return-value>
         <type name="GLib.char" c:type="gchar**"/>
@@ -1184,7 +1183,7 @@
         </parameter>
       </parameters>
     </function>
-    <function name="gdk_pixbuf_format_is_writable"
+    <function name="pixbuf_format_is_writable"
               c:identifier="gdk_pixbuf_format_is_writable">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
@@ -1195,7 +1194,7 @@
         </parameter>
       </parameters>
     </function>
-    <function name="gdk_pixbuf_format_is_scalable"
+    <function name="pixbuf_format_is_scalable"
               c:identifier="gdk_pixbuf_format_is_scalable">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
@@ -1206,7 +1205,7 @@
         </parameter>
       </parameters>
     </function>
-    <function name="gdk_pixbuf_format_is_disabled"
+    <function name="pixbuf_format_is_disabled"
               c:identifier="gdk_pixbuf_format_is_disabled">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
@@ -1217,7 +1216,7 @@
         </parameter>
       </parameters>
     </function>
-    <function name="gdk_pixbuf_format_set_disabled"
+    <function name="pixbuf_format_set_disabled"
               c:identifier="gdk_pixbuf_format_set_disabled">
       <return-value>
         <type name="none" c:type="void"/>
@@ -1231,7 +1230,7 @@
         </parameter>
       </parameters>
     </function>
-    <function name="gdk_pixbuf_format_get_license"
+    <function name="pixbuf_format_get_license"
               c:identifier="gdk_pixbuf_format_get_license">
       <return-value>
         <type name="string" c:type="gchar*"/>
@@ -1242,7 +1241,7 @@
         </parameter>
       </parameters>
     </function>
-    <function name="gdk_pixbuf_get_file_info"
+    <function name="pixbuf_get_file_info"
               c:identifier="gdk_pixbuf_get_file_info">
       <return-value>
         <type name="Format" c:type="GdkPixbufFormat*"/>
@@ -1467,7 +1466,70 @@
         </return-value>
       </glib:signal>
     </class>
-    <function name="gdk_pixbuf_marshal_VOID__INT_INT_INT_INT"
+    <record name="LoaderClass" c:type="GdkPixbufLoaderClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="size_prepared" c:type="size_prepared">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="loader">
+            <type name="Loader" c:type="GdkPixbufLoader*"/>
+          </parameter>
+          <parameter name="width">
+            <type name="int" c:type="int"/>
+          </parameter>
+          <parameter name="height">
+            <type name="int" c:type="int"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="area_prepared" c:type="area_prepared">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="loader">
+            <type name="Loader" c:type="GdkPixbufLoader*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="area_updated" c:type="area_updated">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="loader">
+            <type name="Loader" c:type="GdkPixbufLoader*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="int"/>
+          </parameter>
+          <parameter name="y">
+            <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>
+      </callback>
+      <callback name="closed" c:type="closed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="loader">
+            <type name="Loader" c:type="GdkPixbufLoader*"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
+    <function name="pixbuf_marshal_VOID__INT_INT_INT_INT"
               c:identifier="_gdk_pixbuf_marshal_VOID__INT_INT_INT_INT">
       <return-value>
         <type name="none" c:type="void"/>
@@ -1493,7 +1555,7 @@
         </parameter>
       </parameters>
     </function>
-    <function name="gdk_pixbuf_marshal_VOID__INT_INT"
+    <function name="pixbuf_marshal_VOID__INT_INT"
               c:identifier="_gdk_pixbuf_marshal_VOID__INT_INT">
       <return-value>
         <type name="none" c:type="void"/>
@@ -1519,7 +1581,7 @@
         </parameter>
       </parameters>
     </function>
-    <enumeration name="GdkPixdataType" c:type="GdkPixdataType">
+    <enumeration name="PixdataType" c:type="GdkPixdataType">
       <member name="colortypergb"
               value="1"
               c:identifier="GDK_PIXDATA_COLOR_TYPE_RGB"/>
@@ -1545,7 +1607,7 @@
               value="251658240"
               c:identifier="GDK_PIXDATA_ENCODING_MASK"/>
     </enumeration>
-    <record name="GdkPixdata" c:type="GdkPixdata">
+    <record name="Pixdata" c:type="GdkPixdata">
       <field name="magic">
         <type name="uint32" c:type="guint32"/>
       </field>
@@ -1568,28 +1630,27 @@
         <type name="uint8" c:type="guint8*"/>
       </field>
     </record>
-    <function name="gdk_pixdata_serialize"
-              c:identifier="gdk_pixdata_serialize">
+    <function name="pixdata_serialize" c:identifier="gdk_pixdata_serialize">
       <return-value>
         <type name="uint8" c:type="guint8*"/>
       </return-value>
       <parameters>
         <parameter name="pixdata">
-          <type name="GdkPixdata" c:type="GdkPixdata*"/>
+          <type name="Pixdata" c:type="GdkPixdata*"/>
         </parameter>
         <parameter name="stream_length_p">
           <type name="uint" c:type="guint*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="gdk_pixdata_deserialize"
+    <function name="pixdata_deserialize"
               c:identifier="gdk_pixdata_deserialize">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="pixdata">
-          <type name="GdkPixdata" c:type="GdkPixdata*"/>
+          <type name="Pixdata" c:type="GdkPixdata*"/>
         </parameter>
         <parameter name="stream_length">
           <type name="uint" c:type="guint"/>
@@ -1602,14 +1663,14 @@
         </parameter>
       </parameters>
     </function>
-    <function name="gdk_pixdata_from_pixbuf"
+    <function name="pixdata_from_pixbuf"
               c:identifier="gdk_pixdata_from_pixbuf">
       <return-value>
         <type name="any" c:type="gpointer"/>
       </return-value>
       <parameters>
         <parameter name="pixdata">
-          <type name="GdkPixdata" c:type="GdkPixdata*"/>
+          <type name="Pixdata" c:type="GdkPixdata*"/>
         </parameter>
         <parameter name="pixbuf">
           <type name="Pixbuf" c:type="GdkPixbuf*"/>
@@ -1619,7 +1680,7 @@
         </parameter>
       </parameters>
     </function>
-    <enumeration name="GdkPixdataDumpType" c:type="GdkPixdataDumpType">
+    <enumeration name="PixdataDumpType" c:type="GdkPixdataDumpType">
       <member name="pixdatastream"
               value="0"
               c:identifier="GDK_PIXDATA_DUMP_PIXDATA_STREAM"/>
@@ -1639,20 +1700,19 @@
               value="65536"
               c:identifier="GDK_PIXDATA_DUMP_RLE_DECODER"/>
     </enumeration>
-    <function name="gdk_pixdata_to_csource"
-              c:identifier="gdk_pixdata_to_csource">
+    <function name="pixdata_to_csource" c:identifier="gdk_pixdata_to_csource">
       <return-value>
         <type name="GObject.String" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="pixdata">
-          <type name="GdkPixdata" c:type="GdkPixdata*"/>
+          <type name="Pixdata" c:type="GdkPixdata*"/>
         </parameter>
         <parameter name="name">
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="dump_type">
-          <type name="GdkPixdataDumpType" c:type="GdkPixdataDumpType"/>
+          <type name="PixdataDumpType" c:type="GdkPixdataDumpType"/>
         </parameter>
       </parameters>
     </function>

Modified: trunk/gir/gdk-x11-2.0.gir
==============================================================================
--- trunk/gir/gdk-x11-2.0.gir	(original)
+++ trunk/gir/gdk-x11-2.0.gir	Wed Aug 20 13:46:55 2008
@@ -3,10 +3,11 @@
             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="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="Selection" target="Atom" c:type="GdkSelection"/>
+    <alias name="Target" target="Atom" c:type="GdkTarget"/>
+    <alias name="SelectionType" target="Atom" c:type="GdkSelectionType"/>
+    <alias name="XEvent" target="none" c:type="GdkXEvent"/>
+    <alias name="Atom" target="none" c:type="GdkAtom"/>
     <alias name="WChar" target="uint32" c:type="GdkWChar"/>
     <alias name="NativeWindow" target="uint32" c:type="GdkNativeWindow"/>
     <record name="Point" c:type="GdkPoint">
@@ -269,7 +270,7 @@
             <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
           <parameter name="pixbuf">
-            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+            <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
           <parameter name="x">
             <type name="int" c:type="gint"/>
@@ -325,7 +326,7 @@
       </method>
       <method name="get_image" c:identifier="gdk_cursor_get_image">
         <return-value>
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="cursor">
@@ -1309,643 +1310,6 @@
           </parameter>
         </parameters>
       </method>
-      <callback name="create_gc" c:type="create_gc">
-        <return-value>
-          <type name="GC" c:type="GdkGC*"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-          <parameter name="values">
-            <type name="GCValues" c:type="GdkGCValues*"/>
-          </parameter>
-          <parameter name="mask">
-            <type name="GCValuesMask" c:type="GdkGCValuesMask"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="draw_rectangle" c:type="draw_rectangle">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-          <parameter name="gc">
-            <type name="GC" c:type="GdkGC*"/>
-          </parameter>
-          <parameter name="filled">
-            <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="width">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="height">
-            <type name="int" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="draw_arc" c:type="draw_arc">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-          <parameter name="gc">
-            <type name="GC" c:type="GdkGC*"/>
-          </parameter>
-          <parameter name="filled">
-            <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="width">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="height">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="angle1">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="angle2">
-            <type name="int" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="draw_polygon" c:type="draw_polygon">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-          <parameter name="gc">
-            <type name="GC" c:type="GdkGC*"/>
-          </parameter>
-          <parameter name="filled">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-          <parameter name="points">
-            <type name="Point" c:type="GdkPoint*"/>
-          </parameter>
-          <parameter name="npoints">
-            <type name="int" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="draw_text" c:type="draw_text">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-          <parameter name="font">
-            <type name="Font" c:type="GdkFont*"/>
-          </parameter>
-          <parameter name="gc">
-            <type name="GC" c:type="GdkGC*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="text">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="text_length">
-            <type name="int" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="draw_text_wc" c:type="draw_text_wc">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-          <parameter name="font">
-            <type name="Font" c:type="GdkFont*"/>
-          </parameter>
-          <parameter name="gc">
-            <type name="GC" c:type="GdkGC*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="text">
-            <type name="WChar" c:type="GdkWChar*"/>
-          </parameter>
-          <parameter name="text_length">
-            <type name="int" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="draw_drawable" c:type="draw_drawable">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-          <parameter name="gc">
-            <type name="GC" c:type="GdkGC*"/>
-          </parameter>
-          <parameter name="src">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-          <parameter name="xsrc">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="ysrc">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="xdest">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="ydest">
-            <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_points" c:type="draw_points">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-          <parameter name="gc">
-            <type name="GC" c:type="GdkGC*"/>
-          </parameter>
-          <parameter name="points">
-            <type name="Point" c:type="GdkPoint*"/>
-          </parameter>
-          <parameter name="npoints">
-            <type name="int" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="draw_segments" c:type="draw_segments">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-          <parameter name="gc">
-            <type name="GC" c:type="GdkGC*"/>
-          </parameter>
-          <parameter name="segs">
-            <type name="Segment" c:type="GdkSegment*"/>
-          </parameter>
-          <parameter name="nsegs">
-            <type name="int" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="draw_lines" c:type="draw_lines">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-          <parameter name="gc">
-            <type name="GC" c:type="GdkGC*"/>
-          </parameter>
-          <parameter name="points">
-            <type name="Point" c:type="GdkPoint*"/>
-          </parameter>
-          <parameter name="npoints">
-            <type name="int" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="draw_glyphs" c:type="draw_glyphs">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-          <parameter name="gc">
-            <type name="GC" c:type="GdkGC*"/>
-          </parameter>
-          <parameter name="font">
-            <type name="Pango.Font" c:type="PangoFont*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="glyphs">
-            <type name="Pango.GlyphString" c:type="PangoGlyphString*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="draw_image" c:type="draw_image">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-          <parameter name="gc">
-            <type name="GC" c:type="GdkGC*"/>
-          </parameter>
-          <parameter name="image">
-            <type name="Image" c:type="GdkImage*"/>
-          </parameter>
-          <parameter name="xsrc">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="ysrc">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="xdest">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="ydest">
-            <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="get_depth" c:type="get_depth">
-        <return-value>
-          <type name="int" c:type="gint"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_size" c:type="get_size">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </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="set_colormap" c:type="set_colormap">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-          <parameter name="cmap">
-            <type name="Colormap" c:type="GdkColormap*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_colormap" c:type="get_colormap">
-        <return-value>
-          <type name="Colormap" c:type="GdkColormap*"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_visual" c:type="get_visual">
-        <return-value>
-          <type name="Visual" c:type="GdkVisual*"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_screen" c:type="get_screen">
-        <return-value>
-          <type name="Screen" c:type="GdkScreen*"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_image" c:type="get_image">
-        <return-value>
-          <type name="Image" c:type="GdkImage*"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </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>
-      </callback>
-      <callback name="get_clip_region" c:type="get_clip_region">
-        <return-value>
-          <type name="Region" c:type="GdkRegion*"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_visible_region" c:type="get_visible_region">
-        <return-value>
-          <type name="Region" c:type="GdkRegion*"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="get_composite_drawable" c:type="get_composite_drawable">
-        <return-value>
-          <type name="Drawable" c:type="GdkDrawable*"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </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="composite_x_offset">
-            <type name="int" c:type="gint*"/>
-          </parameter>
-          <parameter name="composite_y_offset">
-            <type name="int" c:type="gint*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="draw_pixbuf" c:type="draw_pixbuf">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-          <parameter name="gc">
-            <type name="GC" c:type="GdkGC*"/>
-          </parameter>
-          <parameter name="pixbuf">
-            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
-          </parameter>
-          <parameter name="src_x">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="src_y">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="dest_x">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="dest_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="dither">
-            <type name="RgbDither" c:type="GdkRgbDither"/>
-          </parameter>
-          <parameter name="x_dither">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="y_dither">
-            <type name="int" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="copy_to_image" c:type="_copy_to_image">
-        <return-value>
-          <type name="Image" c:type="GdkImage*"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-          <parameter name="image">
-            <type name="Image" c:type="GdkImage*"/>
-          </parameter>
-          <parameter name="src_x">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="src_y">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="dest_x">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="dest_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="draw_glyphs_transformed"
-                c:type="draw_glyphs_transformed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-          <parameter name="gc">
-            <type name="GC" c:type="GdkGC*"/>
-          </parameter>
-          <parameter name="matrix">
-            <type name="Pango.Matrix" c:type="PangoMatrix*"/>
-          </parameter>
-          <parameter name="font">
-            <type name="Pango.Font" c:type="PangoFont*"/>
-          </parameter>
-          <parameter name="x">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="y">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="glyphs">
-            <type name="Pango.GlyphString" c:type="PangoGlyphString*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="draw_trapezoids" c:type="draw_trapezoids">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-          <parameter name="gc">
-            <type name="GC" c:type="GdkGC*"/>
-          </parameter>
-          <parameter name="trapezoids">
-            <type name="Trapezoid" c:type="GdkTrapezoid*"/>
-          </parameter>
-          <parameter name="n_trapezoids">
-            <type name="int" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="ref_cairo_surface" c:type="ref_cairo_surface">
-        <return-value>
-          <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
-        </return-value>
-        <parameters>
-          <parameter name="drawable">
-            <type name="Drawable" c:type="GdkDrawable*"/>
-          </parameter>
-        </parameters>
-      </callback>
-      <callback name="gdk_reserved4" c:type="_gdk_reserved4">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="gdk_reserved5" c:type="_gdk_reserved5">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="gdk_reserved6" c:type="_gdk_reserved6">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="gdk_reserved7" c:type="_gdk_reserved7">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="gdk_reserved9" c:type="_gdk_reserved9">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="gdk_reserved10" c:type="_gdk_reserved10">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="gdk_reserved11" c:type="_gdk_reserved11">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="gdk_reserved12" c:type="_gdk_reserved12">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="gdk_reserved13" c:type="_gdk_reserved13">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="gdk_reserved14" c:type="_gdk_reserved14">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="gdk_reserved15" c:type="_gdk_reserved15">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
-      <callback name="gdk_reserved16" c:type="_gdk_reserved16">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </callback>
     </class>
     <record name="Bitmap" c:type="GdkBitmap"/>
     <class name="Pixmap"
@@ -3899,7 +3263,7 @@
             <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
           <parameter name="message_type">
-            <type name="xlib.Atom" c:type="GdkAtom"/>
+            <type name="Atom" c:type="GdkAtom"/>
           </parameter>
           <parameter name="func">
             <type name="FilterFunc" c:type="GdkFilterFunc"/>
@@ -4102,7 +3466,7 @@
             <type name="Display" c:type="GdkDisplay*"/>
           </parameter>
           <parameter name="selection">
-            <type name="xlib.Atom" c:type="GdkAtom"/>
+            <type name="Atom" c:type="GdkAtom"/>
           </parameter>
         </parameters>
       </method>
@@ -4133,7 +3497,7 @@
             <type name="uint32" c:type="guint32"/>
           </parameter>
           <parameter name="targets">
-            <type name="xlib.Atom" c:type="GdkAtom*"/>
+            <type name="Atom" c:type="GdkAtom*"/>
           </parameter>
           <parameter name="n_targets">
             <type name="int" c:type="gint"/>
@@ -4828,6 +4192,11 @@
         </parameter>
       </parameters>
     </callback>
+    <record name="ColormapClass" c:type="GdkColormapClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+    </record>
     <function name="colormap_get_system_size"
               c:identifier="gdk_colormap_get_system_size">
       <return-value>
@@ -5404,7 +4773,7 @@
       </return-value>
       <parameters>
         <parameter name="pixbuf">
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="bitmap">
           <type name="Bitmap" c:type="GdkBitmap*"/>
@@ -5439,7 +4808,7 @@
       </return-value>
       <parameters>
         <parameter name="pixbuf">
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="drawable">
           <type name="Drawable" c:type="GdkDrawable*"/>
@@ -5483,7 +4852,7 @@
       </return-value>
       <parameters>
         <parameter name="pixbuf">
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="drawable">
           <type name="Drawable" c:type="GdkDrawable*"/>
@@ -5507,7 +4876,7 @@
           <type name="int" c:type="int"/>
         </parameter>
         <parameter name="alpha_mode">
-          <type name="Pixbuf.AlphaMode" c:type="GdkPixbufAlphaMode"/>
+          <type name="GdkPixbuf.AlphaMode" c:type="GdkPixbufAlphaMode"/>
         </parameter>
         <parameter name="alpha_threshold">
           <type name="int" c:type="int"/>
@@ -5530,7 +4899,7 @@
       </return-value>
       <parameters>
         <parameter name="pixbuf">
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="colormap">
           <type name="Colormap" c:type="GdkColormap*"/>
@@ -5553,7 +4922,7 @@
       </return-value>
       <parameters>
         <parameter name="pixbuf">
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="pixmap_return">
           <type name="Pixmap" c:type="GdkPixmap**"/>
@@ -5569,11 +4938,11 @@
     <function name="pixbuf_get_from_drawable"
               c:identifier="gdk_pixbuf_get_from_drawable">
       <return-value>
-        <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+        <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
       </return-value>
       <parameters>
         <parameter name="dest">
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="src">
           <type name="Drawable" c:type="GdkDrawable*"/>
@@ -5604,11 +4973,11 @@
     <function name="pixbuf_get_from_image"
               c:identifier="gdk_pixbuf_get_from_image">
       <return-value>
-        <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+        <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
       </return-value>
       <parameters>
         <parameter name="dest">
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="src">
           <type name="Image" c:type="GdkImage*"/>
@@ -5670,7 +5039,7 @@
           <type name="cairo.cairo_t" c:type="cairo_t*"/>
         </parameter>
         <parameter name="pixbuf">
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="pixbuf_x">
           <type name="double" c:type="double"/>
@@ -6125,6 +5494,11 @@
               c:identifier="GDK_DRAG_PROTO_LOCAL"
               glib:nick="local"/>
     </enumeration>
+    <record name="DragContextClass" c:type="GdkDragContextClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+    </record>
     <function name="drag_status" c:identifier="gdk_drag_status">
       <return-value>
         <type name="none" c:type="void"/>
@@ -6175,7 +5549,7 @@
     </function>
     <function name="drag_get_selection" c:identifier="gdk_drag_get_selection">
       <return-value>
-        <type name="xlib.Atom" c:type="GdkAtom"/>
+        <type name="Atom" c:type="GdkAtom"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -6503,6 +5877,7 @@
         </parameters>
       </method>
     </class>
+    <record name="DeviceClass" c:type="GdkDeviceClass"/>
     <record name="TimeCoord" c:type="GdkTimeCoord">
       <field name="time">
         <type name="uint32" c:type="guint32"/>
@@ -6924,7 +6299,7 @@
         <type name="int8" c:type="gint8"/>
       </field>
       <field name="atom">
-        <type name="xlib.Atom" c:type="GdkAtom"/>
+        <type name="Atom" c:type="GdkAtom"/>
       </field>
       <field name="time">
         <type name="uint32" c:type="guint32"/>
@@ -6944,13 +6319,13 @@
         <type name="int8" c:type="gint8"/>
       </field>
       <field name="selection">
-        <type name="xlib.Atom" c:type="GdkAtom"/>
+        <type name="Atom" c:type="GdkAtom"/>
       </field>
       <field name="target">
-        <type name="xlib.Atom" c:type="GdkAtom"/>
+        <type name="Atom" c:type="GdkAtom"/>
       </field>
       <field name="property">
-        <type name="xlib.Atom" c:type="GdkAtom"/>
+        <type name="Atom" c:type="GdkAtom"/>
       </field>
       <field name="time">
         <type name="uint32" c:type="guint32"/>
@@ -6976,7 +6351,7 @@
         <type name="OwnerChange" c:type="GdkOwnerChange"/>
       </field>
       <field name="selection">
-        <type name="xlib.Atom" c:type="GdkAtom"/>
+        <type name="Atom" c:type="GdkAtom"/>
       </field>
       <field name="time">
         <type name="uint32" c:type="guint32"/>
@@ -7013,7 +6388,7 @@
         <type name="int8" c:type="gint8"/>
       </field>
       <field name="message_type">
-        <type name="xlib.Atom" c:type="GdkAtom"/>
+        <type name="Atom" c:type="GdkAtom"/>
       </field>
       <field name="data_format">
         <type name="GLib.ushort" c:type="gushort"/>
@@ -7099,6 +6474,191 @@
         <type name="Window" c:type="GdkWindow*"/>
       </field>
     </record>
+    <glib:boxed c:type="GdkEvent"
+                glib:name="Event"
+                glib:type-name="GdkEvent"
+                glib:get-type="gdk_event_get_type">
+      <constructor name="get" c:identifier="gdk_event_get">
+        <return-value>
+          <type name="Event" c:type="GdkEvent*"/>
+        </return-value>
+      </constructor>
+      <constructor name="peek" c:identifier="gdk_event_peek">
+        <return-value>
+          <type name="Event" c:type="GdkEvent*"/>
+        </return-value>
+      </constructor>
+      <constructor name="get_graphics_expose"
+                   c:identifier="gdk_event_get_graphics_expose">
+        <return-value>
+          <type name="Event" c:type="GdkEvent*"/>
+        </return-value>
+        <parameters>
+          <parameter name="window">
+            <type name="Window" c:type="GdkWindow*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="new" c:identifier="gdk_event_new">
+        <return-value>
+          <type name="Event" c:type="GdkEvent*"/>
+        </return-value>
+        <parameters>
+          <parameter name="type">
+            <type name="EventType" c:type="GdkEventType"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <constructor name="copy" c:identifier="gdk_event_copy">
+        <return-value>
+          <type name="Event" c:type="GdkEvent*"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="put" c:identifier="gdk_event_put">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="free" c:identifier="gdk_event_free">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_time" c:identifier="gdk_event_get_time">
+        <return-value>
+          <type name="uint32" c:type="guint32"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_state" c:identifier="gdk_event_get_state">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+          <parameter name="state">
+            <type name="ModifierType" c:type="GdkModifierType*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_coords" c:identifier="gdk_event_get_coords">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+          <parameter name="x_win">
+            <type name="double" c:type="gdouble*"/>
+          </parameter>
+          <parameter name="y_win">
+            <type name="double" c:type="gdouble*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_root_coords" c:identifier="gdk_event_get_root_coords">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+          <parameter name="x_root">
+            <type name="double" c:type="gdouble*"/>
+          </parameter>
+          <parameter name="y_root">
+            <type name="double" c:type="gdouble*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_axis" c:identifier="gdk_event_get_axis">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+          <parameter name="axis_use">
+            <type name="AxisUse" c:type="GdkAxisUse"/>
+          </parameter>
+          <parameter name="value">
+            <type name="double" c:type="gdouble*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="set_screen" c:identifier="gdk_event_set_screen">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+          <parameter name="screen">
+            <type name="Screen" c:type="GdkScreen*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="get_screen" c:identifier="gdk_event_get_screen">
+        <return-value>
+          <type name="Screen" c:type="GdkScreen*"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="send_client_message"
+              c:identifier="gdk_event_send_client_message">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+          <parameter name="winid">
+            <type name="NativeWindow" c:type="GdkNativeWindow"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="send_clientmessage_toall"
+              c:identifier="gdk_event_send_clientmessage_toall">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="event">
+            <type name="Event" c:type="GdkEvent*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </glib:boxed>
     <callback name="EventFunc" c:type="GdkEventFunc">
       <return-value>
         <type name="none" c:type="void"/>
@@ -7135,7 +6695,7 @@
       </return-value>
       <parameters>
         <parameter name="xevent">
-          <type name="GdkXEvent" c:type="GdkXEvent*"/>
+          <type name="XEvent" c:type="GdkXEvent*"/>
         </parameter>
         <parameter name="event">
           <type name="Event" c:type="GdkEvent*"/>
@@ -7494,246 +7054,61 @@
               value="2"
               c:identifier="GDK_WINDOW_STATE_ICONIFIED"
               glib:nick="iconified"/>
-      <member name="maximized"
-              value="4"
-              c:identifier="GDK_WINDOW_STATE_MAXIMIZED"
-              glib:nick="maximized"/>
-      <member name="sticky"
-              value="8"
-              c:identifier="GDK_WINDOW_STATE_STICKY"
-              glib:nick="sticky"/>
-      <member name="fullscreen"
-              value="16"
-              c:identifier="GDK_WINDOW_STATE_FULLSCREEN"
-              glib:nick="fullscreen"/>
-      <member name="above"
-              value="32"
-              c:identifier="GDK_WINDOW_STATE_ABOVE"
-              glib:nick="above"/>
-      <member name="below"
-              value="64"
-              c:identifier="GDK_WINDOW_STATE_BELOW"
-              glib:nick="below"/>
-    </bitfield>
-    <enumeration name="SettingAction"
-                 c:type="GdkSettingAction"
-                 glib:type-name="GdkSettingAction"
-                 glib:get-type="gdk_setting_action_get_type">
-      <member name="new"
-              value="0"
-              c:identifier="GDK_SETTING_ACTION_NEW"
-              glib:nick="new"/>
-      <member name="changed"
-              value="1"
-              c:identifier="GDK_SETTING_ACTION_CHANGED"
-              glib:nick="changed"/>
-      <member name="deleted"
-              value="2"
-              c:identifier="GDK_SETTING_ACTION_DELETED"
-              glib:nick="deleted"/>
-    </enumeration>
-    <enumeration name="OwnerChange"
-                 c:type="GdkOwnerChange"
-                 glib:type-name="GdkOwnerChange"
-                 glib:get-type="gdk_owner_change_get_type">
-      <member name="new-owner"
-              value="0"
-              c:identifier="GDK_OWNER_CHANGE_NEW_OWNER"
-              glib:nick="new-owner"/>
-      <member name="destroy"
-              value="1"
-              c:identifier="GDK_OWNER_CHANGE_DESTROY"
-              glib:nick="destroy"/>
-      <member name="close"
-              value="2"
-              c:identifier="GDK_OWNER_CHANGE_CLOSE"
-              glib:nick="close"/>
-    </enumeration>
-    <glib:boxed c:type="GdkEvent"
-                glib:name="Event"
-                glib:type-name="GdkEvent"
-                glib:get-type="gdk_event_get_type">
-      <constructor name="get" c:identifier="gdk_event_get">
-        <return-value>
-          <type name="Event" c:type="GdkEvent*"/>
-        </return-value>
-      </constructor>
-      <constructor name="peek" c:identifier="gdk_event_peek">
-        <return-value>
-          <type name="Event" c:type="GdkEvent*"/>
-        </return-value>
-      </constructor>
-      <constructor name="get_graphics_expose"
-                   c:identifier="gdk_event_get_graphics_expose">
-        <return-value>
-          <type name="Event" c:type="GdkEvent*"/>
-        </return-value>
-        <parameters>
-          <parameter name="window">
-            <type name="Window" c:type="GdkWindow*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="new" c:identifier="gdk_event_new">
-        <return-value>
-          <type name="Event" c:type="GdkEvent*"/>
-        </return-value>
-        <parameters>
-          <parameter name="type">
-            <type name="EventType" c:type="GdkEventType"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="copy" c:identifier="gdk_event_copy">
-        <return-value>
-          <type name="Event" c:type="GdkEvent*"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-        </parameters>
-      </constructor>
-      <method name="put" c:identifier="gdk_event_put">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="free" c:identifier="gdk_event_free">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_time" c:identifier="gdk_event_get_time">
-        <return-value>
-          <type name="uint32" c:type="guint32"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_state" c:identifier="gdk_event_get_state">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-          <parameter name="state">
-            <type name="ModifierType" c:type="GdkModifierType*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_coords" c:identifier="gdk_event_get_coords">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-          <parameter name="x_win">
-            <type name="double" c:type="gdouble*"/>
-          </parameter>
-          <parameter name="y_win">
-            <type name="double" c:type="gdouble*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_root_coords" c:identifier="gdk_event_get_root_coords">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-          <parameter name="x_root">
-            <type name="double" c:type="gdouble*"/>
-          </parameter>
-          <parameter name="y_root">
-            <type name="double" c:type="gdouble*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_axis" c:identifier="gdk_event_get_axis">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-          <parameter name="axis_use">
-            <type name="AxisUse" c:type="GdkAxisUse"/>
-          </parameter>
-          <parameter name="value">
-            <type name="double" c:type="gdouble*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="set_screen" c:identifier="gdk_event_set_screen">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-          <parameter name="screen">
-            <type name="Screen" c:type="GdkScreen*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="get_screen" c:identifier="gdk_event_get_screen">
-        <return-value>
-          <type name="Screen" c:type="GdkScreen*"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="send_client_message"
-              c:identifier="gdk_event_send_client_message">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-          <parameter name="winid">
-            <type name="NativeWindow" c:type="GdkNativeWindow"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="send_clientmessage_toall"
-              c:identifier="gdk_event_send_clientmessage_toall">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="event">
-            <type name="Event" c:type="GdkEvent*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </glib:boxed>
+      <member name="maximized"
+              value="4"
+              c:identifier="GDK_WINDOW_STATE_MAXIMIZED"
+              glib:nick="maximized"/>
+      <member name="sticky"
+              value="8"
+              c:identifier="GDK_WINDOW_STATE_STICKY"
+              glib:nick="sticky"/>
+      <member name="fullscreen"
+              value="16"
+              c:identifier="GDK_WINDOW_STATE_FULLSCREEN"
+              glib:nick="fullscreen"/>
+      <member name="above"
+              value="32"
+              c:identifier="GDK_WINDOW_STATE_ABOVE"
+              glib:nick="above"/>
+      <member name="below"
+              value="64"
+              c:identifier="GDK_WINDOW_STATE_BELOW"
+              glib:nick="below"/>
+    </bitfield>
+    <enumeration name="SettingAction"
+                 c:type="GdkSettingAction"
+                 glib:type-name="GdkSettingAction"
+                 glib:get-type="gdk_setting_action_get_type">
+      <member name="new"
+              value="0"
+              c:identifier="GDK_SETTING_ACTION_NEW"
+              glib:nick="new"/>
+      <member name="changed"
+              value="1"
+              c:identifier="GDK_SETTING_ACTION_CHANGED"
+              glib:nick="changed"/>
+      <member name="deleted"
+              value="2"
+              c:identifier="GDK_SETTING_ACTION_DELETED"
+              glib:nick="deleted"/>
+    </enumeration>
+    <enumeration name="OwnerChange"
+                 c:type="GdkOwnerChange"
+                 glib:type-name="GdkOwnerChange"
+                 glib:get-type="gdk_owner_change_get_type">
+      <member name="new-owner"
+              value="0"
+              c:identifier="GDK_OWNER_CHANGE_NEW_OWNER"
+              glib:nick="new-owner"/>
+      <member name="destroy"
+              value="1"
+              c:identifier="GDK_OWNER_CHANGE_DESTROY"
+              glib:nick="destroy"/>
+      <member name="close"
+              value="2"
+              c:identifier="GDK_OWNER_CHANGE_CLOSE"
+              glib:nick="close"/>
+    </enumeration>
     <function name="events_pending" c:identifier="gdk_events_pending">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
@@ -7788,7 +7163,7 @@
       </return-value>
       <parameters>
         <parameter name="message_type">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="func">
           <type name="FilterFunc" c:type="GdkFilterFunc"/>
@@ -7811,6 +7186,67 @@
         </parameter>
       </parameters>
     </function>
+    <record name="DisplayClass" c:type="GdkDisplayClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="get_display_name" c:type="get_display_name">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_n_screens" c:type="get_n_screens">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_screen" c:type="get_screen">
+        <return-value>
+          <type name="Screen" c:type="GdkScreen*"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="screen_num">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_default_screen" c:type="get_default_screen">
+        <return-value>
+          <type name="Screen" c:type="GdkScreen*"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="closed" c:type="closed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+          <parameter name="is_error">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
     <record name="DisplayPointerHooks" c:type="GdkDisplayPointerHooks">
       <callback name="get_pointer" c:type="get_pointer">
         <return-value>
@@ -7935,6 +7371,24 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="DisplayManagerClass" c:type="GdkDisplayManagerClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="display_opened" c:type="display_opened">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="display_manager">
+            <type name="DisplayManager" c:type="GdkDisplayManager*"/>
+          </parameter>
+          <parameter name="display">
+            <type name="Display" c:type="GdkDisplay*"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
     <record name="GCValues" c:type="GdkGCValues">
       <field name="foreground">
         <type name="Color" c:type="GdkColor"/>
@@ -7991,6 +7445,79 @@
         <type name="JoinStyle" c:type="GdkJoinStyle"/>
       </field>
     </record>
+    <record name="GCClass" c:type="GdkGCClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="get_values" c:type="get_values">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="gc">
+            <type name="GC" c:type="GdkGC*"/>
+          </parameter>
+          <parameter name="values">
+            <type name="GCValues" c:type="GdkGCValues*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_values" c:type="set_values">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="gc">
+            <type name="GC" c:type="GdkGC*"/>
+          </parameter>
+          <parameter name="values">
+            <type name="GCValues" c:type="GdkGCValues*"/>
+          </parameter>
+          <parameter name="mask">
+            <type name="GCValuesMask" c:type="GdkGCValuesMask"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_dashes" c:type="set_dashes">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="gc">
+            <type name="GC" c:type="GdkGC*"/>
+          </parameter>
+          <parameter name="dash_offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="dash_list">
+            <type name="int8" c:type="gint8"/>
+          </parameter>
+          <parameter name="n">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="gdk_reserved1" c:type="_gdk_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gdk_reserved2" c:type="_gdk_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gdk_reserved3" c:type="_gdk_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gdk_reserved4" c:type="_gdk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </record>
     <enumeration name="CapStyle"
                  c:type="GdkCapStyle"
                  glib:type-name="GdkCapStyle"
@@ -8202,6 +7729,11 @@
               c:identifier="GDK_GC_JOIN_STYLE"
               glib:nick="join-style"/>
     </bitfield>
+    <record name="DrawableClass" c:type="GdkDrawableClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+    </record>
     <record name="Trapezoid" c:type="GdkTrapezoid">
       <field name="y1">
         <type name="double" c:type="double"/>
@@ -8568,7 +8100,7 @@
           <type name="GC" c:type="GdkGC*"/>
         </parameter>
         <parameter name="pixbuf">
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="src_x">
           <type name="int" c:type="gint"/>
@@ -9472,6 +9004,11 @@
         </parameter>
       </parameters>
     </function>
+    <record name="ImageClass" c:type="GdkImageClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+    </record>
     <record name="KeymapKey" c:type="GdkKeymapKey">
       <field name="keycode">
         <type name="uint" c:type="guint"/>
@@ -9644,6 +9181,31 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="KeymapClass" c:type="GdkKeymapClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="direction_changed" c:type="direction_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="keymap">
+            <type name="Keymap" c:type="GdkKeymap*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="keys_changed" c:type="keys_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="keymap">
+            <type name="Keymap" c:type="GdkKeymap*"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
     <function name="keyval_name" c:identifier="gdk_keyval_name">
       <return-value>
         <type name="string" c:type="gchar*"/>
@@ -9810,6 +9372,11 @@
         <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"/>
     <function name="pango_renderer_new" c:identifier="gdk_pango_renderer_new">
       <return-value>
@@ -10003,7 +9570,7 @@
     </function>
     <function name="atom_intern" c:identifier="gdk_atom_intern">
       <return-value>
-        <type name="xlib.Atom" c:type="GdkAtom"/>
+        <type name="Atom" c:type="GdkAtom"/>
       </return-value>
       <parameters>
         <parameter name="atom_name">
@@ -10017,7 +9584,7 @@
     <function name="atom_intern_static_string"
               c:identifier="gdk_atom_intern_static_string">
       <return-value>
-        <type name="xlib.Atom" c:type="GdkAtom"/>
+        <type name="Atom" c:type="GdkAtom"/>
       </return-value>
       <parameters>
         <parameter name="atom_name">
@@ -10031,7 +9598,7 @@
       </return-value>
       <parameters>
         <parameter name="atom">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
       </parameters>
     </function>
@@ -10044,10 +9611,10 @@
           <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="property">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="type">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="offset">
           <type name="ulong" c:type="gulong"/>
@@ -10059,7 +9626,7 @@
           <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="actual_property_type">
-          <type name="xlib.Atom" c:type="GdkAtom*"/>
+          <type name="Atom" c:type="GdkAtom*"/>
         </parameter>
         <parameter name="actual_format">
           <type name="int" c:type="gint*"/>
@@ -10081,10 +9648,10 @@
           <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="property">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="type">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="format">
           <type name="int" c:type="gint"/>
@@ -10109,7 +9676,7 @@
           <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="property">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
       </parameters>
     </function>
@@ -10120,7 +9687,7 @@
       </return-value>
       <parameters>
         <parameter name="encoding">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="format">
           <type name="int" c:type="gint"/>
@@ -10143,7 +9710,7 @@
       </return-value>
       <parameters>
         <parameter name="encoding">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="format">
           <type name="int" c:type="gint"/>
@@ -10169,7 +9736,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="encoding">
-          <type name="xlib.Atom" c:type="GdkAtom*"/>
+          <type name="Atom" c:type="GdkAtom*"/>
         </parameter>
         <parameter name="format">
           <type name="int" c:type="gint*"/>
@@ -10192,7 +9759,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="encoding">
-          <type name="xlib.Atom" c:type="GdkAtom*"/>
+          <type name="Atom" c:type="GdkAtom*"/>
         </parameter>
         <parameter name="format">
           <type name="int" c:type="gint*"/>
@@ -10215,7 +9782,7 @@
           <type name="Display" c:type="GdkDisplay*"/>
         </parameter>
         <parameter name="encoding">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="format">
           <type name="int" c:type="gint"/>
@@ -10241,7 +9808,7 @@
           <type name="Display" c:type="GdkDisplay*"/>
         </parameter>
         <parameter name="encoding">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="format">
           <type name="int" c:type="gint"/>
@@ -10281,7 +9848,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="encoding">
-          <type name="xlib.Atom" c:type="GdkAtom*"/>
+          <type name="Atom" c:type="GdkAtom*"/>
         </parameter>
         <parameter name="format">
           <type name="int" c:type="gint*"/>
@@ -10307,7 +9874,7 @@
           <type name="string" c:type="gchar*"/>
         </parameter>
         <parameter name="encoding">
-          <type name="xlib.Atom" c:type="GdkAtom*"/>
+          <type name="Atom" c:type="GdkAtom*"/>
         </parameter>
         <parameter name="format">
           <type name="int" c:type="gint*"/>
@@ -10610,6 +10177,31 @@
         </parameter>
       </parameters>
     </function>
+    <record name="ScreenClass" c:type="GdkScreenClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="size_changed" c:type="size_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="screen">
+            <type name="Screen" c:type="GdkScreen*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="composited_changed" c:type="composited_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="screen">
+            <type name="Screen" c:type="GdkScreen*"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
     <function name="selection_owner_set"
               c:identifier="gdk_selection_owner_set">
       <return-value>
@@ -10620,7 +10212,7 @@
           <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="selection">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="time_">
           <type name="uint32" c:type="guint32"/>
@@ -10637,7 +10229,7 @@
       </return-value>
       <parameters>
         <parameter name="selection">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
       </parameters>
     </function>
@@ -10654,7 +10246,7 @@
           <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="selection">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="time_">
           <type name="uint32" c:type="guint32"/>
@@ -10674,7 +10266,7 @@
           <type name="Display" c:type="GdkDisplay*"/>
         </parameter>
         <parameter name="selection">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
       </parameters>
     </function>
@@ -10687,10 +10279,10 @@
           <type name="Window" c:type="GdkWindow*"/>
         </parameter>
         <parameter name="selection">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="target">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="time_">
           <type name="uint32" c:type="guint32"/>
@@ -10710,7 +10302,7 @@
           <type name="GLib.uchar" c:type="guchar**"/>
         </parameter>
         <parameter name="prop_type">
-          <type name="xlib.Atom" c:type="GdkAtom*"/>
+          <type name="Atom" c:type="GdkAtom*"/>
         </parameter>
         <parameter name="prop_format">
           <type name="int" c:type="gint*"/>
@@ -10727,13 +10319,13 @@
           <type name="uint32" c:type="guint32"/>
         </parameter>
         <parameter name="selection">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="target">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="property">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="time_">
           <type name="uint32" c:type="guint32"/>
@@ -10753,13 +10345,13 @@
           <type name="uint32" c:type="guint32"/>
         </parameter>
         <parameter name="selection">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="target">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="property">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="time_">
           <type name="uint32" c:type="guint32"/>
@@ -10861,6 +10453,7 @@
         </parameter>
       </parameters>
     </function>
+    <record name="VisualClass" c:type="GdkVisualClass"/>
     <function name="visual_get_best_depth"
               c:identifier="gdk_visual_get_best_depth">
       <return-value>
@@ -12048,7 +11641,7 @@
           <type name="Screen" c:type="GdkScreen*"/>
         </parameter>
         <parameter name="property">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
       </parameters>
     </function>
@@ -12068,7 +11661,7 @@
       </return-value>
       <parameters>
         <parameter name="property">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
       </parameters>
     </function>
@@ -12096,35 +11689,35 @@
     <function name="x11_atom_to_xatom_for_display"
               c:identifier="gdk_x11_atom_to_xatom_for_display">
       <return-value>
-        <type name="xlib.Atom" c:type="Atom"/>
+        <type name="Atom" c:type="Atom"/>
       </return-value>
       <parameters>
         <parameter name="display">
           <type name="Display" c:type="GdkDisplay*"/>
         </parameter>
         <parameter name="atom">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="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="xlib.Atom" c:type="GdkAtom"/>
+        <type name="Atom" c:type="GdkAtom"/>
       </return-value>
       <parameters>
         <parameter name="display">
           <type name="Display" c:type="GdkDisplay*"/>
         </parameter>
         <parameter name="xatom">
-          <type name="xlib.Atom" c:type="Atom"/>
+          <type name="Atom" c:type="Atom"/>
         </parameter>
       </parameters>
     </function>
     <function name="x11_get_xatom_by_name_for_display"
               c:identifier="gdk_x11_get_xatom_by_name_for_display">
       <return-value>
-        <type name="xlib.Atom" c:type="Atom"/>
+        <type name="Atom" c:type="Atom"/>
       </return-value>
       <parameters>
         <parameter name="display">
@@ -12145,34 +11738,34 @@
           <type name="Display" c:type="GdkDisplay*"/>
         </parameter>
         <parameter name="xatom">
-          <type name="xlib.Atom" c:type="Atom"/>
+          <type name="Atom" c:type="Atom"/>
         </parameter>
       </parameters>
     </function>
     <function name="x11_atom_to_xatom" c:identifier="gdk_x11_atom_to_xatom">
       <return-value>
-        <type name="xlib.Atom" c:type="Atom"/>
+        <type name="Atom" c:type="Atom"/>
       </return-value>
       <parameters>
         <parameter name="atom">
-          <type name="xlib.Atom" c:type="GdkAtom"/>
+          <type name="Atom" c:type="GdkAtom"/>
         </parameter>
       </parameters>
     </function>
     <function name="x11_xatom_to_atom" c:identifier="gdk_x11_xatom_to_atom">
       <return-value>
-        <type name="xlib.Atom" c:type="GdkAtom"/>
+        <type name="Atom" c:type="GdkAtom"/>
       </return-value>
       <parameters>
         <parameter name="xatom">
-          <type name="xlib.Atom" c:type="Atom"/>
+          <type name="Atom" c:type="Atom"/>
         </parameter>
       </parameters>
     </function>
     <function name="x11_get_xatom_by_name"
               c:identifier="gdk_x11_get_xatom_by_name">
       <return-value>
-        <type name="xlib.Atom" c:type="Atom"/>
+        <type name="Atom" c:type="Atom"/>
       </return-value>
       <parameters>
         <parameter name="atom_name">
@@ -12186,7 +11779,7 @@
       </return-value>
       <parameters>
         <parameter name="xatom">
-          <type name="xlib.Atom" c:type="Atom"/>
+          <type name="Atom" c:type="Atom"/>
         </parameter>
       </parameters>
     </function>

Modified: trunk/gir/gtk-x11-2.0.gir
==============================================================================
--- trunk/gir/gtk-x11-2.0.gir	(original)
+++ trunk/gir/gtk-x11-2.0.gir	Wed Aug 20 13:46:55 2008
@@ -4,7 +4,6 @@
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
   <namespace name="Gtk">
     <alias name="FlagValue" target="GFlagsValue" c:type="GtkFlagValue"/>
-    <alias name="DitherInfo" target="DitherInfo" c:type="GtkDitherInfo"/>
     <alias name="SignalMarshaller"
            target="GSignalCMarshaller"
            c:type="GtkSignalMarshaller"/>
@@ -1455,6 +1454,50 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="AccelGroupClass" c:type="GtkAccelGroupClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="accel_changed" c:type="accel_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="accel_group">
+            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+          </parameter>
+          <parameter name="keyval">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="modifier">
+            <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+          </parameter>
+          <parameter name="accel_closure">
+            <type name="GObject.Closure" c:type="GClosure*"/>
+          </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>
+    </record>
     <record name="AccelKey" c:type="GtkAccelKey">
       <field name="accel_key">
         <type name="uint" c:type="guint"/>
@@ -3750,6 +3793,54 @@
         </parameter>
       </parameters>
     </function>
+    <record name="ObjectClass" c:type="GtkObjectClass">
+      <field name="parent_class">
+        <type name="GObject.InitiallyUnownedClass"
+              c:type="GInitiallyUnownedClass"/>
+      </field>
+      <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>
+    </record>
     <function name="object_add_arg_type"
               c:identifier="gtk_object_add_arg_type">
       <return-value>
@@ -3903,6 +3994,51 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="AdjustmentClass" c:type="GtkAdjustmentClass">
+      <field name="parent_class">
+        <type name="ObjectClass" c:type="GtkObjectClass"/>
+      </field>
+      <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="value_changed" c:type="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" 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>
+    </record>
     <function name="adjustment_new" c:identifier="gtk_adjustment_new">
       <return-value>
         <type name="Object" c:type="GtkObject*"/>
@@ -4121,7 +4257,7 @@
       </method>
       <method name="render_icon" c:identifier="gtk_style_render_icon">
         <return-value>
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -4221,7 +4357,7 @@
       </callback>
       <callback name="render_icon" c:type="render_icon">
         <return-value>
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="style">
@@ -5158,178 +5294,93 @@
         </return-value>
       </glib:signal>
     </class>
-    <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">
+    <record name="StyleClass" c:type="GtkStyleClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="realize" c:type="realize">
         <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="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="ref" c:identifier="gtk_rc_style_ref">
+      </callback>
+      <callback name="unrealize" c:type="unrealize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="rc_style">
-            <type name="RcStyle" c:type="GtkRcStyle*"/>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="unref" c:identifier="gtk_rc_style_unref">
+      </callback>
+      <callback name="copy" c:type="copy">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="rc_style">
-            <type name="RcStyle" c:type="GtkRcStyle*"/>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </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 name="src">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="parse" c:type="parse">
+      <callback name="clone" c:type="clone">
         <return-value>
-          <type name="uint" c:type="guint"/>
+          <type name="Style" c:type="GtkStyle*"/>
         </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 name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="merge" c:type="merge">
+      <callback name="init_from_rc" c:type="init_from_rc">
         <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 name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
-        </parameters>
-      </callback>
-      <callback name="create_style" c:type="create_style">
-        <return-value>
-          <type name="Style" c:type="GtkStyle*"/>
-        </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">
+      <callback name="set_background" c:type="set_background">
         <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 name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </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 name="window">
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </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 name="state_type">
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="render_icon" c:identifier="gtk_icon_set_render_icon">
+      </callback>
+      <callback name="render_icon" c:type="render_icon">
         <return-value>
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.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="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
           <parameter name="direction">
             <type name="TextDirection" c:type="GtkTextDirection"/>
           </parameter>
@@ -5339,839 +5390,840 @@
           <parameter name="size">
             <type name="IconSize" c:type="GtkIconSize"/>
           </parameter>
-          <parameter name="widget" allow-none="1">
+          <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="detail" allow-none="1">
-            <type name="string" c:type="char*"/>
+          <parameter name="detail">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="add_source" c:identifier="gtk_icon_set_add_source">
+      </callback>
+      <callback name="draw_hline" c:type="draw_hline">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="icon_set">
-            <type name="IconSet" c:type="GtkIconSet*"/>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="window">
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </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 name="state_type">
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
-          <parameter name="sizes">
-            <type name="IconSize" c:type="GtkIconSize**"/>
+          <parameter name="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
-          <parameter name="n_sizes">
-            <type name="int" c:type="gint*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </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 name="detail">
+            <type name="string" c:type="gchar*"/>
           </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 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>
-      </method>
-      <method name="set_filename" c:identifier="gtk_icon_source_set_filename">
+      </callback>
+      <callback name="draw_vline" c:type="draw_vline">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
-          <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="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="detail">
             <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>
-      </method>
-      <method name="set_icon_name"
-              c:identifier="gtk_icon_source_set_icon_name">
+      </callback>
+      <callback name="draw_shadow" c:type="draw_shadow">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
-          <parameter name="icon_name" allow-none="1">
+          <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">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="detail">
             <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>
-      </method>
-      <method name="set_pixbuf" c:identifier="gtk_icon_source_set_pixbuf">
+      </callback>
+      <callback name="draw_polygon" c:type="draw_polygon">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
-          <parameter name="pixbuf">
-            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <parameter name="window">
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </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 name="state_type">
+            <type name="StateType" c:type="GtkStateType"/>
           </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 name="shadow_type">
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </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 name="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </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 name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="detail">
+            <type name="string" c:type="gchar*"/>
           </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 name="point">
+            <type name="Gdk.Point" c:type="GdkPoint*"/>
           </parameter>
-          <parameter name="setting">
+          <parameter name="npoints">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="fill">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_size_wildcarded"
-              c:identifier="gtk_icon_source_set_size_wildcarded">
+      </callback>
+      <callback name="draw_arrow" c:type="draw_arrow">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
-          <parameter name="setting">
+          <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">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="detail">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="arrow_type">
+            <type name="ArrowType" c:type="GtkArrowType"/>
+          </parameter>
+          <parameter name="fill">
             <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"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_state_wildcarded"
-              c:identifier="gtk_icon_source_get_state_wildcarded">
-        <return-value>
-          <type name="boolean" c:type="gboolean"/>
-        </return-value>
-        <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
           </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 name="width">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="height">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_direction"
-              c:identifier="gtk_icon_source_set_direction">
+      </callback>
+      <callback name="draw_diamond" c:type="draw_diamond">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
-          <parameter name="direction">
-            <type name="TextDirection" c:type="GtkTextDirection"/>
+          <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">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="detail">
+            <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>
-      </method>
-      <method name="set_state" c:identifier="gtk_icon_source_set_state">
+      </callback>
+      <callback name="draw_string" c:type="draw_string">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
-          <parameter name="state">
+          <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">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="detail">
+            <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>
-      </method>
-      <method name="set_size" c:identifier="gtk_icon_source_set_size">
+      </callback>
+      <callback name="draw_box" c:type="draw_box">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
-          <parameter name="size">
-            <type name="IconSize" c:type="GtkIconSize"/>
+          <parameter name="window">
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </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 name="state_type">
+            <type name="StateType" c:type="GtkStateType"/>
+          </parameter>
+          <parameter name="shadow_type">
+            <type name="ShadowType" c:type="GtkShadowType"/>
+          </parameter>
+          <parameter name="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="detail">
+            <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>
-      </method>
-      <method name="get_state" c:identifier="gtk_icon_source_get_state">
+      </callback>
+      <callback name="draw_flat_box" c:type="draw_flat_box">
         <return-value>
-          <type name="StateType" c:type="GtkStateType"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <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">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="detail">
+            <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>
-      </method>
-      <method name="get_size" c:identifier="gtk_icon_source_get_size">
+      </callback>
+      <callback name="draw_check" c:type="draw_check">
         <return-value>
-          <type name="IconSize" c:type="GtkIconSize"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="source">
-            <type name="IconSource" c:type="GtkIconSource*"/>
+          <parameter name="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">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="detail">
+            <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>
-      </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">
+      </callback>
+      <callback name="draw_option" c:type="draw_option">
         <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="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">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="detail">
+            <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>
-      </constructor>
-      <method name="set_property_value"
-              c:identifier="gtk_settings_set_property_value">
+      </callback>
+      <callback name="draw_tab" c:type="draw_tab">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="Settings" c:type="GtkSettings*"/>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
-          <parameter name="name">
+          <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">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="detail">
             <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="svalue">
-            <type name="SettingsValue" c:type="GtkSettingsValue*"/>
+          <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>
-      <method name="set_string_property"
-              c:identifier="gtk_settings_set_string_property">
+      </callback>
+      <callback name="draw_shadow_gap" c:type="draw_shadow_gap">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="Settings" c:type="GtkSettings*"/>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="window">
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
-          <parameter name="v_string">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="state_type">
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
-          <parameter name="origin">
+          <parameter name="shadow_type">
+            <type name="ShadowType" c:type="GtkShadowType"/>
+          </parameter>
+          <parameter name="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="detail">
             <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>
-      </method>
-      <method name="set_long_property"
-              c:identifier="gtk_settings_set_long_property">
+      </callback>
+      <callback name="draw_box_gap" c:type="draw_box_gap">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="Settings" c:type="GtkSettings*"/>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="window">
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
-          <parameter name="v_long">
-            <type name="long" c:type="glong"/>
+          <parameter name="state_type">
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
-          <parameter name="origin">
+          <parameter name="shadow_type">
+            <type name="ShadowType" c:type="GtkShadowType"/>
+          </parameter>
+          <parameter name="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="detail">
             <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>
-      </method>
-      <method name="set_double_property"
-              c:identifier="gtk_settings_set_double_property">
+      </callback>
+      <callback name="draw_extension" c:type="draw_extension">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="settings">
-            <type name="Settings" c:type="GtkSettings*"/>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
-          <parameter name="name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="window">
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
-          <parameter name="v_double">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="state_type">
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
-          <parameter name="origin">
+          <parameter name="shadow_type">
+            <type name="ShadowType" c:type="GtkShadowType"/>
+          </parameter>
+          <parameter name="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="detail">
             <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>
-      </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="boolean" c:type="gboolean"/>
-      </return-value>
-      <parameters>
-        <parameter name="pspec">
-          <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
-        </parameter>
-        <parameter name="rc_string">
-          <type name="GObject.String" c:type="GString*"/>
-        </parameter>
-        <parameter name="property_value">
-          <type name="GObject.Value" c:type="GValue*"/>
-        </parameter>
-      </parameters>
-    </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">
+      </callback>
+      <callback name="draw_focus" c:type="draw_focus">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="type">
-            <type name="GObject.Type" c:type="GType"/>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
-          <parameter name="first_property_name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="window">
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="ref" c:identifier="gtk_widget_ref">
-        <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="state_type">
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="get_parent" c:identifier="gtk_widget_get_parent">
-        <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
-        </return-value>
-        <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
-        </parameters>
-      </constructor>
-      <constructor name="get_toplevel" c:identifier="gtk_widget_get_toplevel">
-        <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
-        </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*"/>
-        </return-value>
-        <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="detail">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="widget_type">
-            <type name="GObject.Type" c:type="GType"/>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
           </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 name="y">
+            <type name="int" c:type="gint"/>
           </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 name="width">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="widget_pointer">
-            <type name="Widget" c:type="GtkWidget**"/>
+          <parameter name="height">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="unref" c:identifier="gtk_widget_unref">
+      </callback>
+      <callback name="draw_slider" c:type="draw_slider">
         <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="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">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </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">
+          <parameter name="detail">
             <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 name="x">
+            <type name="int" c:type="gint"/>
           </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 name="y">
+            <type name="int" c:type="gint"/>
           </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 name="width">
+            <type name="int" c:type="gint"/>
           </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 name="height">
+            <type name="int" c:type="gint"/>
           </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 name="orientation">
+            <type name="Orientation" c:type="GtkOrientation"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="hide_all" c:identifier="gtk_widget_hide_all">
+      </callback>
+      <callback name="draw_handle" c:type="draw_handle">
         <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>
-        </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 name="window">
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
           </parameter>
-          <parameter name="no_show_all">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="state_type">
+            <type name="StateType" c:type="GtkStateType"/>
           </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"/>
-        </return-value>
-        <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="shadow_type">
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="map" c:identifier="gtk_widget_map">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="unmap" c:identifier="gtk_widget_unmap">
-        <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="realize" c:identifier="gtk_widget_realize">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="detail">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="unrealize" c:identifier="gtk_widget_unrealize">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="queue_draw" c:identifier="gtk_widget_queue_draw">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <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>
-      </method>
-      <method name="queue_draw_area" c:identifier="gtk_widget_queue_draw_area">
+      </callback>
+      <callback name="draw_expander" c:type="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="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="detail">
+            <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 name="expander_style">
+            <type name="ExpanderStyle" c:type="GtkExpanderStyle"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="queue_clear" c:identifier="gtk_widget_queue_clear">
+      </callback>
+      <callback name="draw_layout" c:type="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="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="detail">
+            <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>
-      </method>
-      <method name="queue_clear_area"
-              c:identifier="gtk_widget_queue_clear_area">
+      </callback>
+      <callback name="draw_resize_grip" c:type="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="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="detail">
+            <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>
@@ -6185,662 +6237,865 @@
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="queue_resize" c:identifier="gtk_widget_queue_resize">
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <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="queue_resize_no_redraw"
-              c:identifier="gtk_widget_queue_resize_no_redraw">
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <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="draw" c:identifier="gtk_widget_draw">
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="area">
-            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
-          </parameter>
-        </parameters>
-      </method>
-      <method name="size_request" c:identifier="gtk_widget_size_request">
+      </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>
+      <callback name="gtk_reserved8" c:type="_gtk_reserved8">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved9" c:type="_gtk_reserved9">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved10" c:type="_gtk_reserved10">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved11" c:type="_gtk_reserved11">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_reserved12" c:type="_gtk_reserved12">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+      </callback>
+    </record>
+    <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="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="requisition">
-            <type name="Requisition" c:type="GtkRequisition*"/>
+          <parameter name="orig">
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="size_allocate" c:identifier="gtk_widget_size_allocate">
+      </constructor>
+      <method name="ref" c:identifier="gtk_rc_style_ref">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="allocation">
-            <type name="Allocation" c:type="GtkAllocation*"/>
+          <parameter name="rc_style">
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_child_requisition"
-              c:identifier="gtk_widget_get_child_requisition">
+      <method name="unref" c:identifier="gtk_rc_style_unref">
         <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 name="rc_style">
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="add_accelerator" c:identifier="gtk_widget_add_accelerator">
+      <callback name="create_rc_style" c:type="create_rc_style">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
         </return-value>
         <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 name="rc_style">
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="remove_accelerator"
-              c:identifier="gtk_widget_remove_accelerator">
+      </callback>
+      <callback name="parse" c:type="parse">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="uint" c:type="guint"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="accel_group">
-            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+          <parameter name="rc_style">
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
           </parameter>
-          <parameter name="accel_key">
-            <type name="uint" c:type="guint"/>
+          <parameter name="settings">
+            <type name="Settings" c:type="GtkSettings*"/>
           </parameter>
-          <parameter name="accel_mods">
-            <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
+          <parameter name="scanner">
+            <type name="GLib.Scanner" c:type="GScanner*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_accel_path" c:identifier="gtk_widget_set_accel_path">
+      </callback>
+      <callback name="merge" c:type="merge">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="accel_path" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="dest">
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
           </parameter>
-          <parameter name="accel_group" allow-none="1">
-            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
+          <parameter name="src">
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="list_accel_closures"
-              c:identifier="gtk_widget_list_accel_closures">
+      </callback>
+      <callback name="create_style" c:type="create_style">
         <return-value>
-          <type name="GLib.List" c:type="GList*"/>
+          <type name="Style" c:type="GtkStyle*"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="rc_style">
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="can_activate_accel"
-              c:identifier="gtk_widget_can_activate_accel">
+      </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="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">
+      </callback>
+      <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>
+    </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="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="group_cycling">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="pixbuf">
+            <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="event" c:identifier="gtk_widget_event">
+      </constructor>
+      <constructor name="ref" c:identifier="gtk_icon_set_ref">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="IconSet" c:type="GtkIconSet*"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.Event" c:type="GdkEvent*"/>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="send_expose" c:identifier="gtk_widget_send_expose">
+      </constructor>
+      <constructor name="copy" c:identifier="gtk_icon_set_copy">
         <return-value>
-          <type name="int" c:type="gint"/>
+          <type name="IconSet" c:type="GtkIconSet*"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="event">
-            <type name="Gdk.Event" c:type="GdkEvent*"/>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="activate" c:identifier="gtk_widget_activate">
+      </constructor>
+      <method name="unref" c:identifier="gtk_icon_set_unref">
         <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="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_scroll_adjustments"
-              c:identifier="gtk_widget_set_scroll_adjustments">
+      <method name="render_icon" c:identifier="gtk_icon_set_render_icon">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
-          <parameter name="hadjustment" allow-none="1">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
-          <parameter name="vadjustment" allow-none="1">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <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="reparent" c:identifier="gtk_widget_reparent">
+      <method name="add_source" c:identifier="gtk_icon_set_add_source">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
-          <parameter name="new_parent">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="intersect" c:identifier="gtk_widget_intersect">
+      <method name="get_sizes" c:identifier="gtk_icon_set_get_sizes">
         <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="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
           </parameter>
-          <parameter name="area">
-            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          <parameter name="sizes">
+            <type name="IconSize" c:type="GtkIconSize**"/>
           </parameter>
-          <parameter name="intersection">
-            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          <parameter name="n_sizes">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="region_intersect"
-              c:identifier="gtk_widget_region_intersect">
+    </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="Gdk.Region" c:type="GdkRegion*"/>
+          <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="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="region">
-            <type name="Gdk.Region" c:type="GdkRegion*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="freeze_child_notify"
-              c:identifier="gtk_widget_freeze_child_notify">
+      </constructor>
+      <method name="free" c:identifier="gtk_icon_source_free">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="child_notify" c:identifier="gtk_widget_child_notify">
+      <method name="set_filename" c:identifier="gtk_icon_source_set_filename">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
-          <parameter name="child_property">
+          <parameter name="filename">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="thaw_child_notify"
-              c:identifier="gtk_widget_thaw_child_notify">
+      <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="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
-        </parameters>
-      </method>
-      <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 name="icon_name" 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_pixbuf" c:identifier="gtk_icon_source_set_pixbuf">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+          <parameter name="pixbuf">
+            <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="grab_default" c:identifier="gtk_widget_grab_default">
+      <method name="get_filename" c:identifier="gtk_icon_source_get_filename">
         <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="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_name" c:identifier="gtk_widget_set_name">
+      <method name="get_icon_name"
+              c:identifier="gtk_icon_source_get_icon_name">
         <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="name">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_name" c:identifier="gtk_widget_get_name">
+      <method name="get_pixbuf" c:identifier="gtk_icon_source_get_pixbuf">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_state" c:identifier="gtk_widget_set_state">
+      <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="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
-          <parameter name="state">
-            <type name="StateType" c:type="GtkStateType"/>
+          <parameter name="setting">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_sensitive" c:identifier="gtk_widget_set_sensitive">
+      <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="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
-          <parameter name="sensitive">
+          <parameter name="setting">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_app_paintable"
-              c:identifier="gtk_widget_set_app_paintable">
+      <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="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
-          <parameter name="app_paintable">
+          <parameter name="setting">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_double_buffered"
-              c:identifier="gtk_widget_set_double_buffered">
+      <method name="get_size_wildcarded"
+              c:identifier="gtk_icon_source_get_size_wildcarded">
         <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 name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_redraw_on_allocate"
-              c:identifier="gtk_widget_set_redraw_on_allocate">
+      <method name="get_state_wildcarded"
+              c:identifier="gtk_icon_source_get_state_wildcarded">
         <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="redraw_on_allocate">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_parent" c:identifier="gtk_widget_set_parent">
+      <method name="get_direction_wildcarded"
+              c:identifier="gtk_icon_source_get_direction_wildcarded">
         <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="parent">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_parent_window"
-              c:identifier="gtk_widget_set_parent_window">
+      <method name="set_direction"
+              c:identifier="gtk_icon_source_set_direction">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
-          <parameter name="parent_window">
-            <type name="Gdk.Window" c:type="GdkWindow*"/>
+          <parameter name="direction">
+            <type name="TextDirection" c:type="GtkTextDirection"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_child_visible"
-              c:identifier="gtk_widget_set_child_visible">
+      <method name="set_state" c:identifier="gtk_icon_source_set_state">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
-          <parameter name="is_visible">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="state">
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_child_visible"
-              c:identifier="gtk_widget_get_child_visible">
+      <method name="set_size" c:identifier="gtk_icon_source_set_size">
         <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="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
+          </parameter>
+          <parameter name="size">
+            <type name="IconSize" c:type="GtkIconSize"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="get_parent_window"
-              c:identifier="gtk_widget_get_parent_window">
+      <method name="get_direction"
+              c:identifier="gtk_icon_source_get_direction">
         <return-value>
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
+          <type name="TextDirection" c:type="GtkTextDirection"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="child_focus" c:identifier="gtk_widget_child_focus">
+      <method name="get_state" c:identifier="gtk_icon_source_get_state">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="StateType" c:type="GtkStateType"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="direction">
-            <type name="DirectionType" c:type="GtkDirectionType"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="keynav_failed" c:identifier="gtk_widget_keynav_failed">
+      <method name="get_size" c:identifier="gtk_icon_source_get_size">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="IconSize" c:type="GtkIconSize"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="direction">
-            <type name="DirectionType" c:type="GtkDirectionType"/>
+          <parameter name="source">
+            <type name="IconSource" c:type="GtkIconSource*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="error_bell" c:identifier="gtk_widget_error_bell">
+    </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="none" c:type="void"/>
+          <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="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="screen">
+            <type name="Gdk.Screen" c:type="GdkScreen*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_size_request"
-              c:identifier="gtk_widget_set_size_request">
+      </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="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="settings">
+            <type name="Settings" c:type="GtkSettings*"/>
           </parameter>
-          <parameter name="width">
-            <type name="int" c:type="gint"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="height">
-            <type name="int" c:type="gint"/>
+          <parameter name="svalue">
+            <type name="SettingsValue" c:type="GtkSettingsValue*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_size_request"
-              c:identifier="gtk_widget_get_size_request">
+      <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="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="settings">
+            <type name="Settings" c:type="GtkSettings*"/>
           </parameter>
-          <parameter name="width" direction="out">
-            <type name="int" c:type="gint*"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="height" direction="out">
-            <type name="int" c:type="gint*"/>
+          <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_uposition" c:identifier="gtk_widget_set_uposition">
+      <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="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="settings">
+            <type name="Settings" c:type="GtkSettings*"/>
           </parameter>
-          <parameter name="x">
-            <type name="int" c:type="gint"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="y">
-            <type name="int" c:type="gint"/>
+          <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_usize" c:identifier="gtk_widget_set_usize">
+      <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="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="settings">
+            <type name="Settings" c:type="GtkSettings*"/>
           </parameter>
-          <parameter name="width">
-            <type name="int" c:type="gint"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="height">
-            <type name="int" c:type="gint"/>
+          <parameter name="v_double">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+          <parameter name="origin">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_events" c:identifier="gtk_widget_set_events">
+      <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="boolean" c:type="gboolean"/>
+      </return-value>
+      <parameters>
+        <parameter name="pspec">
+          <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
+        </parameter>
+        <parameter name="rc_string">
+          <type name="GObject.String" c:type="GString*"/>
+        </parameter>
+        <parameter name="property_value">
+          <type name="GObject.Value" c:type="GValue*"/>
+        </parameter>
+      </parameters>
+    </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="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="type">
+            <type name="GObject.Type" c:type="GType"/>
           </parameter>
-          <parameter name="events">
-            <type name="int" c:type="gint"/>
+          <parameter name="first_property_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="add_events" c:identifier="gtk_widget_add_events">
+      </constructor>
+      <constructor name="ref" c:identifier="gtk_widget_ref">
         <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="events">
-            <type name="int" c:type="gint"/>
-          </parameter>
         </parameters>
-      </method>
-      <method name="set_extension_events"
-              c:identifier="gtk_widget_set_extension_events">
+      </constructor>
+      <constructor name="get_parent" c:identifier="gtk_widget_get_parent">
         <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="mode">
-            <type name="Gdk.ExtensionMode" c:type="GdkExtensionMode"/>
-          </parameter>
         </parameters>
-      </method>
-      <method name="get_extension_events"
-              c:identifier="gtk_widget_get_extension_events">
+      </constructor>
+      <constructor name="get_toplevel" c:identifier="gtk_widget_get_toplevel">
         <return-value>
-          <type name="Gdk.ExtensionMode" c:type="GdkExtensionMode"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_colormap" c:identifier="gtk_widget_get_colormap">
+      </constructor>
+      <constructor name="get_ancestor" c:identifier="gtk_widget_get_ancestor">
         <return-value>
-          <type name="Gdk.Colormap" c:type="GdkColormap*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </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>
-      </method>
-      <method name="get_visual" c:identifier="gtk_widget_get_visual">
+      </constructor>
+      <method name="destroy" c:identifier="gtk_widget_destroy">
         <return-value>
-          <type name="Gdk.Visual" c:type="GdkVisual*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -6848,19 +7103,22 @@
           </parameter>
         </parameters>
       </method>
-      <method name="get_screen" c:identifier="gtk_widget_get_screen">
+      <method name="destroyed" c:identifier="gtk_widget_destroyed">
         <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>
+          <parameter name="widget_pointer">
+            <type name="Widget" c:type="GtkWidget**"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="has_screen" c:identifier="gtk_widget_has_screen">
+      <method name="unref" c:identifier="gtk_widget_unref">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -6868,19 +7126,22 @@
           </parameter>
         </parameters>
       </method>
-      <method name="get_display" c:identifier="gtk_widget_get_display">
+      <method name="set" c:identifier="gtk_widget_set">
         <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>
+          <parameter name="first_property_name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="get_root_window" c:identifier="gtk_widget_get_root_window">
+      <method name="unparent" c:identifier="gtk_widget_unparent">
         <return-value>
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -6888,9 +7149,9 @@
           </parameter>
         </parameters>
       </method>
-      <method name="get_settings" c:identifier="gtk_widget_get_settings">
+      <method name="show" c:identifier="gtk_widget_show">
         <return-value>
-          <type name="Settings" c:type="GtkSettings*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -6898,22 +7159,19 @@
           </parameter>
         </parameters>
       </method>
-      <method name="get_clipboard" c:identifier="gtk_widget_get_clipboard">
+      <method name="show_now" c:identifier="gtk_widget_show_now">
         <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">
+      <method name="hide" c:identifier="gtk_widget_hide">
         <return-value>
-          <type name="Atk.Object" c:type="AtkObject*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -6921,7 +7179,7 @@
           </parameter>
         </parameters>
       </method>
-      <method name="set_colormap" c:identifier="gtk_widget_set_colormap">
+      <method name="show_all" c:identifier="gtk_widget_show_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -6929,14 +7187,11 @@
           <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">
+      <method name="hide_all" c:identifier="gtk_widget_hide_all">
         <return-value>
-          <type name="int" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -6944,7 +7199,7 @@
           </parameter>
         </parameters>
       </method>
-      <method name="get_pointer" c:identifier="gtk_widget_get_pointer">
+      <method name="set_no_show_all" c:identifier="gtk_widget_set_no_show_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -6952,15 +7207,12 @@
           <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 name="no_show_all">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="is_ancestor" c:identifier="gtk_widget_is_ancestor">
+      <method name="get_no_show_all" c:identifier="gtk_widget_get_no_show_all">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -6968,40 +7220,21 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="ancestor">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="translate_coordinates"
-              c:identifier="gtk_widget_translate_coordinates">
+      <method name="map" c:identifier="gtk_widget_map">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="src_widget">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
-          <parameter name="dest_widget">
+          <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="src_x">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="src_y">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="dest_x" direction="out">
-            <type name="int" c:type="gint*"/>
-          </parameter>
-          <parameter name="dest_y" direction="out">
-            <type name="int" c:type="gint*"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="hide_on_delete" c:identifier="gtk_widget_hide_on_delete">
+      <method name="unmap" c:identifier="gtk_widget_unmap">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7009,7 +7242,7 @@
           </parameter>
         </parameters>
       </method>
-      <method name="set_style" c:identifier="gtk_widget_set_style">
+      <method name="realize" c:identifier="gtk_widget_realize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7017,12 +7250,9 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="style" allow-none="1">
-            <type name="Style" c:type="GtkStyle*"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="ensure_style" c:identifier="gtk_widget_ensure_style">
+      <method name="unrealize" c:identifier="gtk_widget_unrealize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7032,9 +7262,9 @@
           </parameter>
         </parameters>
       </method>
-      <method name="get_style" c:identifier="gtk_widget_get_style">
+      <method name="queue_draw" c:identifier="gtk_widget_queue_draw">
         <return-value>
-          <type name="Style" c:type="GtkStyle*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7042,7 +7272,7 @@
           </parameter>
         </parameters>
       </method>
-      <method name="modify_style" c:identifier="gtk_widget_modify_style">
+      <method name="queue_draw_area" c:identifier="gtk_widget_queue_draw_area">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7050,15 +7280,23 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="style">
-            <type name="RcStyle" c:type="GtkRcStyle*"/>
+          <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>
-      <method name="get_modifier_style"
-              c:identifier="gtk_widget_get_modifier_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="widget">
@@ -7066,7 +7304,8 @@
           </parameter>
         </parameters>
       </method>
-      <method name="modify_fg" c:identifier="gtk_widget_modify_fg">
+      <method name="queue_clear_area"
+              c:identifier="gtk_widget_queue_clear_area">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7074,15 +7313,21 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="state">
-            <type name="StateType" c:type="GtkStateType"/>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="color" allow-none="1">
-            <type name="Gdk.Color" c:type="GdkColor*"/>
+          <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>
-      <method name="modify_bg" c:identifier="gtk_widget_modify_bg">
+      <method name="queue_resize" c:identifier="gtk_widget_queue_resize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7090,15 +7335,10 @@
           <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="modify_text" c:identifier="gtk_widget_modify_text">
+      <method name="queue_resize_no_redraw"
+              c:identifier="gtk_widget_queue_resize_no_redraw">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7106,15 +7346,9 @@
           <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="modify_base" c:identifier="gtk_widget_modify_base">
+      <method name="draw" c:identifier="gtk_widget_draw">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7122,15 +7356,12 @@
           <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 name="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="modify_cursor" c:identifier="gtk_widget_modify_cursor">
+      <method name="size_request" c:identifier="gtk_widget_size_request">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7138,15 +7369,12 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="primary">
-            <type name="Gdk.Color" c:type="GdkColor*"/>
-          </parameter>
-          <parameter name="secondary">
-            <type name="Gdk.Color" c:type="GdkColor*"/>
+          <parameter name="requisition">
+            <type name="Requisition" c:type="GtkRequisition*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="modify_font" c:identifier="gtk_widget_modify_font">
+      <method name="size_allocate" c:identifier="gtk_widget_size_allocate">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7154,68 +7382,71 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="font_desc" allow-none="1">
-            <type name="Pango.FontDescription" c:type="PangoFontDescription*"/>
+          <parameter name="allocation">
+            <type name="Allocation" c:type="GtkAllocation*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="create_pango_context"
-              c:identifier="gtk_widget_create_pango_context">
+      <method name="get_child_requisition"
+              c:identifier="gtk_widget_get_child_requisition">
         <return-value>
-          <type name="Pango.Context" c:type="PangoContext*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_pango_context"
-              c:identifier="gtk_widget_get_pango_context">
-        <return-value>
-          <type name="Pango.Context" c:type="PangoContext*"/>
-        </return-value>
-        <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="requisition">
+            <type name="Requisition" c:type="GtkRequisition*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="create_pango_layout"
-              c:identifier="gtk_widget_create_pango_layout">
+      <method name="add_accelerator" c:identifier="gtk_widget_add_accelerator">
         <return-value>
-          <type name="Pango.Layout" c:type="PangoLayout*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="text">
+          <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="render_icon" c:identifier="gtk_widget_render_icon">
+      <method name="remove_accelerator"
+              c:identifier="gtk_widget_remove_accelerator">
         <return-value>
-          <type name="Pixbuf.Pixbuf" 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 name="accel_group">
+            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
-          <parameter name="size">
-            <type name="IconSize" c:type="GtkIconSize"/>
+          <parameter name="accel_key">
+            <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="detail" allow-none="1">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="accel_mods">
+            <type name="Gdk.ModifierType" c:type="GdkModifierType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_composite_name"
-              c:identifier="gtk_widget_set_composite_name">
+      <method name="set_accel_path" c:identifier="gtk_widget_set_accel_path">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7223,25 +7454,18 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="name">
+          <parameter name="accel_path" allow-none="1">
             <type name="string" c:type="gchar*"/>
           </parameter>
-        </parameters>
-      </method>
-      <method name="get_composite_name"
-              c:identifier="gtk_widget_get_composite_name">
-        <return-value>
-          <type name="string" c:type="gchar*"/>
-        </return-value>
-        <parameters>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="accel_group" allow-none="1">
+            <type name="AccelGroup" c:type="GtkAccelGroup*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="reset_rc_styles" c:identifier="gtk_widget_reset_rc_styles">
+      <method name="list_accel_closures"
+              c:identifier="gtk_widget_list_accel_closures">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7249,60 +7473,61 @@
           </parameter>
         </parameters>
       </method>
-      <method name="style_get_property"
-              c:identifier="gtk_widget_style_get_property">
+      <method name="can_activate_accel"
+              c:identifier="gtk_widget_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="property_name">
-            <type name="string" c:type="gchar*"/>
-          </parameter>
-          <parameter name="value">
-            <type name="GObject.Value" c:type="GValue*"/>
+          <parameter name="signal_id">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="style_get" c:identifier="gtk_widget_style_get">
+      <method name="mnemonic_activate"
+              c:identifier="gtk_widget_mnemonic_activate">
         <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="group_cycling">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_direction" c:identifier="gtk_widget_set_direction">
+      <method name="event" c:identifier="gtk_widget_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.Event" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_direction" c:identifier="gtk_widget_get_direction">
+      <method name="send_expose" c:identifier="gtk_widget_send_expose">
         <return-value>
-          <type name="TextDirection" c:type="GtkTextDirection"/>
+          <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="is_composited" c:identifier="gtk_widget_is_composited">
+      <method name="activate" c:identifier="gtk_widget_activate">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -7312,28 +7537,24 @@
           </parameter>
         </parameters>
       </method>
-      <method name="shape_combine_mask"
-              c:identifier="gtk_widget_shape_combine_mask">
+      <method name="set_scroll_adjustments"
+              c:identifier="gtk_widget_set_scroll_adjustments">
         <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.Bitmap" c:type="GdkBitmap*"/>
-          </parameter>
-          <parameter name="offset_x">
-            <type name="int" c:type="gint"/>
+          <parameter name="hadjustment" allow-none="1">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
-          <parameter name="offset_y">
-            <type name="int" c:type="gint"/>
+          <parameter name="vadjustment" allow-none="1">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="input_shape_combine_mask"
-              c:identifier="gtk_widget_input_shape_combine_mask">
+      <method name="reparent" c:identifier="gtk_widget_reparent">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7341,69 +7562,45 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <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="reset_shapes" c:identifier="gtk_widget_reset_shapes">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="widget">
+          <parameter name="new_parent">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="path" c:identifier="gtk_widget_path">
+      <method name="intersect" c:identifier="gtk_widget_intersect">
         <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="uint" c:type="guint*"/>
-          </parameter>
-          <parameter name="path" direction="out">
-            <type name="GLib.char" c:type="gchar**"/>
+          <parameter name="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
-          <parameter name="path_reversed" direction="out">
-            <type name="GLib.char" c:type="gchar**"/>
+          <parameter name="intersection">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="class_path" c:identifier="gtk_widget_class_path">
+      <method name="region_intersect"
+              c:identifier="gtk_widget_region_intersect">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Gdk.Region" c:type="GdkRegion*"/>
         </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 name="region">
+            <type name="Gdk.Region" c:type="GdkRegion*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="list_mnemonic_labels"
-              c:identifier="gtk_widget_list_mnemonic_labels">
+      <method name="freeze_child_notify"
+              c:identifier="gtk_widget_freeze_child_notify">
         <return-value>
-          <type name="GLib.List" c:type="GList*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7411,8 +7608,7 @@
           </parameter>
         </parameters>
       </method>
-      <method name="add_mnemonic_label"
-              c:identifier="gtk_widget_add_mnemonic_label">
+      <method name="child_notify" c:identifier="gtk_widget_child_notify">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7420,13 +7616,13 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="label">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="child_property">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="remove_mnemonic_label"
-              c:identifier="gtk_widget_remove_mnemonic_label">
+      <method name="thaw_child_notify"
+              c:identifier="gtk_widget_thaw_child_notify">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7434,29 +7630,21 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="label">
-            <type name="Widget" c:type="GtkWidget*"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="set_tooltip_window"
-              c:identifier="gtk_widget_set_tooltip_window">
+      <method name="is_focus" c:identifier="gtk_widget_is_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="custom_window">
-            <type name="Window" c:type="GtkWindow*"/>
-          </parameter>
         </parameters>
       </method>
-      <method name="get_tooltip_window"
-              c:identifier="gtk_widget_get_tooltip_window">
+      <method name="grab_focus" c:identifier="gtk_widget_grab_focus">
         <return-value>
-          <type name="Window" c:type="GtkWindow*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="widget">
@@ -7464,8 +7652,7 @@
           </parameter>
         </parameters>
       </method>
-      <method name="trigger_tooltip_query"
-              c:identifier="gtk_widget_trigger_tooltip_query">
+      <method name="grab_default" c:identifier="gtk_widget_grab_default">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7475,8 +7662,7 @@
           </parameter>
         </parameters>
       </method>
-      <method name="set_tooltip_text"
-              c:identifier="gtk_widget_set_tooltip_text">
+      <method name="set_name" c:identifier="gtk_widget_set_name">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7484,13 +7670,12 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="text">
+          <parameter name="name">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_tooltip_text"
-              c:identifier="gtk_widget_get_tooltip_text">
+      <method name="get_name" c:identifier="gtk_widget_get_name">
         <return-value>
           <type name="string" c:type="gchar*"/>
         </return-value>
@@ -7500,8 +7685,7 @@
           </parameter>
         </parameters>
       </method>
-      <method name="set_tooltip_markup"
-              c:identifier="gtk_widget_set_tooltip_markup">
+      <method name="set_state" c:identifier="gtk_widget_set_state">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7509,23 +7693,26 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="markup">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="state">
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_tooltip_markup"
-              c:identifier="gtk_widget_get_tooltip_markup">
+      <method name="set_sensitive" c:identifier="gtk_widget_set_sensitive">
         <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="sensitive">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="set_has_tooltip" c:identifier="gtk_widget_set_has_tooltip">
+      <method name="set_app_paintable"
+              c:identifier="gtk_widget_set_app_paintable">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7533,102 +7720,40 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="has_tooltip">
+          <parameter name="app_paintable">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_has_tooltip" c:identifier="gtk_widget_get_has_tooltip">
+      <method name="set_double_buffered"
+              c:identifier="gtk_widget_set_double_buffered">
         <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="double_buffered">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="get_action" c:identifier="gtk_widget_get_action">
+      <method name="set_redraw_on_allocate"
+              c:identifier="gtk_widget_set_redraw_on_allocate">
         <return-value>
-          <type name="Action" c:type="GtkAction*"/>
+          <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>
       </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="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">
+      <method name="set_parent" c:identifier="gtk_widget_set_parent">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7636,15 +7761,13 @@
           <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 name="parent">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="show" c:type="show">
+      </method>
+      <method name="set_parent_window"
+              c:identifier="gtk_widget_set_parent_window">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7652,9 +7775,13 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="parent_window">
+            <type name="Gdk.Window" c:type="GdkWindow*"/>
+          </parameter>
         </parameters>
-      </callback>
-      <callback name="show_all" c:type="show_all">
+      </method>
+      <method name="set_child_visible"
+              c:identifier="gtk_widget_set_child_visible">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7662,49 +7789,60 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
+          <parameter name="is_visible">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
         </parameters>
-      </callback>
-      <callback name="hide" c:type="hide">
+      </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">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="hide_all" c:type="hide_all">
+      </method>
+      <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>
         </parameters>
-      </callback>
-      <callback name="map" c:type="map">
+      </method>
+      <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>
-      </callback>
-      <callback name="unmap" c:type="unmap">
+      </method>
+      <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="direction">
+            <type name="DirectionType" c:type="GtkDirectionType"/>
+          </parameter>
         </parameters>
-      </callback>
-      <callback name="realize" c:type="realize">
+      </method>
+      <method name="error_bell" c:identifier="gtk_widget_error_bell">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7713,8 +7851,9 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="unrealize" c:type="unrealize">
+      </method>
+      <method name="set_size_request"
+              c:identifier="gtk_widget_set_size_request">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7722,9 +7861,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>
-      </callback>
-      <callback name="size_request" c:type="size_request">
+      </method>
+      <method name="get_size_request"
+              c:identifier="gtk_widget_get_size_request">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7732,12 +7878,15 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="requisition">
-            <type name="Requisition" c:type="GtkRequisition*"/>
+          <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>
-      </callback>
-      <callback name="size_allocate" c:type="size_allocate">
+      </method>
+      <method name="set_uposition" c:identifier="gtk_widget_set_uposition">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7745,12 +7894,15 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="allocation">
-            <type name="Allocation" c:type="GtkAllocation*"/>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="state_changed" c:type="state_changed">
+      </method>
+      <method name="set_usize" c:identifier="gtk_widget_set_usize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7758,12 +7910,15 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="previous_state">
-            <type name="StateType" c:type="GtkStateType"/>
+          <parameter name="width">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="height">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="parent_set" c:type="parent_set">
+      </method>
+      <method name="set_events" c:identifier="gtk_widget_set_events">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7771,12 +7926,12 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="previous_parent">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="events">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="hierarchy_changed" c:type="hierarchy_changed">
+      </method>
+      <method name="add_events" c:identifier="gtk_widget_add_events">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7784,12 +7939,13 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="previous_toplevel">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="events">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="style_set" c:type="style_set">
+      </method>
+      <method name="set_extension_events"
+              c:identifier="gtk_widget_set_extension_events">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -7797,178 +7953,155 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="previous_style">
-            <type name="Style" c:type="GtkStyle*"/>
+          <parameter name="mode">
+            <type name="Gdk.ExtensionMode" c:type="GdkExtensionMode"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="direction_changed" c:type="direction_changed">
+      </method>
+      <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">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="previous_direction">
-            <type name="TextDirection" c:type="GtkTextDirection"/>
-          </parameter>
         </parameters>
-      </callback>
-      <callback name="grab_notify" c:type="grab_notify">
+      </method>
+      <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">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="was_grabbed">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
         </parameters>
-      </callback>
-      <callback name="child_notify" c:type="child_notify">
+      </method>
+      <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">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="pspec">
-            <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
-          </parameter>
         </parameters>
-      </callback>
-      <callback name="mnemonic_activate" c:type="mnemonic_activate">
+      </method>
+      <method name="get_screen" c:identifier="gtk_widget_get_screen">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Gdk.Screen" c:type="GdkScreen*"/>
         </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>
-      </callback>
-      <callback name="grab_focus" c:type="grab_focus">
+      </method>
+      <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">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="focus" c:type="focus">
+      </method>
+      <method name="get_display" c:identifier="gtk_widget_get_display">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Gdk.Display" c:type="GdkDisplay*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="direction">
-            <type name="DirectionType" c:type="GtkDirectionType"/>
-          </parameter>
         </parameters>
-      </callback>
-      <callback name="event" c:type="event">
+      </method>
+      <method name="get_root_window" c:identifier="gtk_widget_get_root_window">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Gdk.Window" c:type="GdkWindow*"/>
         </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>
-      </callback>
-      <callback name="button_press_event" c:type="button_press_event">
+      </method>
+      <method name="get_settings" c:identifier="gtk_widget_get_settings">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Settings" c:type="GtkSettings*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="event">
-            <type name="Gdk.EventButton" c:type="GdkEventButton*"/>
-          </parameter>
         </parameters>
-      </callback>
-      <callback name="button_release_event" c:type="button_release_event">
+      </method>
+      <method name="get_clipboard" c:identifier="gtk_widget_get_clipboard">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Clipboard" c:type="GtkClipboard*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="event">
-            <type name="Gdk.EventButton" c:type="GdkEventButton*"/>
+          <parameter name="selection">
+            <type name="Gdk.Atom" c:type="GdkAtom"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="scroll_event" c:type="scroll_event">
+      </method>
+      <method name="get_accessible" c:identifier="gtk_widget_get_accessible">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Atk.Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="event">
-            <type name="Gdk.EventScroll" c:type="GdkEventScroll*"/>
-          </parameter>
         </parameters>
-      </callback>
-      <callback name="motion_notify_event" c:type="motion_notify_event">
+      </method>
+      <method name="set_colormap" c:identifier="gtk_widget_set_colormap">
         <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.EventMotion" c:type="GdkEventMotion*"/>
+          <parameter name="colormap">
+            <type name="Gdk.Colormap" c:type="GdkColormap*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="delete_event" c:type="delete_event">
+      </method>
+      <method name="get_events" c:identifier="gtk_widget_get_events">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <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.EventAny" c:type="GdkEventAny*"/>
-          </parameter>
         </parameters>
-      </callback>
-      <callback name="destroy_event" c:type="destroy_event">
+      </method>
+      <method name="get_pointer" c:identifier="gtk_widget_get_pointer">
         <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.EventAny" c:type="GdkEventAny*"/>
+          <parameter name="x">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="expose_event" c:type="expose_event">
+      </method>
+      <method name="is_ancestor" c:identifier="gtk_widget_is_ancestor">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -7976,25 +8109,38 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="event">
-            <type name="Gdk.EventExpose" c:type="GdkEventExpose*"/>
+          <parameter name="ancestor">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="key_press_event" c:type="key_press_event">
+      </method>
+      <method name="translate_coordinates"
+              c:identifier="gtk_widget_translate_coordinates">
         <return-value>
           <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="event">
-            <type name="Gdk.EventKey" c:type="GdkEventKey*"/>
+          <parameter name="dest_widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="src_x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="src_y">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="dest_x" direction="out">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="dest_y" direction="out">
+            <type name="int" c:type="gint*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="key_release_event" c:type="key_release_event">
+      </method>
+      <method name="hide_on_delete" c:identifier="gtk_widget_hide_on_delete">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
@@ -8002,235 +8148,239 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="event">
-            <type name="Gdk.EventKey" c:type="GdkEventKey*"/>
-          </parameter>
         </parameters>
-      </callback>
-      <callback name="enter_notify_event" c:type="enter_notify_event">
+      </method>
+      <method name="set_style" c:identifier="gtk_widget_set_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="event">
-            <type name="Gdk.EventCrossing" c:type="GdkEventCrossing*"/>
+          <parameter name="style" allow-none="1">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="leave_notify_event" c:type="leave_notify_event">
+      </method>
+      <method name="ensure_style" c:identifier="gtk_widget_ensure_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="event">
-            <type name="Gdk.EventCrossing" c:type="GdkEventCrossing*"/>
-          </parameter>
         </parameters>
-      </callback>
-      <callback name="configure_event" c:type="configure_event">
+      </method>
+      <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="event">
-            <type name="Gdk.EventConfigure" c:type="GdkEventConfigure*"/>
-          </parameter>
         </parameters>
-      </callback>
-      <callback name="focus_in_event" c:type="focus_in_event">
+      </method>
+      <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="event">
-            <type name="Gdk.EventFocus" c:type="GdkEventFocus*"/>
+          <parameter name="style">
+            <type name="RcStyle" c:type="GtkRcStyle*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="focus_out_event" c:type="focus_out_event">
+      </method>
+      <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.EventFocus" c:type="GdkEventFocus*"/>
-          </parameter>
         </parameters>
-      </callback>
-      <callback name="map_event" c:type="map_event">
+      </method>
+      <method name="modify_fg" c:identifier="gtk_widget_modify_fg">
         <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.EventAny" c:type="GdkEventAny*"/>
+          <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>
-      </callback>
-      <callback name="unmap_event" c:type="unmap_event">
+      </method>
+      <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="event">
-            <type name="Gdk.EventAny" c:type="GdkEventAny*"/>
+          <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>
-      </callback>
-      <callback name="property_notify_event" c:type="property_notify_event">
+      </method>
+      <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="event">
-            <type name="Gdk.EventProperty" c:type="GdkEventProperty*"/>
+          <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>
-      </callback>
-      <callback name="selection_clear_event" c:type="selection_clear_event">
+      </method>
+      <method name="modify_base" c:identifier="gtk_widget_modify_base">
         <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.EventSelection" c:type="GdkEventSelection*"/>
+          <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>
-      </callback>
-      <callback name="selection_request_event"
-                c:type="selection_request_event">
+      </method>
+      <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="event">
-            <type name="Gdk.EventSelection" c:type="GdkEventSelection*"/>
+          <parameter name="primary">
+            <type name="Gdk.Color" c:type="GdkColor*"/>
+          </parameter>
+          <parameter name="secondary">
+            <type name="Gdk.Color" c:type="GdkColor*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="selection_notify_event" c:type="selection_notify_event">
+      </method>
+      <method name="modify_font" c:identifier="gtk_widget_modify_font">
         <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.EventSelection" c:type="GdkEventSelection*"/>
+          <parameter name="font_desc" allow-none="1">
+            <type name="Pango.FontDescription" c:type="PangoFontDescription*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="proximity_in_event" c:type="proximity_in_event">
+      </method>
+      <method name="create_pango_context"
+              c:identifier="gtk_widget_create_pango_context">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Pango.Context" c:type="PangoContext*"/>
         </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>
-      </callback>
-      <callback name="proximity_out_event" c:type="proximity_out_event">
+      </method>
+      <method name="get_pango_context"
+              c:identifier="gtk_widget_get_pango_context">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Pango.Context" c:type="PangoContext*"/>
         </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>
-      </callback>
-      <callback name="visibility_notify_event"
-                c:type="visibility_notify_event">
+      </method>
+      <method name="create_pango_layout"
+              c:identifier="gtk_widget_create_pango_layout">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Pango.Layout" c:type="PangoLayout*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="event">
-            <type name="Gdk.EventVisibility" c:type="GdkEventVisibility*"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="client_event" c:type="client_event">
+      </method>
+      <method name="render_icon" c:identifier="gtk_widget_render_icon">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="event">
-            <type name="Gdk.EventClient" c:type="GdkEventClient*"/>
+          <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>
-      </callback>
-      <callback name="no_expose_event" c:type="no_expose_event">
+      </method>
+      <method name="set_composite_name"
+              c:identifier="gtk_widget_set_composite_name">
         <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.EventAny" c:type="GdkEventAny*"/>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="window_state_event" c:type="window_state_event">
+      </method>
+      <method name="get_composite_name"
+              c:identifier="gtk_widget_get_composite_name">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </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>
-      </callback>
-      <callback name="selection_get" c:type="selection_get">
+      </method>
+      <method name="reset_rc_styles" c:identifier="gtk_widget_reset_rc_styles">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8238,18 +8388,10 @@
           <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="uint" c:type="guint"/>
-          </parameter>
-          <parameter name="time_">
-            <type name="uint" c:type="guint"/>
-          </parameter>
         </parameters>
-      </callback>
-      <callback name="selection_received" c:type="selection_received">
+      </method>
+      <method name="style_get_property"
+              c:identifier="gtk_widget_style_get_property">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8257,15 +8399,15 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="selection_data">
-            <type name="SelectionData" c:type="GtkSelectionData*"/>
+          <parameter name="property_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="time_">
-            <type name="uint" c:type="guint"/>
+          <parameter name="value">
+            <type name="GObject.Value" c:type="GValue*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="drag_begin" c:type="drag_begin">
+      </method>
+      <method name="style_get" c:identifier="gtk_widget_style_get">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8273,12 +8415,12 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="context">
-            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+          <parameter name="first_property_name">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="drag_end" c:type="drag_end">
+      </method>
+      <method name="set_direction" c:identifier="gtk_widget_set_direction">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8286,47 +8428,33 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="context">
-            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+          <parameter name="dir">
+            <type name="TextDirection" c:type="GtkTextDirection"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="drag_data_get" c:type="drag_data_get">
+      </method>
+      <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="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="uint" c:type="guint"/>
-          </parameter>
-          <parameter name="time_">
-            <type name="uint" c:type="guint"/>
-          </parameter>
         </parameters>
-      </callback>
-      <callback name="drag_data_delete" c:type="drag_data_delete">
+      </method>
+      <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="context">
-            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
-          </parameter>
         </parameters>
-      </callback>
-      <callback name="drag_leave" c:type="drag_leave">
+      </method>
+      <method name="shape_combine_mask"
+              c:identifier="gtk_widget_shape_combine_mask">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8334,59 +8462,67 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="context">
-            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+          <parameter name="shape_mask">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
           </parameter>
-          <parameter name="time_">
-            <type name="uint" c:type="guint"/>
+          <parameter name="offset_x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="offset_y">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="drag_motion" c:type="drag_motion">
+      </method>
+      <method name="input_shape_combine_mask"
+              c:identifier="gtk_widget_input_shape_combine_mask">
         <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="context">
-            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+          <parameter name="shape_mask" allow-none="1">
+            <type name="Gdk.Bitmap" c:type="GdkBitmap*"/>
           </parameter>
-          <parameter name="x">
+          <parameter name="offset_x">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="y">
+          <parameter name="offset_y">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="time_">
-            <type name="uint" c:type="guint"/>
-          </parameter>
         </parameters>
-      </callback>
-      <callback name="drag_drop" c:type="drag_drop">
+      </method>
+      <method name="reset_shapes" c:identifier="gtk_widget_reset_shapes">
         <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="context">
-            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+        </parameters>
+      </method>
+      <method name="path" c:identifier="gtk_widget_path">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="x">
-            <type name="int" c:type="gint"/>
+          <parameter name="path_length" direction="out">
+            <type name="uint" c:type="guint*"/>
           </parameter>
-          <parameter name="y">
-            <type name="int" c:type="gint"/>
+          <parameter name="path" direction="out">
+            <type name="GLib.char" c:type="gchar**"/>
           </parameter>
-          <parameter name="time_">
-            <type name="uint" c:type="guint"/>
+          <parameter name="path_reversed" direction="out">
+            <type name="GLib.char" c:type="gchar**"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="drag_data_received" c:type="drag_data_received">
+      </method>
+      <method name="class_path" c:identifier="gtk_widget_class_path">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8394,60 +8530,58 @@
           <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 name="path_length" direction="out">
+            <type name="uint" c:type="guint*"/>
           </parameter>
-          <parameter name="info">
-            <type name="uint" c:type="guint"/>
+          <parameter name="path" direction="out">
+            <type name="GLib.char" c:type="gchar**"/>
           </parameter>
-          <parameter name="time_">
-            <type name="uint" c:type="guint"/>
+          <parameter name="path_reversed" direction="out">
+            <type name="GLib.char" c:type="gchar**"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="popup_menu" c:type="popup_menu">
+      </method>
+      <method name="list_mnemonic_labels"
+              c:identifier="gtk_widget_list_mnemonic_labels">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="show_help" c:type="show_help">
+      </method>
+      <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="help_type">
-            <type name="WidgetHelpType" c:type="GtkWidgetHelpType"/>
+          <parameter name="label">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_accessible" c:type="get_accessible">
+      </method>
+      <method name="remove_mnemonic_label"
+              c:identifier="gtk_widget_remove_mnemonic_label">
         <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>
+          <parameter name="label">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
         </parameters>
-      </callback>
-      <callback name="screen_changed" c:type="screen_changed">
+      </method>
+      <method name="set_tooltip_window"
+              c:identifier="gtk_widget_set_tooltip_window">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -8455,797 +8589,2793 @@
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="previous_screen">
-            <type name="Gdk.Screen" c:type="GdkScreen*"/>
+          <parameter name="custom_window">
+            <type name="Window" c:type="GtkWindow*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="can_activate_accel" c:type="can_activate_accel">
+      </method>
+      <method name="get_tooltip_window"
+              c:identifier="gtk_widget_get_tooltip_window">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Window" c:type="GtkWindow*"/>
         </return-value>
         <parameters>
           <parameter name="widget">
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="signal_id">
-            <type name="uint" c:type="guint"/>
+        </parameters>
+      </method>
+      <method name="trigger_tooltip_query"
+              c:identifier="gtk_widget_trigger_tooltip_query">
+        <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="grab_broken_event" c:type="grab_broken_event">
+      </method>
+      <method name="set_tooltip_text"
+              c:identifier="gtk_widget_set_tooltip_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="event">
-            <type name="Gdk.EventGrabBroken" c:type="GdkEventGrabBroken*"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="composited_changed" c:type="composited_changed">
+      </method>
+      <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>
         </parameters>
-      </callback>
-      <callback name="query_tooltip" c:type="query_tooltip">
+      </method>
+      <method name="set_tooltip_markup"
+              c:identifier="gtk_widget_set_tooltip_markup">
         <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="x">
-            <type name="int" c:type="gint"/>
+          <parameter name="markup">
+            <type name="string" c:type="gchar*"/>
           </parameter>
-          <parameter name="y">
-            <type name="int" c:type="gint"/>
+        </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>
-          <parameter name="keyboard_tooltip">
+        </parameters>
+      </method>
+      <method name="set_has_tooltip" c:identifier="gtk_widget_set_has_tooltip">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="has_tooltip">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="tooltip">
-            <type name="Tooltip" c:type="GtkTooltip*"/>
+        </parameters>
+      </method>
+      <method name="get_has_tooltip" c:identifier="gtk_widget_get_has_tooltip">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="gtk_reserved5" c:type="_gtk_reserved5">
+      </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>
+        </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="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="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>
       </callback>
-      <callback name="gtk_reserved6" c:type="_gtk_reserved6">
+      <callback name="show" c:type="show">
         <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="gtk_reserved7" c:type="_gtk_reserved7">
+      <callback name="show_all" c:type="show_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <glib:signal name="realize">
+      <callback name="hide" c:type="hide">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="unrealize">
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="hide_all" c:type="hide_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="show">
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="map" c:type="map">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="hide">
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="unmap" c:type="unmap">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="map">
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="realize" c:type="realize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="unmap">
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="unrealize" c:type="unrealize">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="size-request">
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="size_request" c:type="size_request">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Requisition" c:type="GtkRequisition"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="requisition">
+            <type name="Requisition" c:type="GtkRequisition*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="size-allocate">
+      </callback>
+      <callback name="size_allocate" c:type="size_allocate">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Rectangle" c:type="GdkRectangle"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="allocation">
+            <type name="Allocation" c:type="GtkAllocation*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="state-changed">
+      </callback>
+      <callback name="state_changed" c:type="state_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="previous_state">
             <type name="StateType" c:type="GtkStateType"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="parent-set">
+      </callback>
+      <callback name="parent_set" c:type="parent_set">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Widget" c:type="GtkWidget"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="previous_parent">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="hierarchy-changed">
+      </callback>
+      <callback name="hierarchy_changed" c:type="hierarchy_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Widget" c:type="GtkWidget"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="previous_toplevel">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="style-set">
+      </callback>
+      <callback name="style_set" c:type="style_set">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Style" c:type="GtkStyle"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="previous_style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="direction-changed">
+      </callback>
+      <callback name="direction_changed" c:type="direction_changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="previous_direction">
             <type name="TextDirection" c:type="GtkTextDirection"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="grab-notify">
+      </callback>
+      <callback name="grab_notify" c:type="grab_notify">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="was_grabbed">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="child-notify">
+      </callback>
+      <callback name="child_notify" c:type="child_notify">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="GParam" c:type="GParam"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="pspec">
+            <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="mnemonic-activate">
+      </callback>
+      <callback name="mnemonic_activate" c:type="mnemonic_activate">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="group_cycling">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="grab-focus">
+      </callback>
+      <callback name="grab_focus" c:type="grab_focus">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="focus">
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="focus" c:type="focus">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="direction">
             <type name="DirectionType" c:type="GtkDirectionType"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="move-focus">
+      </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="object">
-            <type name="DirectionType" c:type="GtkDirectionType"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.Event" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="event">
+      </callback>
+      <callback name="button_press_event" c:type="button_press_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventButton" c:type="GdkEventButton*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="event-after">
+      </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="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventButton" c:type="GdkEventButton*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="button-press-event">
+      </callback>
+      <callback name="scroll_event" c:type="scroll_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventScroll" c:type="GdkEventScroll*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="button-release-event">
+      </callback>
+      <callback name="motion_notify_event" c:type="motion_notify_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventMotion" c:type="GdkEventMotion*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="scroll-event">
+      </callback>
+      <callback name="delete_event" c:type="delete_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventAny" c:type="GdkEventAny*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="motion-notify-event">
+      </callback>
+      <callback name="destroy_event" c:type="destroy_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventAny" c:type="GdkEventAny*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="composited-changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="keynav-failed">
+      </callback>
+      <callback name="expose_event" c:type="expose_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="DirectionType" c:type="GtkDirectionType"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventExpose" c:type="GdkEventExpose*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="delete-event">
+      </callback>
+      <callback name="key_press_event" c:type="key_press_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventKey" c:type="GdkEventKey*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="destroy-event">
+      </callback>
+      <callback name="key_release_event" c:type="key_release_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventKey" c:type="GdkEventKey*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="expose-event">
+      </callback>
+      <callback name="enter_notify_event" c:type="enter_notify_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventCrossing" c:type="GdkEventCrossing*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="key-press-event">
+      </callback>
+      <callback name="leave_notify_event" c:type="leave_notify_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventCrossing" c:type="GdkEventCrossing*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="key-release-event">
+      </callback>
+      <callback name="configure_event" c:type="configure_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventConfigure" c:type="GdkEventConfigure*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="enter-notify-event">
+      </callback>
+      <callback name="focus_in_event" c:type="focus_in_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventFocus" c:type="GdkEventFocus*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="leave-notify-event">
+      </callback>
+      <callback name="focus_out_event" c:type="focus_out_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventFocus" c:type="GdkEventFocus*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="configure-event">
+      </callback>
+      <callback name="map_event" c:type="map_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventAny" c:type="GdkEventAny*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="focus-in-event">
+      </callback>
+      <callback name="unmap_event" c:type="unmap_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventAny" c:type="GdkEventAny*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="focus-out-event">
+      </callback>
+      <callback name="property_notify_event" c:type="property_notify_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventProperty" c:type="GdkEventProperty*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="map-event">
+      </callback>
+      <callback name="selection_clear_event" c:type="selection_clear_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventSelection" c:type="GdkEventSelection*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="unmap-event">
+      </callback>
+      <callback name="selection_request_event"
+                c:type="selection_request_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventSelection" c:type="GdkEventSelection*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="property-notify-event">
+      </callback>
+      <callback name="selection_notify_event" c:type="selection_notify_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventSelection" c:type="GdkEventSelection*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="selection-clear-event">
+      </callback>
+      <callback name="proximity_in_event" c:type="proximity_in_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventProximity" c:type="GdkEventProximity*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="selection-request-event">
+      </callback>
+      <callback name="proximity_out_event" c:type="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 name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventProximity" c:type="GdkEventProximity*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="selection-notify-event">
+      </callback>
+      <callback name="visibility_notify_event"
+                c:type="visibility_notify_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventVisibility" c:type="GdkEventVisibility*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="selection-received">
+      </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="object">
-            <type name="SelectionData" c:type="GtkSelectionData"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="uint" c:type="guint"/>
+          <parameter name="event">
+            <type name="Gdk.EventClient" c:type="GdkEventClient*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="selection-get">
+      </callback>
+      <callback name="no_expose_event" c:type="no_expose_event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="SelectionData" c:type="GtkSelectionData"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="uint" c:type="guint"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="p1">
-            <type name="uint" c:type="guint"/>
+          <parameter name="event">
+            <type name="Gdk.EventAny" c:type="GdkEventAny*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="proximity-in-event">
+      </callback>
+      <callback name="window_state_event" c:type="window_state_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventWindowState" c:type="GdkEventWindowState*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="proximity-out-event">
+      </callback>
+      <callback name="selection_get" c:type="selection_get">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <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="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="time_">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="drag-leave">
+      </callback>
+      <callback name="selection_received" c:type="selection_received">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="p0">
+          <parameter name="selection_data">
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
+          </parameter>
+          <parameter name="time_">
             <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="drag-begin">
+      </callback>
+      <callback name="drag_begin" c:type="drag_begin">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="drag-end">
+      </callback>
+      <callback name="drag_end" c:type="drag_end">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="drag-data-delete">
+      </callback>
+      <callback name="drag_data_get" c:type="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 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="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="time_">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="drag-failed">
+      </callback>
+      <callback name="drag_data_delete" c:type="drag_data_delete">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="DragResult" c:type="GtkDragResult"/>
+          <parameter name="context">
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="drag-motion">
+      </callback>
+      <callback name="drag_leave" c:type="drag_leave">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <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="int" c:type="gint"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="p1">
-            <type name="int" c:type="gint"/>
+          <parameter name="context">
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
           </parameter>
-          <parameter name="p2">
+          <parameter name="time_">
             <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="drag-drop">
+      </callback>
+      <callback name="drag_motion" c:type="drag_motion">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="p0">
+          <parameter name="context">
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+          </parameter>
+          <parameter name="x">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="p1">
+          <parameter name="y">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="p2">
+          <parameter name="time_">
             <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="drag-data-get">
+      </callback>
+      <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="object">
-            <type name="Gdk.DragContext" c:type="GdkDragContext"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="SelectionData" c:type="GtkSelectionData"/>
+          <parameter name="context">
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
           </parameter>
-          <parameter name="p1">
-            <type name="uint" c:type="guint"/>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="p2">
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="time_">
             <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="drag-data-received">
+      </callback>
+      <callback name="drag_data_received" c:type="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 name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="p0">
+          <parameter name="context">
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
+          </parameter>
+          <parameter name="x">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="p1">
+          <parameter name="y">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="p2">
-            <type name="SelectionData" c:type="GtkSelectionData"/>
+          <parameter name="selection_data">
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
           </parameter>
-          <parameter name="p3">
+          <parameter name="info">
             <type name="uint" c:type="guint"/>
           </parameter>
-          <parameter name="p4">
+          <parameter name="time_">
             <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="visibility-notify-event">
+      </callback>
+      <callback name="popup_menu" c:type="popup_menu">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="client-event">
+      </callback>
+      <callback name="show_help" c:type="show_help">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="help_type">
+            <type name="WidgetHelpType" c:type="GtkWidgetHelpType"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="no-expose-event">
+      </callback>
+      <callback name="get_accessible" c:type="get_accessible">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="Atk.Object" c:type="AtkObject*"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="window-state-event">
+      </callback>
+      <callback name="screen_changed" c:type="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>
+      <callback name="can_activate_accel" c:type="can_activate_accel">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="signal_id">
+            <type name="uint" c:type="guint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="grab-broken-event">
+      </callback>
+      <callback name="grab_broken_event" c:type="grab_broken_event">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventGrabBroken" c:type="GdkEventGrabBroken*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="query-tooltip">
+      </callback>
+      <callback name="composited_changed" c:type="composited_changed">
+        <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="query_tooltip" c:type="query_tooltip">
         <return-value>
           <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="object">
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="x">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="p0">
+          <parameter name="y">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="p1">
+          <parameter name="keyboard_tooltip">
             <type name="boolean" c:type="gboolean"/>
           </parameter>
-          <parameter name="p2">
-            <type name="Tooltip" c:type="GtkTooltip"/>
+          <parameter name="tooltip">
+            <type name="Tooltip" c:type="GtkTooltip*"/>
           </parameter>
         </parameters>
+      </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="realize">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
       </glib:signal>
-      <glib:signal name="popup-menu">
+      <glib:signal name="unrealize">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
       </glib:signal>
-      <glib:signal name="show-help">
+      <glib:signal name="show">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <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="WidgetHelpType" c:type="GtkWidgetHelpType"/>
+            <type name="Requisition" c:type="GtkRequisition"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="accel-closures-changed">
+      <glib:signal name="size-allocate">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle"/>
+          </parameter>
+        </parameters>
       </glib:signal>
-      <glib:signal name="screen-changed">
+      <glib:signal name="state-changed">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="Gdk.Screen" c:type="GdkScreen"/>
+            <type name="StateType" c:type="GtkStateType"/>
           </parameter>
         </parameters>
       </glib:signal>
-      <glib:signal name="can-activate-accel">
+      <glib:signal name="parent-set">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="uint" c:type="guint"/>
+            <type name="Widget" c:type="GtkWidget"/>
           </parameter>
         </parameters>
       </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>
+      <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">
+        <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="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>
+      </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.Event" 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.Event" 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.Event" 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.Event" c:type="GdkEvent"/>
+          </parameter>
+        </parameters>
+      </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="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.Event" 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.Event" 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.Event" 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.Event" 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.Event" 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.Event" 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.Event" 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.Event" 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.Event" 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.Event" 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.Event" 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.Event" 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.Event" 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.Event" 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.Event" c:type="GdkEvent"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="selection-notify-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="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="uint" 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="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="proximity-in-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="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>
+      </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="uint" 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="int" c:type="gint"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="p2">
+            <type name="uint" 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="int" c:type="gint"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="p2">
+            <type name="uint" 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="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="p2">
+            <type name="uint" 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="int" c:type="gint"/>
+          </parameter>
+          <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>
+      </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.Event" 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.Event" 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.Event" 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.Event" 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.Event" 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="int" c:type="gint"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int" 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="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </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="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"/>
+        </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"/>
+        </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_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="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_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="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_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">
+          <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_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="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_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="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_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="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_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="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="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="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="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="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">
+        <parameter name="y">
+          <type name="int" 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="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>
+    <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"/>
+        </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="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="arrow_type">
+          <type name="ArrowType" c:type="GtkArrowType"/>
+        </parameter>
+        <parameter name="fill">
+          <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="width">
+          <type name="int" c:type="gint"/>
+        </parameter>
+        <parameter name="height">
+          <type name="int" 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="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>
+    <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="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>
+    <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*"/>
+        </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>
+    <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*"/>
+        </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*"/>
+        </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>
-    <function name="draw_vline" c:identifier="gtk_draw_vline">
+    <function name="paint_tab" c:identifier="gtk_paint_tab">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -9259,18 +11389,33 @@
         <parameter name="state_type">
           <type name="StateType" c:type="GtkStateType"/>
         </parameter>
-        <parameter name="y1_">
+        <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="y2_">
+        <parameter name="y">
           <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="x">
+        <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_shadow" c:identifier="gtk_draw_shadow">
+    <function name="paint_shadow_gap" c:identifier="gtk_paint_shadow_gap">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -9287,6 +11432,15 @@
         <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>
@@ -9299,9 +11453,18 @@
         <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="draw_polygon" c:identifier="gtk_draw_polygon">
+    <function name="paint_box_gap" c:identifier="gtk_paint_box_gap">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -9318,18 +11481,39 @@
         <parameter name="shadow_type">
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
-        <parameter name="points">
-          <type name="Gdk.Point" c:type="GdkPoint*"/>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="npoints">
+        <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="fill">
-          <type name="boolean" c:type="gboolean"/>
+        <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="draw_arrow" c:identifier="gtk_draw_arrow">
+    <function name="paint_extension" c:identifier="gtk_paint_extension">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -9346,11 +11530,14 @@
         <parameter name="shadow_type">
           <type name="ShadowType" c:type="GtkShadowType"/>
         </parameter>
-        <parameter name="arrow_type">
-          <type name="ArrowType" c:type="GtkArrowType"/>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="fill">
-          <type name="boolean" c:type="gboolean"/>
+        <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"/>
@@ -9364,9 +11551,12 @@
         <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_diamond" c:identifier="gtk_draw_diamond">
+    <function name="paint_focus" c:identifier="gtk_paint_focus">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -9380,8 +11570,14 @@
         <parameter name="state_type">
           <type name="StateType" c:type="GtkStateType"/>
         </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
+        <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"/>
@@ -9397,7 +11593,7 @@
         </parameter>
       </parameters>
     </function>
-    <function name="draw_box" c:identifier="gtk_draw_box">
+    <function name="paint_slider" c:identifier="gtk_paint_slider">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -9414,6 +11610,15 @@
         <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>
@@ -9426,9 +11631,12 @@
         <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_flat_box" c:identifier="gtk_draw_flat_box">
+    <function name="paint_handle" c:identifier="gtk_paint_handle">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -9445,6 +11653,15 @@
         <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>
@@ -9457,9 +11674,12 @@
         <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_check" c:identifier="gtk_draw_check">
+    <function name="paint_expander" c:identifier="gtk_paint_expander">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -9473,8 +11693,14 @@
         <parameter name="state_type">
           <type name="StateType" c:type="GtkStateType"/>
         </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
+        <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"/>
@@ -9482,15 +11708,12 @@
         <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 name="expander_style">
+          <type name="ExpanderStyle" c:type="GtkExpanderStyle"/>
         </parameter>
       </parameters>
     </function>
-    <function name="draw_option" c:identifier="gtk_draw_option">
+    <function name="paint_layout" c:identifier="gtk_paint_layout">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -9504,8 +11727,17 @@
         <parameter name="state_type">
           <type name="StateType" c:type="GtkStateType"/>
         </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
+        <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"/>
@@ -9513,15 +11745,12 @@
         <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 name="layout">
+          <type name="Pango.Layout" c:type="PangoLayout*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="draw_tab" c:identifier="gtk_draw_tab">
+    <function name="paint_resize_grip" c:identifier="gtk_paint_resize_grip">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -9535,8 +11764,17 @@
         <parameter name="state_type">
           <type name="StateType" c:type="GtkStateType"/>
         </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
+        <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"/>
@@ -9552,7 +11790,57 @@
         </parameter>
       </parameters>
     </function>
-    <function name="draw_shadow_gap" c:identifier="gtk_draw_shadow_gap">
+    <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="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="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>
+    <function name="draw_string" c:identifier="gtk_draw_string">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -9566,33 +11854,18 @@
         <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 name="string">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="draw_box_gap" c:identifier="gtk_draw_box_gap">
+    <function name="paint_string" c:identifier="gtk_paint_string">
       <return-value>
         <type name="none" c:type="void"/>
       </return-value>
@@ -9606,8 +11879,14 @@
         <parameter name="state_type">
           <type name="StateType" c:type="GtkStateType"/>
         </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
+        <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"/>
@@ -9615,1910 +11894,1768 @@
         <parameter name="y">
           <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="width">
-          <type name="int" c:type="gint"/>
+        <parameter name="string">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="height">
-          <type name="int" c:type="gint"/>
+      </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="gap_side">
-          <type name="PositionType" c:type="GtkPositionType"/>
+        <parameter name="drawable">
+          <type name="Gdk.Drawable" c:type="GdkDrawable*"/>
         </parameter>
-        <parameter name="gap_x">
-          <type name="int" c:type="gint"/>
+        <parameter name="area" allow-none="1">
+          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
         </parameter>
-        <parameter name="gap_width">
-          <type name="int" c:type="gint"/>
+        <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>
+    <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="factory">
+            <type name="IconFactory" c:type="GtkIconFactory*"/>
+          </parameter>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="icon_set">
+            <type name="IconSet" c:type="GtkIconSet*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="lookup" c:identifier="gtk_icon_factory_lookup">
+        <return-value>
+          <type name="IconSet" c:type="GtkIconSet*"/>
+        </return-value>
+        <parameters>
+          <parameter name="factory">
+            <type name="IconFactory" c:type="GtkIconFactory*"/>
+          </parameter>
+          <parameter name="stock_id">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="add_default" c:identifier="gtk_icon_factory_add_default">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="factory">
+            <type name="IconFactory" c:type="GtkIconFactory*"/>
+          </parameter>
+        </parameters>
+      </method>
+      <method name="remove_default"
+              c:identifier="gtk_icon_factory_remove_default">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="factory">
+            <type name="IconFactory" c:type="GtkIconFactory*"/>
+          </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>
+    <record name="RcContext" c:type="GtkRcContext"/>
+    <record name="RcStyleClass" c:type="GtkRcStyleClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <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*"/>
+        </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>
+    </record>
+    <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.SList" 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.SList" c:type="GSList*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="draw_extension" c:identifier="gtk_draw_extension">
+    <function name="rc_match_widget_class"
+              c:identifier="_gtk_rc_match_widget_class">
       <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="int" c:type="gint"/>
-        </parameter>
-        <parameter name="y">
-          <type name="int" c:type="gint"/>
+        <parameter name="list">
+          <type name="GLib.SList" c:type="GSList*"/>
         </parameter>
-        <parameter name="width">
+        <parameter name="length">
           <type name="int" c:type="gint"/>
         </parameter>
-        <parameter name="height">
-          <type name="int" c:type="gint"/>
+        <parameter name="path">
+          <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="gap_side">
-          <type name="PositionType" c:type="GtkPositionType"/>
+        <parameter name="path_reversed">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="draw_focus" c:identifier="gtk_draw_focus">
+    <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="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 name="filename">
+          <type name="string" c:type="gchar*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="draw_slider" c:identifier="gtk_draw_slider">
+    <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="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 name="filenames">
+          <type name="GLib.char" c:type="gchar**"/>
         </parameter>
       </parameters>
     </function>
-    <function name="draw_handle" c:identifier="gtk_draw_handle">
+    <function name="rc_get_default_files"
+              c:identifier="gtk_rc_get_default_files">
       <return-value>
-        <type name="none" c:type="void"/>
+        <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="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 name="widget">
+          <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="draw_expander" c:identifier="gtk_draw_expander">
+    <function name="rc_get_style_by_paths"
+              c:identifier="gtk_rc_get_style_by_paths">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Style" c:type="GtkStyle*"/>
       </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 name="settings">
+          <type name="Settings" c:type="GtkSettings*"/>
         </parameter>
-        <parameter name="x">
-          <type name="int" c:type="gint"/>
+        <parameter name="widget_path" allow-none="1">
+          <type name="string" c:type="char*"/>
         </parameter>
-        <parameter name="y">
-          <type name="int" c:type="gint"/>
+        <parameter name="class_path" allow-none="1">
+          <type name="string" c:type="char*"/>
         </parameter>
-        <parameter name="expander_style">
-          <type name="ExpanderStyle" c:type="GtkExpanderStyle"/>
+        <parameter name="type">
+          <type name="GObject.Type" c:type="GType"/>
         </parameter>
       </parameters>
     </function>
-    <function name="draw_layout" c:identifier="gtk_draw_layout">
+    <function name="rc_reparse_all_for_settings"
+              c:identifier="gtk_rc_reparse_all_for_settings">
       <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 name="settings">
+          <type name="Settings" c:type="GtkSettings*"/>
         </parameter>
-        <parameter name="use_text">
+        <parameter name="force_load">
           <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">
+    <function name="rc_reset_styles" c:identifier="gtk_rc_reset_styles">
       <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 name="settings">
+          <type name="Settings" c:type="GtkSettings*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="paint_hline" c:identifier="gtk_paint_hline">
+    <function name="rc_find_pixmap_in_path"
+              c:identifier="gtk_rc_find_pixmap_in_path">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="string" c:type="gchar*"/>
       </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 name="settings">
+          <type name="Settings" c:type="GtkSettings*"/>
         </parameter>
-        <parameter name="widget" allow-none="1">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="scanner">
+          <type name="GLib.Scanner" c:type="GScanner*"/>
         </parameter>
-        <parameter name="detail" allow-none="1">
+        <parameter name="pixmap_file">
           <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="paint_vline" c:identifier="gtk_paint_vline">
+    <function name="rc_parse" c:identifier="gtk_rc_parse">
       <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">
+        <parameter name="filename">
           <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">
+    <function name="rc_parse_string" c:identifier="gtk_rc_parse_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="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">
+        <parameter name="rc_string">
           <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="paint_polygon" c:identifier="gtk_paint_polygon">
+    <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="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 name="rc_style">
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
         </parameter>
-        <parameter name="detail" allow-none="1">
+        <parameter name="pattern">
           <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"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="paint_arrow" c:identifier="gtk_paint_arrow">
+    <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="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 name="rc_style">
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
         </parameter>
-        <parameter name="detail" allow-none="1">
+        <parameter name="pattern">
           <type name="string" c:type="gchar*"/>
         </parameter>
-        <parameter name="arrow_type">
-          <type name="ArrowType" c:type="GtkArrowType"/>
-        </parameter>
-        <parameter name="fill">
-          <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="width">
-          <type name="int" c:type="gint"/>
-        </parameter>
-        <parameter name="height">
-          <type name="int" c:type="gint"/>
-        </parameter>
       </parameters>
     </function>
-    <function name="paint_diamond" c:identifier="gtk_paint_diamond">
+    <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="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 name="rc_style">
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
         </parameter>
-        <parameter name="detail" allow-none="1">
+        <parameter name="pattern">
           <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="paint_box" c:identifier="gtk_paint_box">
+    <function name="rc_find_module_in_path"
+              c:identifier="gtk_rc_find_module_in_path">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="string" c:type="gchar*"/>
       </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">
+        <parameter name="module_file">
           <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="paint_flat_box" c:identifier="gtk_paint_flat_box">
+    <function name="rc_get_theme_dir" c:identifier="gtk_rc_get_theme_dir">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="string" c:type="gchar*"/>
       </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"/>
+    </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="height">
-          <type name="int" c:type="gint"/>
+        <parameter name="color">
+          <type name="Gdk.Color" c:type="GdkColor*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="paint_check" c:identifier="gtk_paint_check">
+    <function name="rc_parse_color_full"
+              c:identifier="gtk_rc_parse_color_full">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="uint" c:type="guint"/>
       </return-value>
       <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
-        </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
+        <parameter name="scanner">
+          <type name="GLib.Scanner" c:type="GScanner*"/>
         </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
+        <parameter name="style">
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
         </parameter>
-        <parameter name="shadow_type">
-          <type name="ShadowType" c:type="GtkShadowType"/>
+        <parameter name="color">
+          <type name="Gdk.Color" c:type="GdkColor*"/>
         </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+      </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="widget" allow-none="1">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="state">
+          <type name="StateType" c:type="GtkStateType*"/>
         </parameter>
-        <parameter name="detail" allow-none="1">
-          <type name="string" c:type="gchar*"/>
+      </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="x">
-          <type name="int" c:type="gint"/>
+        <parameter name="priority">
+          <type name="PathPriorityType" c:type="GtkPathPriorityType*"/>
         </parameter>
-        <parameter name="y">
-          <type name="int" c:type="gint"/>
+      </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="width">
-          <type name="int" c:type="gint"/>
+        <parameter name="type_name">
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
-        <parameter name="height">
-          <type name="int" c:type="gint"/>
+        <parameter name="property_name">
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
       </parameters>
     </function>
-    <function name="paint_option" c:identifier="gtk_paint_option">
+    <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="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 name="rc_style">
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
         </parameter>
-        <parameter name="height">
-          <type name="int" c:type="gint"/>
+        <parameter name="property">
+          <type name="RcProperty" c:type="GtkRcProperty*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="paint_tab" c:identifier="gtk_paint_tab">
+    <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="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 name="rc_style">
+          <type name="RcStyle" c:type="GtkRcStyle*"/>
         </parameter>
-        <parameter name="x">
-          <type name="int" c:type="gint"/>
+        <parameter name="type_name">
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
-        <parameter name="y">
-          <type name="int" c:type="gint"/>
+        <parameter name="property_name">
+          <type name="GLib.Quark" c:type="GQuark"/>
         </parameter>
-        <parameter name="width">
-          <type name="int" c:type="gint"/>
+      </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>
-        <parameter name="height">
-          <type name="int" c:type="gint"/>
+      </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="paint_shadow_gap" c:identifier="gtk_paint_shadow_gap">
+    <function name="rc_context_destroy" c:identifier="_gtk_rc_context_destroy">
       <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 name="settings">
+          <type name="Settings" c:type="GtkSettings*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="paint_box_gap" c:identifier="gtk_paint_box_gap">
+    <record name="SettingsClass" c:type="GtkSettingsClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+    </record>
+    <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="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 name="pspec">
+          <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="paint_extension" c:identifier="gtk_paint_extension">
+    <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="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 name="pspec">
+          <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
         </parameter>
-        <parameter name="widget" allow-none="1">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="parser">
+          <type name="RcPropertyParser" c:type="GtkRcPropertyParser"/>
         </parameter>
-        <parameter name="detail" allow-none="1">
-          <type name="string" c:type="gchar*"/>
+      </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="x">
-          <type name="int" c:type="gint"/>
+        <parameter name="gstring">
+          <type name="GObject.String" c:type="GString*"/>
         </parameter>
-        <parameter name="y">
-          <type name="int" c:type="gint"/>
+        <parameter name="property_value">
+          <type name="GObject.Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="width">
-          <type name="int" c:type="gint"/>
+      </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="height">
-          <type name="int" c:type="gint"/>
+        <parameter name="gstring">
+          <type name="GObject.String" c:type="GString*"/>
         </parameter>
-        <parameter name="gap_side">
-          <type name="PositionType" c:type="GtkPositionType"/>
+        <parameter name="property_value">
+          <type name="GObject.Value" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="paint_focus" c:identifier="gtk_paint_focus">
+    <function name="rc_property_parse_flags"
+              c:identifier="gtk_rc_property_parse_flags">
       <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 name="pspec">
+          <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
         </parameter>
-        <parameter name="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
+        <parameter name="gstring">
+          <type name="GObject.String" c:type="GString*"/>
         </parameter>
-        <parameter name="area" allow-none="1">
-          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+        <parameter name="property_value">
+          <type name="GObject.Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="widget" allow-none="1">
-          <type name="Widget" c:type="GtkWidget*"/>
+      </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="detail" allow-none="1">
-          <type name="string" c:type="gchar*"/>
+        <parameter name="gstring">
+          <type name="GObject.String" c:type="GString*"/>
         </parameter>
-        <parameter name="x">
-          <type name="int" c:type="gint"/>
+        <parameter name="property_value">
+          <type name="GObject.Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="y">
-          <type name="int" c:type="gint"/>
+      </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="width">
-          <type name="int" c:type="gint"/>
+        <parameter name="gstring">
+          <type name="GObject.String" c:type="GString*"/>
         </parameter>
-        <parameter name="height">
-          <type name="int" c:type="gint"/>
+        <parameter name="property_value">
+          <type name="GObject.Value" c:type="GValue*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="paint_slider" c:identifier="gtk_paint_slider">
+    <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="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 name="settings">
+          <type name="Settings" c:type="GtkSettings*"/>
         </parameter>
-        <parameter name="detail" allow-none="1">
+        <parameter name="name">
           <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 name="svalue">
+          <type name="SettingsValue" c:type="GtkSettingsValue*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="paint_handle" c:identifier="gtk_paint_handle">
+    <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="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 name="settings">
+          <type name="Settings" c:type="GtkSettings*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="paint_expander" c:identifier="gtk_paint_expander">
+    <function name="settings_handle_event"
+              c:identifier="_gtk_settings_handle_event">
       <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="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 name="event">
+          <type name="Gdk.EventSetting" c:type="GdkEventSetting*"/>
         </parameter>
       </parameters>
     </function>
-    <function name="paint_layout" c:identifier="gtk_paint_layout">
+    <function name="rc_property_parser_from_type"
+              c:identifier="_gtk_rc_property_parser_from_type">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="RcPropertyParser" c:type="GtkRcPropertyParser"/>
       </return-value>
       <parameters>
-        <parameter name="style">
-          <type name="Style" c:type="GtkStyle*"/>
+        <parameter name="type">
+          <type name="GObject.Type" c:type="GType"/>
         </parameter>
-        <parameter name="window">
-          <type name="Gdk.Window" c:type="GdkWindow*"/>
+      </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="state_type">
-          <type name="StateType" c:type="GtkStateType"/>
+        <parameter name="src_value">
+          <type name="GObject.Value" c:type="GValue*"/>
         </parameter>
-        <parameter name="use_text">
+        <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="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>
+    <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="SelectionData" c:type="GtkSelectionData*"/>
+        </return-value>
+        <parameters>
+          <parameter name="data">
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
+          </parameter>
+        </parameters>
+      </constructor>
+      <method name="free" c:identifier="gtk_selection_data_free">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="data">
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </glib:boxed>
+    <record name="WidgetClass" c:type="GtkWidgetClass">
+      <field name="parent_class">
+        <type name="ObjectClass" c:type="GtkObjectClass"/>
+      </field>
+      <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="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>
+      </callback>
+      <callback name="show" c:type="show">
+        <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="show_all" c:type="show_all">
+        <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="hide" c:type="hide">
+        <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="hide_all" c:type="hide_all">
+        <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="map" c:type="map">
+        <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="unmap" c:type="unmap">
+        <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="realize" c:type="realize">
+        <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="unrealize" c:type="unrealize">
+        <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="size_request" c:type="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="requisition">
+            <type name="Requisition" c:type="GtkRequisition*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="size_allocate" c:type="size_allocate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="allocation">
+            <type name="Allocation" c:type="GtkAllocation*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="state_changed" c:type="state_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_state">
+            <type name="StateType" c:type="GtkStateType"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="parent_set" c:type="parent_set">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <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" c:type="hierarchy_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_toplevel">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="style_set" c:type="style_set">
+        <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" c:type="direction_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_direction">
+            <type name="TextDirection" c:type="GtkTextDirection"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="grab_notify" c:type="grab_notify">
+        <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" c:type="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="pspec">
+            <type name="GObject.ParamSpec" c:type="GParamSpec*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="mnemonic_activate" c:type="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>
+      </callback>
+      <callback name="grab_focus" c:type="grab_focus">
+        <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="focus" c:type="focus">
+        <return-value>
+          <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>
+      </callback>
+      <callback name="event" c:type="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>
+      </callback>
+      <callback name="button_press_event" c:type="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.EventButton" c:type="GdkEventButton*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="button_release_event" c:type="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.EventButton" c:type="GdkEventButton*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="scroll_event" c:type="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.EventScroll" c:type="GdkEventScroll*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="motion_notify_event" c:type="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.EventMotion" c:type="GdkEventMotion*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="delete_event" c:type="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.EventAny" c:type="GdkEventAny*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="destroy_event" c:type="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.EventAny" c:type="GdkEventAny*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="expose_event" c:type="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.EventExpose" c:type="GdkEventExpose*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="key_press_event" c:type="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.EventKey" c:type="GdkEventKey*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="key_release_event" c:type="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.EventKey" c:type="GdkEventKey*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="enter_notify_event" c:type="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.EventCrossing" c:type="GdkEventCrossing*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="leave_notify_event" c:type="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.EventCrossing" c:type="GdkEventCrossing*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="configure_event" c:type="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.EventConfigure" c:type="GdkEventConfigure*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="focus_in_event" c:type="focus_in_event">
+        <return-value>
           <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="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="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="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="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="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>
-    <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="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="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="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="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="Gdk.Rectangle" c:type="GdkRectangle*"/>
-        </parameter>
-        <parameter name="location">
-          <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
-        </parameter>
-        <parameter name="is_primary">
+        </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>
+      </callback>
+      <callback name="focus_out_event" c:type="focus_out_event">
+        <return-value>
           <type name="boolean" c:type="gboolean"/>
-        </parameter>
-        <parameter name="direction">
-          <type name="TextDirection" c:type="GtkTextDirection"/>
-        </parameter>
-        <parameter name="draw_arrow">
+        </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>
+      </callback>
+      <callback name="map_event" c:type="map_event">
+        <return-value>
           <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="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>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventAny" c:type="GdkEventAny*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="unmap_event" c:type="unmap_event">
         <return-value>
-          <type name="IconFactory" c:type="GtkIconFactory*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
-      </constructor>
-      <method name="add" c:identifier="gtk_icon_factory_add">
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventAny" c:type="GdkEventAny*"/>
+          </parameter>
+        </parameters>
+      </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="factory">
-            <type name="IconFactory" c:type="GtkIconFactory*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="stock_id">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="event">
+            <type name="Gdk.EventProperty" c:type="GdkEventProperty*"/>
           </parameter>
-          <parameter name="icon_set">
-            <type name="IconSet" c:type="GtkIconSet*"/>
+        </parameters>
+      </callback>
+      <callback name="selection_clear_event" c:type="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.EventSelection" c:type="GdkEventSelection*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="lookup" c:identifier="gtk_icon_factory_lookup">
+      </callback>
+      <callback name="selection_request_event"
+                c:type="selection_request_event">
         <return-value>
-          <type name="IconSet" c:type="GtkIconSet*"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="factory">
-            <type name="IconFactory" c:type="GtkIconFactory*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
-          <parameter name="stock_id">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="event">
+            <type name="Gdk.EventSelection" c:type="GdkEventSelection*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="add_default" c:identifier="gtk_icon_factory_add_default">
+      </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="factory">
-            <type name="IconFactory" c:type="GtkIconFactory*"/>
+          <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="remove_default"
-              c:identifier="gtk_icon_factory_remove_default">
+      </callback>
+      <callback name="proximity_in_event" c:type="proximity_in_event">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
-          <parameter name="factory">
-            <type name="IconFactory" c:type="GtkIconFactory*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventProximity" c:type="GdkEventProximity*"/>
           </parameter>
         </parameters>
-      </method>
-      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+      </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="event">
+            <type name="Gdk.EventProximity" c:type="GdkEventProximity*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+      <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="event">
+            <type name="Gdk.EventVisibility" c:type="GdkEventVisibility*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+      <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="event">
+            <type name="Gdk.EventClient" c:type="GdkEventClient*"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+      <callback name="no_expose_event" c:type="no_expose_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.EventAny" c:type="GdkEventAny*"/>
+          </parameter>
+        </parameters>
       </callback>
-    </class>
-    <record name="RcContext" 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.SList" 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.SList" 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.SList" c:type="GSList*"/>
-        </parameter>
-        <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="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.char" c:type="gchar**"/>
-        </parameter>
-      </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">
+      <callback name="window_state_event" c:type="window_state_event">
+        <return-value>
           <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.Scanner" 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>
-    <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>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventWindowState" c:type="GdkEventWindowState*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="selection_get" c:type="selection_get">
         <return-value>
-          <type name="Requisition" c:type="GtkRequisition*"/>
+          <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="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="time_">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="selection_received" c:type="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="time_">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="drag_begin" c:type="drag_begin">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="requisition">
-            <type name="Requisition" c:type="GtkRequisition*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
           </parameter>
         </parameters>
-      </constructor>
-      <method name="free" c:identifier="gtk_requisition_free">
+      </callback>
+      <callback name="drag_end" c:type="drag_end">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="requisition">
-            <type name="Requisition" c:type="GtkRequisition*"/>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
           </parameter>
         </parameters>
-      </method>
-    </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">
+      </callback>
+      <callback name="drag_data_get" c:type="drag_data_get">
         <return-value>
-          <type name="SelectionData" c:type="GtkSelectionData*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="data">
+          <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="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="time_">
+            <type name="uint" c:type="guint"/>
+          </parameter>
         </parameters>
-      </constructor>
-      <method name="free" c:identifier="gtk_selection_data_free">
+      </callback>
+      <callback name="drag_data_delete" c:type="drag_data_delete">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="data">
+          <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="drag_leave" c:type="drag_leave">
+        <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="time_">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="drag_motion" c:type="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>
+          <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="drag_drop" c:type="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>
+          <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="drag_data_received" c:type="drag_data_received">
+        <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="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>
-      </method>
-    </glib:boxed>
+      </callback>
+      <callback name="popup_menu" c:type="popup_menu">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="show_help" c:type="show_help">
+        <return-value>
+          <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="get_accessible" c:type="get_accessible">
+        <return-value>
+          <type name="Atk.Object" c:type="AtkObject*"/>
+        </return-value>
+        <parameters>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="screen_changed" c:type="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>
+      <callback name="can_activate_accel" c:type="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>
+      </callback>
+      <callback name="grab_broken_event" c:type="grab_broken_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.EventGrabBroken" c:type="GdkEventGrabBroken*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="composited_changed" c:type="composited_changed">
+        <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="query_tooltip" c:type="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="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="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>
+    </record>
     <record name="WidgetAuxInfo" c:type="GtkWidgetAuxInfo">
       <field name="x">
         <type name="int" c:type="gint"/>
@@ -11565,7 +13702,7 @@
             <type name="Gdk.Display" c:type="GdkDisplay*"/>
           </parameter>
           <parameter name="selection">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+            <type name="Gdk.Atom" c:type="GdkAtom"/>
           </parameter>
         </parameters>
       </constructor>
@@ -11575,7 +13712,7 @@
         </return-value>
         <parameters>
           <parameter name="selection">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+            <type name="Gdk.Atom" c:type="GdkAtom"/>
           </parameter>
         </parameters>
       </constructor>
@@ -11685,7 +13822,7 @@
             <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
           <parameter name="pixbuf">
-            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+            <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
@@ -11699,7 +13836,7 @@
             <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
           <parameter name="target">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+            <type name="Gdk.Atom" c:type="GdkAtom"/>
           </parameter>
           <parameter name="callback">
             <type name="ClipboardReceivedFunc"
@@ -11793,7 +13930,7 @@
             <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
           <parameter name="target">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+            <type name="Gdk.Atom" c:type="GdkAtom"/>
           </parameter>
         </parameters>
       </method>
@@ -11820,7 +13957,7 @@
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
           <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom*"/>
+            <type name="Gdk.Atom" c:type="GdkAtom*"/>
           </parameter>
           <parameter name="length">
             <type name="size_t" c:type="gsize*"/>
@@ -11830,7 +13967,7 @@
       <method name="wait_for_image"
               c:identifier="gtk_clipboard_wait_for_image">
         <return-value>
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="clipboard">
@@ -11848,7 +13985,7 @@
             <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
           <parameter name="targets">
-            <type name="GdkAtom" c:type="GdkAtom**"/>
+            <type name="Gdk.Atom" c:type="GdkAtom**"/>
           </parameter>
           <parameter name="n_targets">
             <type name="int" c:type="gint*"/>
@@ -11901,7 +14038,7 @@
             <type name="Clipboard" c:type="GtkClipboard*"/>
           </parameter>
           <parameter name="target">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+            <type name="Gdk.Atom" c:type="GdkAtom"/>
           </parameter>
         </parameters>
       </method>
@@ -11982,7 +14119,7 @@
             <type name="Tooltip" c:type="GtkTooltip*"/>
           </parameter>
           <parameter name="pixbuf">
-            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+            <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
@@ -12685,7 +14822,7 @@
             <type name="Window" c:type="GtkWindow*"/>
           </parameter>
           <parameter name="icon" allow-none="1">
-            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+            <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
@@ -12721,7 +14858,7 @@
       </method>
       <method name="get_icon" c:identifier="gtk_window_get_icon">
         <return-value>
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="window">
@@ -13257,7 +15394,7 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="icon">
-        <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf"/>
+        <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf"/>
       </property>
       <property name="icon-name">
         <type name="string" c:type="gchararray"/>
@@ -14261,6 +16398,166 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="ContainerClass" c:type="GtkContainerClass">
+      <field name="parent_class">
+        <type name="WidgetClass" c:type="GtkWidgetClass"/>
+      </field>
+      <callback name="add" c:type="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" 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>
+        </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>
+      </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="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_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>
+    </record>
     <function name="container_class_install_child_property"
               c:identifier="gtk_container_class_install_child_property">
       <return-value>
@@ -14285,7 +16582,7 @@
       </return-value>
       <parameters>
         <parameter name="cclass">
-          <type name="GObjectClass" c:type="GObjectClass*"/>
+          <type name="GObject.Class" c:type="GObjectClass*"/>
         </parameter>
         <parameter name="property_name">
           <type name="string" c:type="gchar*"/>
@@ -14299,7 +16596,7 @@
       </return-value>
       <parameters>
         <parameter name="cclass">
-          <type name="GObjectClass" c:type="GObjectClass*"/>
+          <type name="GObject.Class" c:type="GObjectClass*"/>
         </parameter>
         <parameter name="n_properties">
           <type name="uint" c:type="guint*"/>
@@ -14380,15 +16677,114 @@
            glib:get-type="gtk_bin_get_type">
       <method name="get_child" c:identifier="gtk_bin_get_child">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="bin">
+            <type name="Bin" c:type="GtkBin*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </class>
+    <record name="BinClass" c:type="GtkBinClass">
+      <field name="parent_class">
+        <type name="ContainerClass" c:type="GtkContainerClass"/>
+      </field>
+    </record>
+    <record name="WindowClass" c:type="GtkWindowClass">
+      <field name="parent_class">
+        <type name="BinClass" c:type="GtkBinClass"/>
+      </field>
+      <callback name="set_focus" c:type="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" c:type="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.Event" c:type="GdkEvent*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="activate_focus" c:type="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" c:type="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" c:type="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" c:type="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" 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="bin">
-            <type name="Bin" c:type="GtkBin*"/>
-          </parameter>
-        </parameters>
-      </method>
-    </class>
+      </callback>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </record>
     <record name="WindowGeometryInfo" c:type="GtkWindowGeometryInfo"/>
     <class name="WindowGroup"
            c:type="GtkWindowGroup"
@@ -14448,6 +16844,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="WindowGroupClass" c:type="GtkWindowGroupClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </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>
+    </record>
     <function name="window_new" c:identifier="gtk_window_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -14482,7 +16903,7 @@
       </return-value>
       <parameters>
         <parameter name="icon">
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
       </parameters>
     </function>
@@ -14928,6 +17349,54 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="DialogClass" c:type="GtkDialogClass">
+      <field name="parent_class">
+        <type name="WindowClass" c:type="GtkWindowClass"/>
+      </field>
+      <callback name="response" c:type="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="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="close" c:type="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" 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>
+    </record>
     <function name="dialog_new" c:identifier="gtk_dialog_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -15296,7 +17765,7 @@
       </method>
       <method name="get_logo" c:identifier="gtk_about_dialog_get_logo">
         <return-value>
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="about">
@@ -15313,7 +17782,7 @@
             <type name="AboutDialog" c:type="GtkAboutDialog*"/>
           </parameter>
           <parameter name="logo" allow-none="1">
-            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+            <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
@@ -15376,7 +17845,7 @@
         <type name="GObject.Strv" c:type="GStrv"/>
       </property>
       <property name="logo">
-        <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf"/>
+        <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf"/>
       </property>
       <property name="logo-icon-name">
         <type name="string" c:type="gchararray"/>
@@ -15405,6 +17874,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="AboutDialogClass" c:type="GtkAboutDialogClass">
+      <field name="parent_class">
+        <type name="DialogClass" c:type="GtkDialogClass"/>
+      </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>
+    </record>
     <function name="about_dialog_new" c:identifier="gtk_about_dialog_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -15560,6 +18054,11 @@
         <type name="int" c:type="gint"/>
       </property>
     </class>
+    <record name="MiscClass" c:type="GtkMiscClass">
+      <field name="parent_class">
+        <type name="WidgetClass" c:type="GtkWidgetClass"/>
+      </field>
+    </record>
     <class name="MenuShell"
            c:type="GtkMenuShell"
            parent="Container"
@@ -15884,6 +18383,132 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="MenuShellClass" c:type="GtkMenuShellClass">
+      <field name="parent_class">
+        <type name="ContainerClass" c:type="GtkContainerClass"/>
+      </field>
+      <field name="submenu_placement">
+        <type name="uint" c:type="guint"/>
+      </field>
+      <callback name="deactivate" c:type="deactivate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="selection_done" c:type="selection_done">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="move_current" c:type="move_current">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          </parameter>
+          <parameter name="direction">
+            <type name="MenuDirectionType" c:type="GtkMenuDirectionType"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="activate_current" c:type="activate_current">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          </parameter>
+          <parameter name="force_hide">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="cancel" c:type="cancel">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          </parameter>
+        </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="menu_item">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="insert" c:type="insert">
+        <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>
+          <parameter name="position">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_popup_delay" c:type="get_popup_delay">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="menu_shell">
+            <type name="MenuShell" c:type="GtkMenuShell*"/>
+          </parameter>
+        </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="distance">
+            <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>
+    </record>
     <function name="menu_shell_select_last"
               c:identifier="_gtk_menu_shell_select_last">
       <return-value>
@@ -16255,6 +18880,31 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="MenuClass" c:type="GtkMenuClass">
+      <field name="parent_class">
+        <type name="MenuShellClass" c:type="GtkMenuShellClass"/>
+      </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>
+    </record>
     <callback name="MenuPositionFunc" c:type="GtkMenuPositionFunc">
       <return-value>
         <type name="none" c:type="void"/>
@@ -16965,6 +19615,73 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="LabelClass" c:type="GtkLabelClass">
+      <field name="parent_class">
+        <type name="MiscClass" c:type="GtkMiscClass"/>
+      </field>
+      <callback name="move_cursor" c:type="move_cursor">
+        <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="int" c:type="gint"/>
+          </parameter>
+          <parameter name="extend_selection">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="copy_clipboard" c:type="copy_clipboard">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="label">
+            <type name="Label" c:type="GtkLabel*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="populate_popup" c:type="populate_popup">
+        <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>
+        </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>
+    </record>
     <record name="LabelSelectionInfo" c:type="GtkLabelSelectionInfo"/>
     <function name="label_new" c:identifier="gtk_label_new">
       <return-value>
@@ -17103,6 +19820,55 @@
         </return-value>
       </callback>
     </class>
+    <record name="AccelLabelClass" c:type="GtkAccelLabelClass">
+      <field name="parent_class">
+        <type name="LabelClass" c:type="GtkLabelClass"/>
+      </field>
+      <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>
+    </record>
     <function name="accel_label_new" c:identifier="gtk_accel_label_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -17157,6 +19923,7 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="AccelMapClass" c:type="GtkAccelMapClass"/>
     <callback name="AccelMapForeach" c:type="GtkAccelMapForeach">
       <return-value>
         <type name="none" c:type="void"/>
@@ -17433,6 +20200,42 @@
         </return-value>
       </callback>
     </class>
+    <record name="AccessibleClass" c:type="GtkAccessibleClass">
+      <field name="parent_class">
+        <type name="Atk.ObjectClass" c:type="AtkObjectClass"/>
+      </field>
+      <callback name="connect_widget_destroyed"
+                c:type="connect_widget_destroyed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="accessible">
+            <type name="Accessible" c:type="GtkAccessible*"/>
+          </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>
+    </record>
     <class name="Action"
            c:type="GtkAction"
            parent="GObject.Object"
@@ -17722,62 +20525,159 @@
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_accel_group" c:identifier="gtk_action_set_accel_group">
+      </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>
+      <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>
+        <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="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <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="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="connect_proxy" c:type="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>
+      </callback>
+      <callback name="disconnect_proxy" c:type="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>
+      </callback>
+      <callback name="create_menu" c:type="create_menu">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </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>
-      <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>
+      <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>
+    <record name="ActionClass" c:type="GtkActionClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
       <callback name="activate" c:type="activate">
         <return-value>
           <type name="none" c:type="void"/>
@@ -17865,12 +20765,7 @@
           <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>
+    </record>
     <record name="ActionPrivate" c:type="GtkActionPrivate"/>
     <function name="action_emit_activate"
               c:identifier="_gtk_action_emit_activate">
@@ -18293,6 +21188,34 @@
         </return-value>
       </callback>
     </class>
+    <record name="ItemFactoryClass" c:type="GtkItemFactoryClass">
+      <field name="object_class">
+        <type name="ObjectClass" c:type="GtkObjectClass"/>
+      </field>
+      <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" 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>
+    </record>
     <record name="ItemFactoryEntry" c:type="GtkItemFactoryEntry">
       <field name="path">
         <type name="string" c:type="gchar*"/>
@@ -18829,6 +21752,44 @@
       </glib:signal>
     </class>
     <record name="ActionGroupPrivate" c:type="GtkActionGroupPrivate"/>
+    <record name="ActionGroupClass" c:type="GtkActionGroupClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="get_action" c:type="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" 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>
+    </record>
     <record name="ActionEntry" c:type="GtkActionEntry">
       <field name="name">
         <type name="string" c:type="gchar*"/>
@@ -19050,6 +22011,11 @@
         <type name="uint" c:type="guint"/>
       </property>
     </class>
+    <record name="AlignmentClass" c:type="GtkAlignmentClass">
+      <field name="parent_class">
+        <type name="BinClass" c:type="GtkBinClass"/>
+      </field>
+    </record>
     <record name="AlignmentPrivate" c:type="GtkAlignmentPrivate"/>
     <function name="alignment_new" c:identifier="gtk_alignment_new">
       <return-value>
@@ -19098,6 +22064,11 @@
         <type name="ShadowType" c:type="GtkShadowType"/>
       </property>
     </class>
+    <record name="ArrowClass" c:type="GtkArrowClass">
+      <field name="parent_class">
+        <type name="MiscClass" c:type="GtkMiscClass"/>
+      </field>
+    </record>
     <function name="arrow_new" c:identifier="gtk_arrow_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -19252,6 +22223,25 @@
         </parameters>
       </callback>
     </class>
+    <record name="FrameClass" c:type="GtkFrameClass">
+      <field name="parent_class">
+        <type name="BinClass" c:type="GtkBinClass"/>
+      </field>
+      <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>
+    </record>
     <function name="frame_new" c:identifier="gtk_frame_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -19302,6 +22292,11 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
     </class>
+    <record name="AspectFrameClass" c:type="GtkAspectFrameClass">
+      <field name="parent_class">
+        <type name="FrameClass" c:type="GtkFrameClass"/>
+      </field>
+    </record>
     <function name="aspect_frame_new" c:identifier="gtk_aspect_frame_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -19512,14 +22507,14 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="pixbuf" allow-none="1">
-            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+            <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_page_header_image"
               c:identifier="gtk_assistant_get_page_header_image">
         <return-value>
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -19543,14 +22538,14 @@
             <type name="Widget" c:type="GtkWidget*"/>
           </parameter>
           <parameter name="pixbuf" allow-none="1">
-            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+            <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_page_side_image"
               c:identifier="gtk_assistant_get_page_side_image">
         <return-value>
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="assistant">
@@ -19726,6 +22721,79 @@
       </glib:signal>
     </class>
     <record name="AssistantPrivate" c:type="GtkAssistantPrivate"/>
+    <record name="AssistantClass" c:type="GtkAssistantClass">
+      <field name="parent_class">
+        <type name="WindowClass" c:type="GtkWindowClass"/>
+      </field>
+      <callback name="prepare" c:type="prepare">
+        <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>
+        </parameters>
+      </callback>
+      <callback name="apply" c:type="apply">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="close" c:type="close">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="cancel" c:type="cancel">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="assistant">
+            <type name="Assistant" c:type="GtkAssistant*"/>
+          </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>
+    </record>
     <callback name="AssistantPageFunc" c:type="GtkAssistantPageFunc">
       <return-value>
         <type name="int" c:type="gint"/>
@@ -19942,6 +23010,11 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
     </class>
+    <record name="BoxClass" c:type="GtkBoxClass">
+      <field name="parent_class">
+        <type name="ContainerClass" c:type="GtkContainerClass"/>
+      </field>
+    </record>
     <record name="BoxChild" c:type="GtkBoxChild">
       <field name="widget">
         <type name="Widget" c:type="GtkWidget*"/>
@@ -20093,6 +23166,11 @@
         <type name="ButtonBoxStyle" c:type="GtkButtonBoxStyle"/>
       </property>
     </class>
+    <record name="ButtonBoxClass" c:type="GtkButtonBoxClass">
+      <field name="parent_class">
+        <type name="BoxClass" c:type="GtkBoxClass"/>
+      </field>
+    </record>
     <function name="button_box_child_requisition"
               c:identifier="_gtk_button_box_child_requisition">
       <return-value>
@@ -20606,122 +23684,360 @@
       <method name="value_from_string_type"
               c:identifier="gtk_builder_value_from_string_type">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <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>
+      <callback name="get_type_from_name" c:type="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>
+      </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>
+      <callback name="gtk_reserved8" c:type="_gtk_reserved8">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </class>
+    <record name="BuilderClass" c:type="GtkBuilderClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="get_type_from_name" c:type="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>
+      </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>
+      <callback name="gtk_reserved8" c:type="_gtk_reserved8">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </record>
+    <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="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="GObject.ConnectFlags" c:type="GConnectFlags"/>
+        </parameter>
+        <parameter name="user_data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <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="buildable">
+            <type name="Buildable" c:type="GtkBuildable*"/>
+          </parameter>
+          <parameter name="name">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </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="add_child" c:type="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>
+      </callback>
+      <callback name="set_buildable_property" c:type="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.Value" c:type="GValue*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="construct_child" c:type="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>
+      </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="custom_tag_end" c:type="custom_tag_end">
+        <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="type">
-            <type name="GObject.Type" c:type="GType"/>
+          <parameter name="child">
+            <type name="GObject.Object" c:type="GObject*"/>
           </parameter>
-          <parameter name="string">
+          <parameter name="tagname">
             <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 name="data">
+            <type name="any" c:type="gpointer*"/>
           </parameter>
         </parameters>
-      </method>
-      <property name="translation-domain">
-        <type name="string" c:type="gchararray"/>
-      </property>
-      <callback name="get_type_from_name" c:type="get_type_from_name">
+      </callback>
+      <callback name="custom_finished" c:type="custom_finished">
         <return-value>
-          <type name="GObject.Type" c:type="GType"/>
+          <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="type_name">
-            <type name="string" c:type="char*"/>
+          <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="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">
+      <callback name="parser_finished" c:type="parser_finished">
         <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="gtk_reserved8" c:type="_gtk_reserved8">
+      <callback name="get_internal_child" c:type="get_internal_child">
         <return-value>
-          <type name="none" c:type="void"/>
+          <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="childname">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
       </callback>
-    </class>
-    <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="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="GObject.ConnectFlags" c:type="GConnectFlags"/>
-        </parameter>
-        <parameter name="user_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <interface name="Buildable"
-               c:type="GtkBuildable"
-               glib:type-name="GtkBuildable"
-               glib:get-type="gtk_buildable_get_type">
+    </interface>
+    <record name="BuildableIface" c:type="GtkBuildableIface">
+      <field name="g_iface">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
       <callback name="set_name" c:type="set_name">
         <return-value>
           <type name="none" c:type="void"/>
@@ -20897,7 +24213,7 @@
           </parameter>
         </parameters>
       </callback>
-    </interface>
+    </record>
     <function name="buildable_set_name" c:identifier="gtk_buildable_set_name">
       <return-value>
         <type name="none" c:type="void"/>
@@ -21150,7 +24466,7 @@
             <type name="Image" c:type="GtkImage*"/>
           </parameter>
           <parameter name="pixbuf" allow-none="1">
-            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+            <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
@@ -21197,7 +24513,7 @@
             <type name="Image" c:type="GtkImage*"/>
           </parameter>
           <parameter name="animation">
-            <type name="Pixbuf.Animation" c:type="GdkPixbufAnimation*"/>
+            <type name="GdkPixbuf.Animation" c:type="GdkPixbufAnimation*"/>
           </parameter>
         </parameters>
       </method>
@@ -21276,7 +24592,7 @@
       </method>
       <method name="get_pixbuf" c:identifier="gtk_image_get_pixbuf">
         <return-value>
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="image">
@@ -21318,7 +24634,7 @@
       </method>
       <method name="get_animation" c:identifier="gtk_image_get_animation">
         <return-value>
-          <type name="Pixbuf.Animation" c:type="GdkPixbufAnimation*"/>
+          <type name="GdkPixbuf.Animation" c:type="GdkPixbufAnimation*"/>
         </return-value>
         <parameters>
           <parameter name="image">
@@ -21385,7 +24701,7 @@
         </parameters>
       </method>
       <property name="pixbuf">
-        <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf"/>
+        <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf"/>
       </property>
       <property name="pixmap">
         <type name="Gdk.Pixmap" c:type="GdkPixmap"/>
@@ -21412,7 +24728,7 @@
         <type name="int" c:type="gint"/>
       </property>
       <property name="pixbuf-animation">
-        <type name="Pixbuf.Animation" c:type="GdkPixbufAnimation"/>
+        <type name="GdkPixbuf.Animation" c:type="GdkPixbufAnimation"/>
       </property>
       <property name="icon-name">
         <type name="string" c:type="gchararray"/>
@@ -21441,6 +24757,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="ImageClass" c:type="GtkImageClass">
+      <field name="parent_class">
+        <type name="MiscClass" c:type="GtkMiscClass"/>
+      </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>
+    </record>
     <record name="ImagePixmapData" c:type="GtkImagePixmapData">
       <field name="pixmap">
         <type name="Gdk.Pixmap" c:type="GdkPixmap*"/>
@@ -21453,7 +24794,7 @@
     </record>
     <record name="ImagePixbufData" c:type="GtkImagePixbufData">
       <field name="pixbuf">
-        <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+        <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
       </field>
     </record>
     <record name="ImageStockData" c:type="GtkImageStockData">
@@ -21468,10 +24809,10 @@
     </record>
     <record name="ImageAnimationData" c:type="GtkImageAnimationData">
       <field name="anim">
-        <type name="Pixbuf.Animation" c:type="GdkPixbufAnimation*"/>
+        <type name="GdkPixbuf.Animation" c:type="GdkPixbufAnimation*"/>
       </field>
       <field name="iter">
-        <type name="Pixbuf.AnimationIter" c:type="GdkPixbufAnimationIter*"/>
+        <type name="GdkPixbuf.AnimationIter" c:type="GdkPixbufAnimationIter*"/>
       </field>
       <field name="frame_timeout">
         <type name="uint" c:type="guint"/>
@@ -21482,7 +24823,7 @@
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="pixbuf">
-        <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+        <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
       </field>
       <field name="theme_change_id">
         <type name="uint" c:type="guint"/>
@@ -21539,7 +24880,7 @@
       </return-value>
       <parameters>
         <parameter name="pixbuf" allow-none="1">
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
       </parameters>
     </function>
@@ -21578,7 +24919,7 @@
       </return-value>
       <parameters>
         <parameter name="animation">
-          <type name="Pixbuf.Animation" c:type="GdkPixbufAnimation*"/>
+          <type name="GdkPixbuf.Animation" c:type="GdkPixbufAnimation*"/>
         </parameter>
       </parameters>
     </function>
@@ -21988,6 +25329,91 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="ButtonClass" c:type="GtkButtonClass">
+      <field name="parent_class">
+        <type name="BinClass" c:type="GtkBinClass"/>
+      </field>
+      <callback name="pressed" c:type="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" 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="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="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="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_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>
+    </record>
     <function name="button_new" c:identifier="gtk_button_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -23250,6 +26676,82 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="CalendarClass" c:type="GtkCalendarClass">
+      <field name="parent_class">
+        <type name="WidgetClass" c:type="GtkWidgetClass"/>
+      </field>
+      <callback name="month_changed" c:type="month_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="day_selected" c:type="day_selected">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="day_selected_double_click"
+                c:type="day_selected_double_click">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="prev_month" c:type="prev_month">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="next_month" c:type="next_month">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="prev_year" c:type="prev_year">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="next_year" c:type="next_year">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="calendar">
+            <type name="Calendar" c:type="GtkCalendar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
     <record name="CalendarPrivate" c:type="GtkCalendarPrivate"/>
     <function name="calendar_new" c:identifier="gtk_calendar_new">
       <return-value>
@@ -23304,6 +26806,44 @@
         </return-value>
       </glib:signal>
     </interface>
+    <record name="CellEditableIface" c:type="GtkCellEditableIface">
+      <field name="g_iface">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="editing_done" c:type="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>
+      </callback>
+      <callback name="remove_widget" c:type="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>
+      </callback>
+      <callback name="start_editing" c:type="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>
+      </callback>
+    </record>
     <function name="cell_editable_start_editing"
               c:identifier="gtk_cell_editable_start_editing">
       <return-value>
@@ -23754,16 +27294,169 @@
         <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>
-    </class>
+        <parameters>
+          <parameter name="object">
+            <type name="CellEditable" c:type="GtkCellEditable"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="string" c:type="gchararray"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
+    <record name="CellRendererClass" c:type="GtkCellRendererClass">
+      <field name="parent_class">
+        <type name="ObjectClass" c:type="GtkObjectClass"/>
+      </field>
+      <callback name="get_size" c:type="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="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>
+      </callback>
+      <callback name="render" c:type="render">
+        <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>
+          <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>
+      </callback>
+      <callback name="activate" c:type="activate">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <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>
+      </callback>
+      <callback name="start_editing" c:type="start_editing">
+        <return-value>
+          <type name="CellEditable" c:type="GtkCellEditable*"/>
+        </return-value>
+        <parameters>
+          <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>
+      </callback>
+      <callback name="editing_canceled" c:type="editing_canceled">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="cell">
+            <type name="CellRenderer" c:type="GtkCellRenderer*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="editing_started" c:type="editing_started">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <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>
+      </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>
+    </record>
     <glib:boxed c:type="GtkTreeIter"
                 glib:name="TreeIter"
                 glib:type-name="GtkTreeIter"
@@ -24285,6 +27978,288 @@
         </parameters>
       </glib:signal>
     </interface>
+    <record name="TreeModelIface" c:type="GtkTreeModelIface">
+      <field name="g_iface">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <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="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="row_inserted" c:type="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>
+      </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="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="row_deleted" c:type="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>
+      </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="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="new_order">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_flags" c:type="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>
+      </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>
+      </callback>
+      <callback name="get_column_type" c:type="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="index_">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_iter" c:type="get_iter">
+        <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="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_path" c:type="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>
+      </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>
+    </record>
     <callback name="TreeModelForeachFunc" c:type="GtkTreeModelForeachFunc">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
@@ -24959,6 +28934,104 @@
         </return-value>
       </glib:signal>
     </interface>
+    <record name="TreeSortableIface" c:type="GtkTreeSortableIface">
+      <field name="g_iface">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="sort_column_changed" c:type="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>
+      </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="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </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="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </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>
+    </record>
     <callback name="TreeIterCompareFunc" c:type="GtkTreeIterCompareFunc">
       <return-value>
         <type name="int" c:type="gint"/>
@@ -25806,63 +29879,225 @@
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="tree_column">
-            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </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="clicked">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <record name="TreeViewColumnClass" c:type="GtkTreeViewColumnClass">
+      <field name="parent_class">
+        <type name="ObjectClass" c:type="GtkObjectClass"/>
+      </field>
+      <callback name="clicked" c:type="clicked">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tree_column">
+            <type name="TreeViewColumn" c:type="GtkTreeViewColumn*"/>
+          </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>
+    </record>
+    <callback name="TreeCellDataFunc" c:type="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>
+    <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="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>
+      </callback>
+      <callback name="pack_end" c:type="pack_end">
+        <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>
+      </callback>
+      <callback name="clear" c:type="clear">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="cell_layout">
+            <type name="CellLayout" c:type="GtkCellLayout*"/>
           </parameter>
         </parameters>
       </callback>
-      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+      <callback name="add_attribute" c:type="add_attribute">
         <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="attribute">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+      <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="cell_layout">
+            <type name="CellLayout" c:type="GtkCellLayout*"/>
+          </parameter>
+          <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="destroy">
+            <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
+          </parameter>
+        </parameters>
       </callback>
-      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+      <callback name="clear_attributes" c:type="clear_attributes">
         <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>
+        </parameters>
       </callback>
-      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+      <callback name="reorder" c:type="reorder">
         <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="position">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
       </callback>
-      <glib:signal name="clicked">
+      <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>
-      </glib:signal>
-    </class>
-    <callback name="TreeCellDataFunc" c:type="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>
-    <interface name="CellLayout"
-               c:type="GtkCellLayout"
-               glib:type-name="GtkCellLayout"
-               glib:get-type="gtk_cell_layout_get_type">
+        <parameters>
+          <parameter name="cell_layout">
+            <type name="CellLayout" c:type="GtkCellLayout*"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </interface>
+    <record name="CellLayoutIface" c:type="GtkCellLayoutIface">
+      <field name="g_iface">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
       <callback name="pack_start" c:type="pack_start">
         <return-value>
           <type name="none" c:type="void"/>
@@ -25985,7 +30220,7 @@
           </parameter>
         </parameters>
       </callback>
-    </interface>
+    </record>
     <callback name="CellLayoutDataFunc" c:type="GtkCellLayoutDataFunc">
       <return-value>
         <type name="none" c:type="void"/>
@@ -26421,6 +30656,47 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="CellRendererTextClass" c:type="GtkCellRendererTextClass">
+      <field name="parent_class">
+        <type name="CellRendererClass" c:type="GtkCellRendererClass"/>
+      </field>
+      <callback name="edited" c:type="edited">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="cell_renderer_text">
+            <type name="CellRendererText" c:type="GtkCellRendererText*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="new_text">
+            <type name="string" c:type="gchar*"/>
+          </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>
+    </record>
     <class name="CellRendererAccel"
            c:type="GtkCellRendererAccel"
            parent="CellRendererText"
@@ -26528,6 +30804,71 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="CellRendererAccelClass" c:type="GtkCellRendererAccelClass">
+      <field name="parent_class">
+        <type name="CellRendererTextClass" c:type="GtkCellRendererTextClass"/>
+      </field>
+      <callback name="accel_edited" c:type="accel_edited">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <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>
+      </callback>
+      <callback name="accel_cleared" c:type="accel_cleared">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="accel">
+            <type name="CellRendererAccel" c:type="GtkCellRendererAccel*"/>
+          </parameter>
+          <parameter name="path_string">
+            <type name="string" c:type="gchar*"/>
+          </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>
+      <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>
+    </record>
     <class name="CellRendererCombo"
            c:type="GtkCellRendererCombo"
            parent="CellRendererText"
@@ -26543,19 +30884,24 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
     </class>
+    <record name="CellRendererComboClass" c:type="GtkCellRendererComboClass">
+      <field name="parent">
+        <type name="CellRendererTextClass" c:type="GtkCellRendererTextClass"/>
+      </field>
+    </record>
     <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"/>
+        <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf"/>
       </property>
       <property name="pixbuf-expander-open">
-        <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf"/>
+        <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf"/>
       </property>
       <property name="pixbuf-expander-closed">
-        <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf"/>
+        <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf"/>
       </property>
       <property name="stock-id">
         <type name="string" c:type="gchararray"/>
@@ -26593,6 +30939,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="CellRendererPixbufClass" c:type="GtkCellRendererPixbufClass">
+      <field name="parent_class">
+        <type name="CellRendererClass" c:type="GtkCellRendererClass"/>
+      </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>
+    </record>
     <class name="CellRendererProgress"
            c:type="GtkCellRendererProgress"
            parent="CellRenderer"
@@ -26638,6 +31009,32 @@
         </return-value>
       </callback>
     </class>
+    <record name="CellRendererProgressClass"
+            c:type="GtkCellRendererProgressClass">
+      <field name="parent_class">
+        <type name="CellRendererClass" c:type="GtkCellRendererClass"/>
+      </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>
+    </record>
     <record name="CellRendererProgressPrivate"
             c:type="GtkCellRendererProgressPrivate"/>
     <class name="CellRendererSpin"
@@ -26655,6 +31052,11 @@
         <type name="uint" c:type="guint"/>
       </property>
     </class>
+    <record name="CellRendererSpinClass" c:type="GtkCellRendererSpinClass">
+      <field name="parent">
+        <type name="CellRendererTextClass" c:type="GtkCellRendererTextClass"/>
+      </field>
+    </record>
     <record name="CellRendererSpinPrivate"
             c:type="GtkCellRendererSpinPrivate"/>
     <class name="CellRendererToggle"
@@ -26771,6 +31173,44 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="CellRendererToggleClass" c:type="GtkCellRendererToggleClass">
+      <field name="parent_class">
+        <type name="CellRendererClass" c:type="GtkCellRendererClass"/>
+      </field>
+      <callback name="toggled" c:type="toggled">
+        <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>
+        </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>
+    </record>
     <class name="CellView"
            c:type="GtkCellView"
            parent="Widget"
@@ -26869,6 +31309,11 @@
         <type name="TreeModel" c:type="GtkTreeModel"/>
       </property>
     </class>
+    <record name="CellViewClass" c:type="GtkCellViewClass">
+      <field name="parent_class">
+        <type name="WidgetClass" c:type="GtkWidgetClass"/>
+      </field>
+    </record>
     <record name="CellViewPrivate" c:type="GtkCellViewPrivate"/>
     <function name="cell_view_new" c:identifier="gtk_cell_view_new">
       <return-value>
@@ -26904,7 +31349,7 @@
       </return-value>
       <parameters>
         <parameter name="pixbuf">
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
       </parameters>
     </function>
@@ -27039,6 +31484,41 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="ToggleButtonClass" c:type="GtkToggleButtonClass">
+      <field name="parent_class">
+        <type name="ButtonClass" c:type="GtkButtonClass"/>
+      </field>
+      <callback name="toggled" c:type="toggled">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="toggle_button">
+            <type name="ToggleButton" c:type="GtkToggleButton*"/>
+          </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>
+    </record>
     <function name="toggle_button_new" c:identifier="gtk_toggle_button_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -27105,6 +31585,44 @@
         </return-value>
       </callback>
     </class>
+    <record name="CheckButtonClass" c:type="GtkCheckButtonClass">
+      <field name="parent_class">
+        <type name="ToggleButtonClass" c:type="GtkToggleButtonClass"/>
+      </field>
+      <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" 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>
+    </record>
     <function name="check_button_new" c:identifier="gtk_check_button_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -27250,6 +31768,61 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="ItemClass" c:type="GtkItemClass">
+      <field name="parent_class">
+        <type name="BinClass" c:type="GtkBinClass"/>
+      </field>
+      <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>
+    </record>
     <class name="MenuItem"
            c:type="GtkMenuItem"
            parent="Item"
@@ -27489,6 +32062,80 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="MenuItemClass" c:type="GtkMenuItemClass">
+      <field name="parent_class">
+        <type name="ItemClass" c:type="GtkItemClass"/>
+      </field>
+      <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>
+    </record>
     <function name="menu_item_new" c:identifier="gtk_menu_item_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -27726,12 +32373,60 @@
           <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>
+      <glib:signal name="toggled">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <record name="CheckMenuItemClass" c:type="GtkCheckMenuItemClass">
+      <field name="parent_class">
+        <type name="MenuItemClass" c:type="GtkMenuItemClass"/>
+      </field>
+      <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>
+    </record>
     <function name="check_menu_item_new"
               c:identifier="gtk_check_menu_item_new">
       <return-value>
@@ -27894,7 +32589,7 @@
       </method>
       <method name="get_pixbuf" c:identifier="gtk_text_iter_get_pixbuf">
         <return-value>
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="iter">
@@ -29343,6 +34038,50 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="TextTagClass" c:type="GtkTextTagClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <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>
+    </record>
     <record name="TextAppearance" c:type="GtkTextAppearance">
       <field name="bg_color">
         <type name="Gdk.Color" c:type="GdkColor"/>
@@ -29496,6 +34235,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="TextChildAnchorClass" c:type="GtkTextChildAnchorClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </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>
+    </record>
     <class name="TextBuffer"
            c:type="GtkTextBuffer"
            parent="GObject.Object"
@@ -29833,7 +34597,7 @@
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="pixbuf">
-            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+            <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
@@ -30482,7 +35246,7 @@
       <method name="register_serialize_format"
               c:identifier="gtk_text_buffer_register_serialize_format">
         <return-value>
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="Gdk.Atom" c:type="GdkAtom"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
@@ -30506,7 +35270,7 @@
       <method name="register_serialize_tagset"
               c:identifier="gtk_text_buffer_register_serialize_tagset">
         <return-value>
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="Gdk.Atom" c:type="GdkAtom"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
@@ -30520,7 +35284,7 @@
       <method name="register_deserialize_format"
               c:identifier="gtk_text_buffer_register_deserialize_format">
         <return-value>
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="Gdk.Atom" c:type="GdkAtom"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
@@ -30544,7 +35308,7 @@
       <method name="register_deserialize_tagset"
               c:identifier="gtk_text_buffer_register_deserialize_tagset">
         <return-value>
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="Gdk.Atom" c:type="GdkAtom"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
@@ -30565,7 +35329,7 @@
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
           <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+            <type name="Gdk.Atom" c:type="GdkAtom"/>
           </parameter>
         </parameters>
       </method>
@@ -30579,7 +35343,7 @@
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
           <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+            <type name="Gdk.Atom" c:type="GdkAtom"/>
           </parameter>
         </parameters>
       </method>
@@ -30593,7 +35357,7 @@
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
           <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+            <type name="Gdk.Atom" c:type="GdkAtom"/>
           </parameter>
           <parameter name="can_create_tags">
             <type name="boolean" c:type="gboolean"/>
@@ -30610,14 +35374,14 @@
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
           <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+            <type name="Gdk.Atom" 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*"/>
+          <type name="Gdk.Atom" c:type="GdkAtom*"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
@@ -30631,7 +35395,7 @@
       <method name="get_deserialize_formats"
               c:identifier="gtk_text_buffer_get_deserialize_formats">
         <return-value>
-          <type name="GdkAtom" c:type="GdkAtom*"/>
+          <type name="Gdk.Atom" c:type="GdkAtom*"/>
         </return-value>
         <parameters>
           <parameter name="buffer">
@@ -30654,7 +35418,7 @@
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
           <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+            <type name="Gdk.Atom" c:type="GdkAtom"/>
           </parameter>
           <parameter name="start">
             <type name="TextIter" c:type="GtkTextIter*"/>
@@ -30679,7 +35443,7 @@
             <type name="TextBuffer" c:type="GtkTextBuffer*"/>
           </parameter>
           <parameter name="format">
-            <type name="GdkAtom" c:type="GdkAtom"/>
+            <type name="Gdk.Atom" c:type="GdkAtom"/>
           </parameter>
           <parameter name="iter">
             <type name="TextIter" c:type="GtkTextIter*"/>
@@ -30744,7 +35508,7 @@
             <type name="TextIter" c:type="GtkTextIter*"/>
           </parameter>
           <parameter name="pixbuf">
-            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+            <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </callback>
@@ -30947,7 +35711,7 @@
             <type name="TextIter" c:type="GtkTextIter"/>
           </parameter>
           <parameter name="p0">
-            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf"/>
+            <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf"/>
           </parameter>
         </parameters>
       </glib:signal>
@@ -31110,7 +35874,7 @@
     </record>
     <record name="TargetPair" c:type="GtkTargetPair">
       <field name="target">
-        <type name="GdkAtom" c:type="GdkAtom"/>
+        <type name="Gdk.Atom" c:type="GdkAtom"/>
       </field>
       <field name="flags">
         <type name="uint" c:type="guint"/>
@@ -31161,7 +35925,7 @@
           <type name="TargetList" c:type="GtkTargetList*"/>
         </parameter>
         <parameter name="target">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="Gdk.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="flags">
           <type name="uint" c:type="guint"/>
@@ -31262,7 +36026,7 @@
           <type name="TargetList" c:type="GtkTargetList*"/>
         </parameter>
         <parameter name="target">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="Gdk.Atom" c:type="GdkAtom"/>
         </parameter>
       </parameters>
     </function>
@@ -31275,7 +36039,7 @@
           <type name="TargetList" c:type="GtkTargetList*"/>
         </parameter>
         <parameter name="target">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="Gdk.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="info">
           <type name="uint" c:type="guint*"/>
@@ -31319,7 +36083,7 @@
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="selection">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="Gdk.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="time_">
           <type name="uint32" c:type="guint32"/>
@@ -31339,7 +36103,7 @@
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="selection">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="Gdk.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="time_">
           <type name="uint32" c:type="guint32"/>
@@ -31356,10 +36120,10 @@
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="selection">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="Gdk.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="target">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="Gdk.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="info">
           <type name="uint" c:type="guint"/>
@@ -31376,7 +36140,7 @@
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="selection">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="Gdk.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="targets">
           <type name="TargetEntry" c:type="GtkTargetEntry*"/>
@@ -31396,7 +36160,7 @@
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="selection">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="Gdk.Atom" c:type="GdkAtom"/>
         </parameter>
       </parameters>
     </function>
@@ -31409,10 +36173,10 @@
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="selection">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="Gdk.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="target">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="Gdk.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="time_">
           <type name="uint32" c:type="guint32"/>
@@ -31428,7 +36192,7 @@
           <type name="SelectionData" c:type="GtkSelectionData*"/>
         </parameter>
         <parameter name="type">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="Gdk.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="format">
           <type name="int" c:type="gint"/>
@@ -31479,14 +36243,14 @@
           <type name="SelectionData" c:type="GtkSelectionData*"/>
         </parameter>
         <parameter name="pixbuf">
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.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*"/>
+        <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
       </return-value>
       <parameters>
         <parameter name="selection_data">
@@ -31529,7 +36293,7 @@
           <type name="SelectionData" c:type="GtkSelectionData*"/>
         </parameter>
         <parameter name="targets">
-          <type name="GdkAtom" c:type="GdkAtom**"/>
+          <type name="Gdk.Atom" c:type="GdkAtom**"/>
         </parameter>
         <parameter name="n_atoms">
           <type name="int" c:type="gint*"/>
@@ -31593,7 +36357,7 @@
       </return-value>
       <parameters>
         <parameter name="targets">
-          <type name="GdkAtom" c:type="GdkAtom*"/>
+          <type name="Gdk.Atom" c:type="GdkAtom*"/>
         </parameter>
         <parameter name="n_targets">
           <type name="int" c:type="gint"/>
@@ -31607,7 +36371,7 @@
       </return-value>
       <parameters>
         <parameter name="targets">
-          <type name="GdkAtom" c:type="GdkAtom*"/>
+          <type name="Gdk.Atom" c:type="GdkAtom*"/>
         </parameter>
         <parameter name="n_targets">
           <type name="int" c:type="gint"/>
@@ -31624,733 +36388,1338 @@
       </return-value>
       <parameters>
         <parameter name="targets">
-          <type name="GdkAtom" c:type="GdkAtom*"/>
+          <type name="Gdk.Atom" 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>
+        </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="Gdk.Atom" 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="Gdk.Atom" 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="GdkPixbuf.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="Gdk.Atom" 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"/>
-      </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>
+      </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"/>
-      </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>
+      </property>
+      <property name="restrict-to-fill-level">
         <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">
+      </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>
+    <record name="RangeClass" c:type="GtkRangeClass">
+      <field name="parent_class">
+        <type name="WidgetClass" c:type="GtkWidgetClass"/>
+      </field>
+      <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>
+    </record>
+    <function name="range_get_wheel_delta"
+              c:identifier="_gtk_range_get_wheel_delta">
       <return-value>
-        <type name="boolean" c:type="gboolean"/>
+        <type name="double" c:type="gdouble"/>
       </return-value>
       <parameters>
-        <parameter name="widget">
-          <type name="Widget" c:type="GtkWidget*"/>
+        <parameter name="range">
+          <type name="Range" c:type="GtkRange*"/>
         </parameter>
-        <parameter name="event">
-          <type name="Gdk.EventProperty" c:type="GdkEventProperty*"/>
+        <parameter name="direction">
+          <type name="Gdk.ScrollDirection" c:type="GdkScrollDirection"/>
         </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">
+    <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>
+    <record name="ScrollbarClass" c:type="GtkScrollbarClass">
+      <field name="parent_class">
+        <type name="RangeClass" c:type="GtkRangeClass"/>
+      </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>
+    </record>
+    <class name="HScrollbar"
+           c:type="GtkHScrollbar"
+           parent="Scrollbar"
+           glib:type-name="GtkHScrollbar"
+           glib:get-type="gtk_hscrollbar_get_type">
+    </class>
+    <record name="HScrollbarClass" c:type="GtkHScrollbarClass">
+      <field name="parent_class">
+        <type name="ScrollbarClass" c:type="GtkScrollbarClass"/>
+      </field>
+    </record>
+    <function name="hscrollbar_new" c:identifier="gtk_hscrollbar_new">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </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="adjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </parameter>
       </parameters>
-    </callback>
-    <function name="clipboard_handle_event"
-              c:identifier="_gtk_clipboard_handle_event">
+    </function>
+    <class name="VScrollbar"
+           c:type="GtkVScrollbar"
+           parent="Scrollbar"
+           glib:type-name="GtkVScrollbar"
+           glib:get-type="gtk_vscrollbar_get_type">
+    </class>
+    <record name="VScrollbarClass" c:type="GtkVScrollbarClass">
+      <field name="parent_class">
+        <type name="ScrollbarClass" c:type="GtkScrollbarClass"/>
+      </field>
+    </record>
+    <function name="vscrollbar_new" c:identifier="gtk_vscrollbar_new">
       <return-value>
-        <type name="none" c:type="void"/>
+        <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
       <parameters>
-        <parameter name="event">
-          <type name="Gdk.EventOwnerChange" c:type="GdkEventOwnerChange*"/>
+        <parameter name="adjustment">
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </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">
+    <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="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="policy">
-            <type name="UpdateType" c:type="GtkUpdateType"/>
+          <parameter name="adjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_update_policy"
-              c:identifier="gtk_range_get_update_policy">
+      <method name="set_vadjustment" c:identifier="gtk_clist_set_vadjustment">
         <return-value>
-          <type name="UpdateType" c:type="GtkUpdateType"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <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_adjustment" c:identifier="gtk_range_set_adjustment">
+      <method name="get_hadjustment" c:identifier="gtk_clist_get_hadjustment">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_adjustment" c:identifier="gtk_range_get_adjustment">
+      <method name="get_vadjustment" c:identifier="gtk_clist_get_vadjustment">
         <return-value>
           <type name="Adjustment" c:type="GtkAdjustment*"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_inverted" c:identifier="gtk_range_set_inverted">
+      <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="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="setting">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="type">
+            <type name="ShadowType" c:type="GtkShadowType"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_inverted" c:identifier="gtk_range_get_inverted">
+      <method name="set_selection_mode"
+              c:identifier="gtk_clist_set_selection_mode">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <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_lower_stepper_sensitivity"
-              c:identifier="gtk_range_set_lower_stepper_sensitivity">
+      <method name="set_reorderable" c:identifier="gtk_clist_set_reorderable">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="sensitivity">
-            <type name="SensitivityType" c:type="GtkSensitivityType"/>
+          <parameter name="reorderable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_lower_stepper_sensitivity"
-              c:identifier="gtk_range_get_lower_stepper_sensitivity">
+      <method name="set_use_drag_icons"
+              c:identifier="gtk_clist_set_use_drag_icons">
         <return-value>
-          <type name="SensitivityType" c:type="GtkSensitivityType"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <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_upper_stepper_sensitivity"
-              c:identifier="gtk_range_set_upper_stepper_sensitivity">
+      <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="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="sensitivity">
-            <type name="SensitivityType" c:type="GtkSensitivityType"/>
+          <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="get_upper_stepper_sensitivity"
-              c:identifier="gtk_range_get_upper_stepper_sensitivity">
+      <method name="freeze" c:identifier="gtk_clist_freeze">
         <return-value>
-          <type name="SensitivityType" c:type="GtkSensitivityType"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_increments" c:identifier="gtk_range_set_increments">
+      <method name="thaw" c:identifier="gtk_clist_thaw">
         <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 name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_range" c:identifier="gtk_range_set_range">
+      <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="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="min">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="max">
-            <type name="double" c:type="gdouble"/>
+        </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="set_value" c:identifier="gtk_range_set_value">
+      <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="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="value">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_value" c:identifier="gtk_range_get_value">
+      <method name="column_title_passive"
+              c:identifier="gtk_clist_column_title_passive">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <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_show_fill_level"
-              c:identifier="gtk_range_set_show_fill_level">
+      <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="range">
-            <type name="Range" c:type="GtkRange*"/>
-          </parameter>
-          <parameter name="show_fill_level">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_show_fill_level"
-              c:identifier="gtk_range_get_show_fill_level">
+      <method name="column_titles_passive"
+              c:identifier="gtk_clist_column_titles_passive">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_restrict_to_fill_level"
-              c:identifier="gtk_range_set_restrict_to_fill_level">
+      <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="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="restrict_to_fill_level">
-            <type name="boolean" c:type="gboolean"/>
+          <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_restrict_to_fill_level"
-              c:identifier="gtk_range_get_restrict_to_fill_level">
+      <method name="get_column_title"
+              c:identifier="gtk_clist_get_column_title">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="string" c:type="gchar*"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <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_fill_level" c:identifier="gtk_range_set_fill_level">
+      <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="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="fill_level">
-            <type name="double" c:type="gdouble"/>
+          <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_fill_level" c:identifier="gtk_range_get_fill_level">
+      <method name="get_column_widget"
+              c:identifier="gtk_clist_get_column_widget">
         <return-value>
-          <type name="double" c:type="gdouble"/>
+          <type name="Widget" c:type="GtkWidget*"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </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">
+      <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="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <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>
-      </callback>
-      <callback name="adjust_bounds" c:type="adjust_bounds">
+      </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="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="new_value">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="visible">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="move_slider" c:type="move_slider">
+      </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="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="scroll">
-            <type name="ScrollType" c:type="GtkScrollType"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="resizeable">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="get_range_border" c:type="get_range_border">
+      </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="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="border_">
-            <type name="Border" c:type="GtkBorder*"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="auto_resize">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="change_value" c:type="change_value">
+      </method>
+      <method name="columns_autosize"
+              c:identifier="gtk_clist_columns_autosize">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
-          <parameter name="range">
-            <type name="Range" c:type="GtkRange*"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="scroll">
-            <type name="ScrollType" c:type="GtkScrollType"/>
+        </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="new_value">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </callback>
-      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
+      </method>
+      <method name="set_column_width"
+              c:identifier="gtk_clist_set_column_width">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </callback>
-      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
+        <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>
-      </callback>
-      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
+        <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>
-      </callback>
-      <glib:signal name="value-changed">
+        <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>
-      </glib:signal>
-      <glib:signal name="adjust-bounds">
+        <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="object">
-            <type name="double" c:type="gdouble"/>
+          <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>
-      </glib:signal>
-      <glib:signal name="move-slider">
+      </method>
+      <method name="row_is_visible" c:identifier="gtk_clist_row_is_visible">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="Visibility" c:type="GtkVisibility"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="ScrollType" c:type="GtkScrollType"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="change-value">
+      </method>
+      <method name="get_cell_type" c:identifier="gtk_clist_get_cell_type">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="CellType" c:type="GtkCellType"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="ScrollType" c:type="GtkScrollType"/>
+          <parameter name="clist">
+            <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="p0">
-            <type name="double" c:type="gdouble"/>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </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">
+      </method>
+      <method name="set_text" c:identifier="gtk_clist_set_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -32358,45 +37727,81 @@
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <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="set_vadjustment" c:identifier="gtk_clist_set_vadjustment">
+      <method name="get_text" c:identifier="gtk_clist_get_text">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="adjustment">
-            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <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="get_hadjustment" c:identifier="gtk_clist_get_hadjustment">
+      <method name="set_pixmap" c:identifier="gtk_clist_set_pixmap">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <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_vadjustment" c:identifier="gtk_clist_get_vadjustment">
+      <method name="get_pixmap" c:identifier="gtk_clist_get_pixmap">
         <return-value>
-          <type name="Adjustment" c:type="GtkAdjustment*"/>
+          <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_shadow_type" c:identifier="gtk_clist_set_shadow_type">
+      <method name="set_pixtext" c:identifier="gtk_clist_set_pixtext">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -32404,26 +37809,55 @@
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="type">
-            <type name="ShadowType" c:type="GtkShadowType"/>
+          <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="set_selection_mode"
-              c:identifier="gtk_clist_set_selection_mode">
+      <method name="get_pixtext" c:identifier="gtk_clist_get_pixtext">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="mode">
-            <type name="SelectionMode" c:type="GtkSelectionMode"/>
+          <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_reorderable" c:identifier="gtk_clist_set_reorderable">
+      <method name="set_foreground" c:identifier="gtk_clist_set_foreground">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -32431,13 +37865,15 @@
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="reorderable">
-            <type name="boolean" c:type="gboolean"/>
+          <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_use_drag_icons"
-              c:identifier="gtk_clist_set_use_drag_icons">
+      <method name="set_background" c:identifier="gtk_clist_set_background">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -32445,13 +37881,15 @@
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="use_icons">
-            <type name="boolean" c:type="gboolean"/>
+          <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_button_actions"
-              c:identifier="gtk_clist_set_button_actions">
+      <method name="set_cell_style" c:identifier="gtk_clist_set_cell_style">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -32459,25 +37897,34 @@
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="button">
-            <type name="uint" c:type="guint"/>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="button_actions">
-            <type name="uint8" c:type="guint8"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="style">
+            <type name="Style" c:type="GtkStyle*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="freeze" c:identifier="gtk_clist_freeze">
+      <method name="get_cell_style" c:identifier="gtk_clist_get_cell_style">
         <return-value>
-          <type name="none" c:type="void"/>
+          <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="thaw" c:identifier="gtk_clist_thaw">
+      <method name="set_row_style" c:identifier="gtk_clist_set_row_style">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -32485,21 +37932,28 @@
           <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="column_titles_show"
-              c:identifier="gtk_clist_column_titles_show">
+      <method name="get_row_style" c:identifier="gtk_clist_get_row_style">
         <return-value>
-          <type name="none" c:type="void"/>
+          <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="column_titles_hide"
-              c:identifier="gtk_clist_column_titles_hide">
+      <method name="set_shift" c:identifier="gtk_clist_set_shift">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -32507,10 +37961,21 @@
           <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="column_title_active"
-              c:identifier="gtk_clist_column_title_active">
+      <method name="set_selectable" c:identifier="gtk_clist_set_selectable">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -32518,80 +37983,83 @@
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="column">
+          <parameter name="row">
             <type name="int" c:type="gint"/>
           </parameter>
+          <parameter name="selectable">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
         </parameters>
       </method>
-      <method name="column_title_passive"
-              c:identifier="gtk_clist_column_title_passive">
+      <method name="get_selectable" c:identifier="gtk_clist_get_selectable">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="boolean" c:type="gboolean"/>
         </return-value>
         <parameters>
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="column">
+          <parameter name="row">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="column_titles_active"
-              c:identifier="gtk_clist_column_titles_active">
+      <method name="prepend" c:identifier="gtk_clist_prepend">
         <return-value>
-          <type name="none" c:type="void"/>
+          <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="column_titles_passive"
-              c:identifier="gtk_clist_column_titles_passive">
+      <method name="append" c:identifier="gtk_clist_append">
         <return-value>
-          <type name="none" c:type="void"/>
+          <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="set_column_title"
-              c:identifier="gtk_clist_set_column_title">
+      <method name="insert" c:identifier="gtk_clist_insert">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="column">
+          <parameter name="row">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="title">
+          <parameter name="text">
             <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_column_title"
-              c:identifier="gtk_clist_get_column_title">
+      <method name="remove" c:identifier="gtk_clist_remove">
         <return-value>
-          <type name="string" c:type="gchar*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="column">
+          <parameter name="row">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_column_widget"
-              c:identifier="gtk_clist_set_column_widget">
+      <method name="set_row_data" c:identifier="gtk_clist_set_row_data">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -32599,64 +38067,62 @@
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="column">
+          <parameter name="row">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="widget">
-            <type name="Widget" c:type="GtkWidget*"/>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_column_widget"
-              c:identifier="gtk_clist_get_column_widget">
+      <method name="set_row_data_full"
+              c:identifier="gtk_clist_set_row_data_full">
         <return-value>
-          <type name="Widget" c:type="GtkWidget*"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="column">
+          <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="set_column_justification"
-              c:identifier="gtk_clist_set_column_justification">
+      <method name="get_row_data" c:identifier="gtk_clist_get_row_data">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="any" c:type="gpointer"/>
         </return-value>
         <parameters>
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="column">
+          <parameter name="row">
             <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">
+      <method name="find_row_from_data"
+              c:identifier="gtk_clist_find_row_from_data">
         <return-value>
-          <type name="none" c:type="void"/>
+          <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>
-          <parameter name="visible">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="data">
+            <type name="any" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_column_resizeable"
-              c:identifier="gtk_clist_set_column_resizeable">
+      <method name="select_row" c:identifier="gtk_clist_select_row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -32664,16 +38130,15 @@
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="column">
+          <parameter name="row">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="resizeable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_column_auto_resize"
-              c:identifier="gtk_clist_set_column_auto_resize">
+      <method name="unselect_row" c:identifier="gtk_clist_unselect_row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -32681,18 +38146,27 @@
           <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="auto_resize">
-            <type name="boolean" c:type="gboolean"/>
+        </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="columns_autosize"
-              c:identifier="gtk_clist_columns_autosize">
+      <method name="clear" c:identifier="gtk_clist_clear">
         <return-value>
-          <type name="int" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="clist">
@@ -32700,8 +38174,8 @@
           </parameter>
         </parameters>
       </method>
-      <method name="optimal_column_width"
-              c:identifier="gtk_clist_optimal_column_width">
+      <method name="get_selection_info"
+              c:identifier="gtk_clist_get_selection_info">
         <return-value>
           <type name="int" c:type="gint"/>
         </return-value>
@@ -32709,13 +38183,21 @@
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="column">
+          <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="set_column_width"
-              c:identifier="gtk_clist_set_column_width">
+      <method name="select_all" c:identifier="gtk_clist_select_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -32723,16 +38205,19 @@
           <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"/>
+        </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="set_column_min_width"
-              c:identifier="gtk_clist_set_column_min_width">
+      <method name="swap_rows" c:identifier="gtk_clist_swap_rows">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -32740,16 +38225,15 @@
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="column">
+          <parameter name="row1">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="min_width">
+          <parameter name="row2">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_column_max_width"
-              c:identifier="gtk_clist_set_column_max_width">
+      <method name="row_move" c:identifier="gtk_clist_row_move">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -32757,15 +38241,16 @@
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="column">
+          <parameter name="source_row">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="max_width">
+          <parameter name="dest_row">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
-      <method name="set_row_height" c:identifier="gtk_clist_set_row_height">
+      <method name="set_compare_func"
+              c:identifier="gtk_clist_set_compare_func">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -32773,12 +38258,12 @@
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="height">
-            <type name="uint" c:type="guint"/>
+          <parameter name="cmp_func">
+            <type name="CListCompareFunc" c:type="GtkCListCompareFunc"/>
           </parameter>
         </parameters>
       </method>
-      <method name="moveto" c:identifier="gtk_clist_moveto">
+      <method name="set_sort_column" c:identifier="gtk_clist_set_sort_column">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -32786,50 +38271,88 @@
           <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"/>
+        </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="col_align">
-            <type name="float" c:type="gfloat"/>
+          <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="row_is_visible" c:identifier="gtk_clist_row_is_visible">
+      <method name="set_auto_sort" c:identifier="gtk_clist_set_auto_sort">
         <return-value>
-          <type name="Visibility" c:type="GtkVisibility"/>
+          <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 name="auto_sort">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
-      <method name="get_cell_type" c:identifier="gtk_clist_get_cell_type">
+      <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="CellType" c:type="GtkCellType"/>
+          <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 name="hadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
-          <parameter name="column">
-            <type name="int" c:type="gint"/>
+          <parameter name="vadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_text" c:identifier="gtk_clist_set_text">
+      </callback>
+      <callback name="refresh" c:type="refresh">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -32837,20 +38360,11 @@
           <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">
+      </callback>
+      <callback name="select_row" c:type="select_row">
         <return-value>
-          <type name="int" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="clist">
@@ -32862,12 +38376,12 @@
           <parameter name="column">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="text">
-            <type name="GLib.char" c:type="gchar**"/>
+          <parameter name="event">
+            <type name="Gdk.Event" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_pixmap" c:identifier="gtk_clist_set_pixmap">
+      </callback>
+      <callback name="unselect_row" c:type="unselect_row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -32881,37 +38395,28 @@
           <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 name="event">
+            <type name="Gdk.Event" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_pixmap" c:identifier="gtk_clist_get_pixmap">
+      </callback>
+      <callback name="row_move" c:type="row_move">
         <return-value>
-          <type name="int" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="row">
+          <parameter name="source_row">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="column">
+          <parameter name="dest_row">
             <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">
+      </callback>
+      <callback name="click_column" c:type="click_column">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -32919,55 +38424,28 @@
           <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">
+      </callback>
+      <callback name="resize_column" c:type="resize_column">
         <return-value>
-          <type name="int" c:type="gint"/>
+          <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="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 name="width">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_foreground" c:identifier="gtk_clist_set_foreground">
+      </callback>
+      <callback name="toggle_focus_row" c:type="toggle_focus_row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -32975,15 +38453,9 @@
           <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">
+      </callback>
+      <callback name="select_all" c:type="select_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -32991,15 +38463,9 @@
           <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">
+      </callback>
+      <callback name="unselect_all" c:type="unselect_all">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -33007,34 +38473,19 @@
           <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">
+      </callback>
+      <callback name="undo_selection" c:type="undo_selection">
         <return-value>
-          <type name="Style" c:type="GtkStyle*"/>
+          <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="set_row_style" c:identifier="gtk_clist_set_row_style">
+      </callback>
+      <callback name="start_selection" c:type="start_selection">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -33042,28 +38493,19 @@
           <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">
+      </callback>
+      <callback name="end_selection" c:type="end_selection">
         <return-value>
-          <type name="Style" c:type="GtkStyle*"/>
+          <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_shift" c:identifier="gtk_clist_set_shift">
+      </callback>
+      <callback name="extend_selection" c:type="extend_selection">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -33071,21 +38513,18 @@
           <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 name="scroll_type">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
-          <parameter name="vertical">
-            <type name="int" c:type="gint"/>
+          <parameter name="position">
+            <type name="float" c:type="gfloat"/>
           </parameter>
-          <parameter name="horizontal">
-            <type name="int" c:type="gint"/>
+          <parameter name="auto_start_selection">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_selectable" c:identifier="gtk_clist_set_selectable">
+      </callback>
+      <callback name="scroll_horizontal" c:type="scroll_horizontal">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -33093,83 +38532,80 @@
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="row">
-            <type name="int" c:type="gint"/>
+          <parameter name="scroll_type">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
-          <parameter name="selectable">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="position">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_selectable" c:identifier="gtk_clist_get_selectable">
+      </callback>
+      <callback name="scroll_vertical" c:type="scroll_vertical">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <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 name="scroll_type">
+            <type name="ScrollType" c:type="GtkScrollType"/>
+          </parameter>
+          <parameter name="position">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="prepend" c:identifier="gtk_clist_prepend">
+      </callback>
+      <callback name="toggle_add_mode" c:type="toggle_add_mode">
         <return-value>
-          <type name="int" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </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">
+      </callback>
+      <callback name="abort_column_resize" c:type="abort_column_resize">
         <return-value>
-          <type name="int" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </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">
+      </callback>
+      <callback name="resync_selection" c:type="resync_selection">
         <return-value>
-          <type name="int" c:type="gint"/>
+          <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="text">
-            <type name="string" c:type="gchar*"/>
+          <parameter name="event">
+            <type name="Gdk.Event" c:type="GdkEvent*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="remove" c:identifier="gtk_clist_remove">
+      </callback>
+      <callback name="selection_find" c:type="selection_find">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="GLib.List" c:type="GList*"/>
         </return-value>
         <parameters>
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="row">
+          <parameter name="row_number">
             <type name="int" c:type="gint"/>
           </parameter>
+          <parameter name="row_list_element">
+            <type name="GLib.List" c:type="GList*"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="set_row_data" c:identifier="gtk_clist_set_row_data">
+      </callback>
+      <callback name="draw_row" c:type="draw_row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -33177,16 +38613,18 @@
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
+          <parameter name="area">
+            <type name="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
           <parameter name="row">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="clist_row">
+            <type name="CListRow" c:type="GtkCListRow*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_row_data_full"
-              c:identifier="gtk_clist_set_row_data_full">
+      </callback>
+      <callback name="draw_drag_highlight" c:type="draw_drag_highlight">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -33194,45 +38632,41 @@
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="row">
-            <type name="int" c:type="gint"/>
+          <parameter name="target_row">
+            <type name="CListRow" c:type="GtkCListRow*"/>
           </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="target_row_number">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="destroy">
-            <type name="DestroyNotify" c:type="GtkDestroyNotify"/>
+          <parameter name="drag_pos">
+            <type name="CListDragPos" c:type="GtkCListDragPos"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="get_row_data" c:identifier="gtk_clist_get_row_data">
+      </callback>
+      <callback name="clear" c:type="clear">
         <return-value>
-          <type name="any" c:type="gpointer"/>
+          <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="find_row_from_data"
-              c:identifier="gtk_clist_find_row_from_data">
+      </callback>
+      <callback name="fake_unselect_all" c:type="fake_unselect_all">
         <return-value>
-          <type name="int" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="data">
-            <type name="any" c:type="gpointer"/>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="select_row" c:identifier="gtk_clist_select_row">
+      </callback>
+      <callback name="sort_list" c:type="sort_list">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -33240,17 +38674,11 @@
           <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">
+      </callback>
+      <callback name="insert_row" c:type="insert_row">
         <return-value>
-          <type name="none" c:type="void"/>
+          <type name="int" c:type="gint"/>
         </return-value>
         <parameters>
           <parameter name="clist">
@@ -33259,12 +38687,12 @@
           <parameter name="row">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="column">
-            <type name="int" c:type="gint"/>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="undo_selection" c:identifier="gtk_clist_undo_selection">
+      </callback>
+      <callback name="remove_row" c:type="remove_row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -33272,9 +38700,12 @@
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="clear" c:identifier="gtk_clist_clear">
+      </callback>
+      <callback name="set_cell_contents" c:type="set_cell_contents">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
@@ -33282,170 +38713,216 @@
           <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>
+          <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.Bitmap" c:type="GdkBitmap*"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="get_selection_info"
-              c:identifier="gtk_clist_get_selection_info">
+      </callback>
+      <callback name="cell_size_request" c:type="cell_size_request">
         <return-value>
-          <type name="int" c:type="gint"/>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="clist">
             <type name="CList" c:type="GtkCList*"/>
           </parameter>
-          <parameter name="x">
-            <type name="int" c:type="gint"/>
+          <parameter name="clist_row">
+            <type name="CListRow" c:type="GtkCListRow*"/>
           </parameter>
-          <parameter name="y">
+          <parameter name="column">
             <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 name="requisition">
+            <type name="Requisition" c:type="GtkRequisition*"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="select_all" c:identifier="gtk_clist_select_all">
+      </callback>
+      <glib:signal name="set-scroll-adjustments">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="CList" c:type="GtkCList*"/>
+          <parameter name="object">
+            <type name="Adjustment" c:type="GtkAdjustment"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="Adjustment" c:type="GtkAdjustment"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="unselect_all" c:identifier="gtk_clist_unselect_all">
+      </glib:signal>
+      <glib:signal name="select-row">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="CList" c:type="GtkCList*"/>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="swap_rows" c:identifier="gtk_clist_swap_rows">
+      </glib:signal>
+      <glib:signal name="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="row1">
+          <parameter name="object">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="row2">
+          <parameter name="p0">
             <type name="int" c:type="gint"/>
           </parameter>
+          <parameter name="p1">
+            <type name="Gdk.Event" c:type="GdkEvent"/>
+          </parameter>
         </parameters>
-      </method>
-      <method name="row_move" c:identifier="gtk_clist_row_move">
+      </glib:signal>
+      <glib:signal name="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">
+          <parameter name="object">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="dest_row">
+          <parameter name="p0">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_compare_func"
-              c:identifier="gtk_clist_set_compare_func">
+      </glib:signal>
+      <glib:signal name="click-column">
         <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 name="object">
+            <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_sort_column" c:identifier="gtk_clist_set_sort_column">
+      </glib:signal>
+      <glib:signal name="resize-column">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="CList" c:type="GtkCList*"/>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="column">
+          <parameter name="p0">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_sort_type" c:identifier="gtk_clist_set_sort_type">
+      </glib:signal>
+      <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="clist">
-            <type name="CList" c:type="GtkCList*"/>
+          <parameter name="object">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
-          <parameter name="sort_type">
-            <type name="SortType" c:type="GtkSortType"/>
+          <parameter name="p0">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="boolean" c:type="gboolean"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="sort" c:identifier="gtk_clist_sort">
+      </glib:signal>
+      <glib:signal name="scroll-vertical">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="CList" c:type="GtkCList*"/>
+          <parameter name="object">
+            <type name="ScrollType" c:type="GtkScrollType"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
-      </method>
-      <method name="set_auto_sort" c:identifier="gtk_clist_set_auto_sort">
+      </glib:signal>
+      <glib:signal name="scroll-horizontal">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="clist">
-            <type name="CList" c:type="GtkCList*"/>
+          <parameter name="object">
+            <type name="ScrollType" c:type="GtkScrollType"/>
           </parameter>
-          <parameter name="auto_sort">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="p0">
+            <type name="float" c:type="gfloat"/>
           </parameter>
         </parameters>
-      </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>
+      </glib:signal>
+      <glib:signal name="abort-column-resize">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <record name="CListClass" c:type="GtkCListClass">
+      <field name="parent_class">
+        <type name="ContainerClass" c:type="GtkContainerClass"/>
+      </field>
       <callback name="set_scroll_adjustments" c:type="set_scroll_adjustments">
         <return-value>
           <type name="none" c:type="void"/>
@@ -33865,170 +39342,7 @@
           </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>
-      <glib:signal name="select-row">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="unselect-row">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="Gdk.Event" c:type="GdkEvent"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="row-move">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <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="click-column">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <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>
-        <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>
-      </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="p0">
-            <type name="float" c:type="gfloat"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </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>
-      </glib:signal>
-      <glib:signal name="scroll-horizontal">
-        <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>
-      </glib:signal>
-      <glib:signal name="abort-column-resize">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </class>
+    </record>
     <record name="CListColumn" c:type="GtkCListColumn">
       <field name="title">
         <type name="string" c:type="gchar*"/>
@@ -34422,6 +39736,41 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="ColorButtonClass" c:type="GtkColorButtonClass">
+      <field name="parent_class">
+        <type name="ButtonClass" c:type="GtkButtonClass"/>
+      </field>
+      <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>
+        </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>
+    </record>
     <record name="ColorButtonPrivate" c:type="GtkColorButtonPrivate"/>
     <function name="color_button_new" c:identifier="gtk_color_button_new">
       <return-value>
@@ -34445,6 +39794,11 @@
            glib:type-name="GtkVBox"
            glib:get-type="gtk_vbox_get_type">
     </class>
+    <record name="VBoxClass" c:type="GtkVBoxClass">
+      <field name="parent_class">
+        <type name="BoxClass" c:type="GtkBoxClass"/>
+      </field>
+    </record>
     <function name="vbox_new" c:identifier="gtk_vbox_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -34718,6 +40072,41 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="ColorSelectionClass" c:type="GtkColorSelectionClass">
+      <field name="parent_class">
+        <type name="VBoxClass" c:type="GtkVBoxClass"/>
+      </field>
+      <callback name="color_changed" c:type="color_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="color_selection">
+            <type name="ColorSelection" c:type="GtkColorSelection*"/>
+          </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>
+    </record>
     <callback name="ColorSelectionChangePaletteFunc"
               c:type="GtkColorSelectionChangePaletteFunc">
       <return-value>
@@ -34838,6 +40227,32 @@
         </return-value>
       </callback>
     </class>
+    <record name="ColorSelectionDialogClass"
+            c:type="GtkColorSelectionDialogClass">
+      <field name="parent_class">
+        <type name="DialogClass" c:type="GtkDialogClass"/>
+      </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>
+    </record>
     <function name="color_selection_dialog_new"
               c:identifier="gtk_color_selection_dialog_new">
       <return-value>
@@ -34861,7 +40276,7 @@
           <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
         </parameter>
         <parameter name="target">
-          <type name="GdkAtom" c:type="GdkAtom"/>
+          <type name="Gdk.Atom" c:type="GdkAtom"/>
         </parameter>
         <parameter name="time_">
           <type name="uint32" c:type="guint32"/>
@@ -34973,7 +40388,7 @@
     <function name="drag_dest_find_target"
               c:identifier="gtk_drag_dest_find_target">
       <return-value>
-        <type name="GdkAtom" c:type="GdkAtom"/>
+        <type name="Gdk.Atom" c:type="GdkAtom"/>
       </return-value>
       <parameters>
         <parameter name="widget">
@@ -35190,7 +40605,7 @@
           <type name="Widget" c:type="GtkWidget*"/>
         </parameter>
         <parameter name="pixbuf">
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
       </parameters>
     </function>
@@ -35300,7 +40715,7 @@
           <type name="Gdk.DragContext" c:type="GdkDragContext*"/>
         </parameter>
         <parameter name="pixbuf">
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
         <parameter name="hot_x">
           <type name="int" c:type="gint"/>
@@ -35589,41 +41004,197 @@
           </parameter>
         </parameters>
       </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="string" c:type="gchararray"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="p1">
-            <type name="any" c:type="gpointer"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="delete-text">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="int" c:type="gint"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="int" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </interface>
+      <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="string" c:type="gchararray"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="p1">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="delete-text">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </interface>
+    <record name="EditableClass" c:type="GtkEditableClass">
+      <field name="base_iface">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="insert_text" c:type="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="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="delete_text" c:type="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>
+      </callback>
+      <callback name="changed" c:type="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="editable">
+            <type name="Editable" c:type="GtkEditable*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="do_insert_text" c:type="do_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="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="length">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="position">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="do_delete_text" c:type="do_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>
+      </callback>
+      <callback name="get_chars" c:type="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>
+      </callback>
+      <callback name="set_selection_bounds" c:type="set_selection_bounds">
+        <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>
+      </callback>
+      <callback name="get_selection_bounds" c:type="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_pos">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="end_pos">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_position" c:type="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>
+      </callback>
+      <callback name="get_position" c:type="get_position">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="editable">
+            <type name="Editable" c:type="GtkEditable*"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
     <function name="editable_select_region"
               c:identifier="gtk_editable_select_region">
       <return-value>
@@ -36254,6 +41825,246 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="IMContextClass" c:type="GtkIMContextClass">
+      <field name="parent_class">
+        <type name="ObjectClass" c:type="GtkObjectClass"/>
+      </field>
+      <callback name="preedit_start" c:type="preedit_start">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="preedit_end" c:type="preedit_end">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="preedit_changed" c:type="preedit_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="commit" c:type="commit">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
+          </parameter>
+          <parameter name="str">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="retrieve_surrounding" c:type="retrieve_surrounding">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="delete_surrounding" c:type="delete_surrounding">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
+          </parameter>
+          <parameter name="offset">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="n_chars">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_client_window" c:type="set_client_window">
+        <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>
+        </parameters>
+      </callback>
+      <callback name="get_preedit_string" c:type="get_preedit_string">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <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>
+      </callback>
+      <callback name="filter_keypress" c:type="filter_keypress">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventKey" c:type="GdkEventKey*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="focus_in" c:type="focus_in">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="focus_out" c:type="focus_out">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="reset" c:type="reset">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="context">
+            <type name="IMContext" c:type="GtkIMContext*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_cursor_location" c:type="set_cursor_location">
+        <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="Gdk.Rectangle" c:type="GdkRectangle*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_use_preedit" c:type="set_use_preedit">
+        <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>
+        </parameters>
+      </callback>
+      <callback name="set_surrounding" c:type="set_surrounding">
+        <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="int" c:type="gint"/>
+          </parameter>
+          <parameter name="cursor_index">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_surrounding" c:type="get_surrounding">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <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="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>
+    </record>
     <class name="ListStore"
            c:type="GtkListStore"
            parent="GObject.Object"
@@ -36588,6 +42399,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="ListStoreClass" c:type="GtkListStoreClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </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>
+    </record>
     <callback name="TreeModelFilterVisibleFunc"
               c:type="GtkTreeModelFilterVisibleFunc">
       <return-value>
@@ -36815,6 +42651,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="TreeModelFilterClass" c:type="GtkTreeModelFilterClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <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>
+    </record>
     <record name="TreeModelFilterPrivate" c:type="GtkTreeModelFilterPrivate"/>
     <function name="tree_model_filter_new"
               c:identifier="gtk_tree_model_filter_new">
@@ -37288,6 +43149,79 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="EntryCompletionClass" c:type="GtkEntryCompletionClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="match_selected" c:type="match_selected">
+        <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>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="action_activated" c:type="action_activated">
+        <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="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="insert_prefix" c:type="insert_prefix">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="completion">
+            <type name="EntryCompletion" c:type="GtkEntryCompletion*"/>
+          </parameter>
+          <parameter name="prefix">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="cursor_on_match" c:type="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>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </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>
+    </record>
     <record name="EntryCompletionPrivate" c:type="GtkEntryCompletionPrivate"/>
     <callback name="EntryCompletionMatchFunc"
               c:type="GtkEntryCompletionMatchFunc">
@@ -37905,60 +43839,201 @@
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="Menu" c:type="GtkMenu"/>
+          <parameter name="object">
+            <type name="Menu" c:type="GtkMenu"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="activate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="insert-at-cursor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="delete-from-cursor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="DeleteType" c:type="GtkDeleteType"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="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>
+    <record name="EntryClass" c:type="GtkEntryClass">
+      <field name="parent_class">
+        <type name="WidgetClass" c:type="GtkWidgetClass"/>
+      </field>
+      <callback name="populate_popup" c:type="populate_popup">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
+          </parameter>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="activate" c:type="activate">
+        <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="move_cursor" c:type="move_cursor">
+        <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="int" c:type="gint"/>
+          </parameter>
+          <parameter name="extend_selection">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="insert_at_cursor" c:type="insert_at_cursor">
+        <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>
+        </parameters>
+      </callback>
+      <callback name="delete_from_cursor" c:type="delete_from_cursor">
+        <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>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="backspace" c:type="backspace">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="activate">
+      </callback>
+      <callback name="cut_clipboard" c:type="cut_clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="insert-at-cursor">
+        <parameters>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="copy_clipboard" c:type="copy_clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="string" c:type="gchararray"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="delete-from-cursor">
+      </callback>
+      <callback name="paste_clipboard" c:type="paste_clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="DeleteType" c:type="GtkDeleteType"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="int" c:type="gint"/>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="backspace">
+      </callback>
+      <callback name="toggle_overwrite" c:type="toggle_overwrite">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="cut-clipboard">
+        <parameters>
+          <parameter name="entry">
+            <type name="Entry" c:type="GtkEntry*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="paste-clipboard">
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="toggle-overwrite">
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-    </class>
+      </callback>
+    </record>
     <function name="entry_new" c:identifier="gtk_entry_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -39945,6 +46020,252 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="TreeViewClass" c:type="GtkTreeViewClass">
+      <field name="parent_class">
+        <type name="ContainerClass" c:type="GtkContainerClass"/>
+      </field>
+      <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="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="test_expand_row" c:type="test_expand_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="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="test_collapse_row" c:type="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>
+          <parameter name="iter">
+            <type name="TreeIter" c:type="GtkTreeIter*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="row_expanded" c:type="row_expanded">
+        <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>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="row_collapsed" c:type="row_collapsed">
+        <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>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="columns_changed" c:type="columns_changed">
+        <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="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>
+        </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="step">
+            <type name="MovementStep" c:type="GtkMovementStep"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="select_all" c:type="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" 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>
+      </callback>
+      <callback name="select_cursor_row" c:type="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" 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>
+      </callback>
+      <callback name="expand_collapse_cursor_row"
+                c:type="expand_collapse_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="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>
+      </callback>
+      <callback name="select_cursor_parent" c:type="select_cursor_parent">
+        <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="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_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>
+      <callback name="gtk_reserved4" c:type="_gtk_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </record>
     <record name="TreeViewPrivate" c:type="GtkTreeViewPrivate"/>
     <class name="TreeSelection"
            c:type="GtkTreeSelection"
@@ -40249,6 +46570,41 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="TreeSelectionClass" c:type="GtkTreeSelectionClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <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>
+    </record>
     <callback name="TreeViewColumnDropFunc" c:type="GtkTreeViewColumnDropFunc">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
@@ -40827,6 +47183,46 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="ComboBoxClass" c:type="GtkComboBoxClass">
+      <field name="parent_class">
+        <type name="BinClass" c:type="GtkBinClass"/>
+      </field>
+      <callback name="changed" c:type="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="combo_box">
+            <type name="ComboBox" c:type="GtkComboBox*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <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>
+    </record>
     <record name="ComboBoxPrivate" c:type="GtkComboBoxPrivate"/>
     <function name="combo_box_new" c:identifier="gtk_combo_box_new">
       <return-value>
@@ -40914,6 +47310,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="ComboBoxEntryClass" c:type="GtkComboBoxEntryClass">
+      <field name="parent_class">
+        <type name="ComboBoxClass" c:type="GtkComboBoxClass"/>
+      </field>
+      <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>
+    </record>
     <record name="ComboBoxEntryPrivate" c:type="GtkComboBoxEntryPrivate"/>
     <function name="combo_box_entry_new"
               c:identifier="gtk_combo_box_entry_new">
@@ -40947,6 +47368,11 @@
            glib:type-name="GtkHBox"
            glib:get-type="gtk_hbox_get_type">
     </class>
+    <record name="HBoxClass" c:type="GtkHBoxClass">
+      <field name="parent_class">
+        <type name="BoxClass" c:type="GtkBoxClass"/>
+      </field>
+    </record>
     <function name="hbox_new" c:identifier="gtk_hbox_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -41100,6 +47526,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="ComboClass" c:type="GtkComboClass">
+      <field name="parent_class">
+        <type name="HBoxClass" c:type="GtkHBoxClass"/>
+      </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>
+    </record>
     <function name="combo_new" c:identifier="gtk_combo_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -42434,12 +48885,108 @@
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
+          <parameter name="object">
+            <type name="CTreeExpansionType" c:type="GtkCTreeExpansionType"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
+    <record name="CTreeClass" c:type="GtkCTreeClass">
+      <field name="parent_class">
+        <type name="CListClass" c:type="GtkCListClass"/>
+      </field>
+      <callback name="tree_select_row" c:type="tree_select_row">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="tree_unselect_row" c:type="tree_unselect_row">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="column">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="tree_expand" c:type="tree_expand">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <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_collapse" c:type="tree_collapse">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <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="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="node">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="new_parent">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+          <parameter name="new_sibling">
+            <type name="CTreeNode" c:type="GtkCTreeNode*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="change_focus_row_expansion"
+                c:type="change_focus_row_expansion">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="ctree">
+            <type name="CTree" c:type="GtkCTree*"/>
+          </parameter>
+          <parameter name="action">
             <type name="CTreeExpansionType" c:type="GtkCTreeExpansionType"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
+      </callback>
+    </record>
     <record name="CTreeRow" c:type="GtkCTreeRow">
       <field name="row">
         <type name="CListRow" c:type="GtkCListRow"/>
@@ -42609,6 +49156,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="DrawingAreaClass" c:type="GtkDrawingAreaClass">
+      <field name="parent_class">
+        <type name="WidgetClass" c:type="GtkWidgetClass"/>
+      </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>
+    </record>
     <function name="drawing_area_new" c:identifier="gtk_drawing_area_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -42760,6 +49332,41 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="CurveClass" c:type="GtkCurveClass">
+      <field name="parent_class">
+        <type name="DrawingAreaClass" c:type="GtkDrawingAreaClass"/>
+      </field>
+      <callback name="curve_type_changed" c:type="curve_type_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="curve">
+            <type name="Curve" c:type="GtkCurve*"/>
+          </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>
+    </record>
     <function name="curve_new" c:identifier="gtk_curve_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -42827,6 +49434,11 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
     </class>
+    <record name="EventBoxClass" c:type="GtkEventBoxClass">
+      <field name="parent_class">
+        <type name="BinClass" c:type="GtkBinClass"/>
+      </field>
+    </record>
     <function name="event_box_new" c:identifier="gtk_event_box_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -43013,6 +49625,21 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="ExpanderClass" c:type="GtkExpanderClass">
+      <field name="parent_class">
+        <type name="BinClass" c:type="GtkBinClass"/>
+      </field>
+      <callback name="activate" c:type="activate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="expander">
+            <type name="Expander" c:type="GtkExpander*"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
     <record name="ExpanderPrivate" c:type="GtkExpanderPrivate"/>
     <function name="expander_new" c:identifier="gtk_expander_new">
       <return-value>
@@ -43186,39 +49813,39 @@
                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 name="action">
+        <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
       </property>
-      <property name="preview-widget">
-        <type name="Widget" c:type="GtkWidget"/>
+      <property name="show-hidden">
+        <type name="boolean" c:type="gboolean"/>
       </property>
       <property name="do-overwrite-confirmation">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="action">
-        <type name="FileChooserAction" c:type="GtkFileChooserAction"/>
+      <property name="file-system-backend">
+        <type name="string" c:type="gchararray"/>
       </property>
       <property name="use-preview-label">
         <type name="boolean" c:type="gboolean"/>
       </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="preview-widget-active">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="select-multiple">
+      <property name="local-only">
         <type name="boolean" c:type="gboolean"/>
       </property>
-      <property name="show-hidden">
+      <property name="select-multiple">
         <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"/>
@@ -43998,6 +50625,42 @@
     </class>
     <record name="FileChooserButtonPrivate"
             c:type="GtkFileChooserButtonPrivate"/>
+    <record name="FileChooserButtonClass" c:type="GtkFileChooserButtonClass">
+      <field name="parent_class">
+        <type name="HBoxClass" c:type="GtkHBoxClass"/>
+      </field>
+      <callback name="file_set" c:type="file_set">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="fc">
+            <type name="FileChooserButton" c:type="GtkFileChooserButton*"/>
+          </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>
+    </record>
     <function name="file_chooser_button_new"
               c:identifier="gtk_file_chooser_button_new">
       <return-value>
@@ -44046,6 +50709,11 @@
            glib:type-name="GtkFileChooserDialog"
            glib:get-type="gtk_file_chooser_dialog_get_type">
     </class>
+    <record name="FileChooserDialogClass" c:type="GtkFileChooserDialogClass">
+      <field name="parent_class">
+        <type name="DialogClass" c:type="GtkDialogClass"/>
+      </field>
+    </record>
     <record name="FileChooserDialogPrivate"
             c:type="GtkFileChooserDialogPrivate"/>
     <function name="file_chooser_dialog_new"
@@ -44097,6 +50765,11 @@
            glib:type-name="GtkFileChooserWidget"
            glib:get-type="gtk_file_chooser_widget_get_type">
     </class>
+    <record name="FileChooserWidgetClass" c:type="GtkFileChooserWidgetClass">
+      <field name="parent_class">
+        <type name="VBoxClass" c:type="GtkVBoxClass"/>
+      </field>
+    </record>
     <record name="FileChooserWidgetPrivate"
             c:type="GtkFileChooserWidgetPrivate"/>
     <function name="file_chooser_widget_new"
@@ -44255,6 +50928,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="FileSelectionClass" c:type="GtkFileSelectionClass">
+      <field name="parent_class">
+        <type name="DialogClass" c:type="GtkDialogClass"/>
+      </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>
+    </record>
     <function name="file_selection_new" c:identifier="gtk_file_selection_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -44332,6 +51030,11 @@
         </parameters>
       </method>
     </class>
+    <record name="FixedClass" c:type="GtkFixedClass">
+      <field name="parent_class">
+        <type name="ContainerClass" c:type="GtkContainerClass"/>
+      </field>
+    </record>
     <record name="FixedChild" c:type="GtkFixedChild">
       <field name="widget">
         <type name="Widget" c:type="GtkWidget*"/>
@@ -44551,6 +51254,41 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="FontButtonClass" c:type="GtkFontButtonClass">
+      <field name="parent_class">
+        <type name="ButtonClass" c:type="GtkButtonClass"/>
+      </field>
+      <callback name="font_set" c:type="font_set">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="gfp">
+            <type name="FontButton" c:type="GtkFontButton*"/>
+          </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>
+    </record>
     <record name="FontButtonPrivate" c:type="GtkFontButtonPrivate"/>
     <function name="font_button_new" c:identifier="gtk_font_button_new">
       <return-value>
@@ -44663,6 +51401,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="FontSelectionClass" c:type="GtkFontSelectionClass">
+      <field name="parent_class">
+        <type name="VBoxClass" c:type="GtkVBoxClass"/>
+      </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>
+    </record>
     <class name="FontSelectionDialog"
            c:type="GtkFontSelectionDialog"
            parent="Dialog"
@@ -44750,6 +51513,32 @@
         </return-value>
       </callback>
     </class>
+    <record name="FontSelectionDialogClass"
+            c:type="GtkFontSelectionDialogClass">
+      <field name="parent_class">
+        <type name="DialogClass" c:type="GtkDialogClass"/>
+      </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>
+    </record>
     <function name="font_selection_new" c:identifier="gtk_font_selection_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -44792,6 +51581,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="GammaCurveClass" c:type="GtkGammaCurveClass">
+      <field name="parent_class">
+        <type name="VBoxClass" c:type="GtkVBoxClass"/>
+      </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>
+    </record>
     <function name="gamma_curve_new" c:identifier="gtk_gamma_curve_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -44986,6 +51800,57 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="HandleBoxClass" c:type="GtkHandleBoxClass">
+      <field name="parent_class">
+        <type name="BinClass" c:type="GtkBinClass"/>
+      </field>
+      <callback name="child_attached" c:type="child_attached">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="child_detached" c:type="child_detached">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="handle_box">
+            <type name="HandleBox" c:type="GtkHandleBox*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </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>
+    </record>
     <function name="handle_box_new" c:identifier="gtk_handle_box_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -44997,6 +51862,11 @@
            glib:type-name="GtkHButtonBox"
            glib:get-type="gtk_hbutton_box_get_type">
     </class>
+    <record name="HButtonBoxClass" c:type="GtkHButtonBoxClass">
+      <field name="parent_class">
+        <type name="ButtonBoxClass" c:type="GtkButtonBoxClass"/>
+      </field>
+    </record>
     <function name="hbutton_box_new" c:identifier="gtk_hbutton_box_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -45315,6 +52185,100 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="PanedClass" c:type="GtkPanedClass">
+      <field name="parent_class">
+        <type name="ContainerClass" c:type="GtkContainerClass"/>
+      </field>
+      <callback name="cycle_child_focus" c:type="cycle_child_focus">
+        <return-value>
+          <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="toggle_handle_focus" c:type="toggle_handle_focus">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="move_handle" c:type="move_handle">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
+          </parameter>
+          <parameter name="scroll">
+            <type name="ScrollType" c:type="GtkScrollType"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="cycle_handle_focus" c:type="cycle_handle_focus">
+        <return-value>
+          <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="accept_position" c:type="accept_position">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="cancel_position" c:type="cancel_position">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="paned">
+            <type name="Paned" c:type="GtkPaned*"/>
+          </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>
+    </record>
     <record name="PanedPrivate" c:type="GtkPanedPrivate"/>
     <class name="HPaned"
            c:type="GtkHPaned"
@@ -45322,6 +52286,11 @@
            glib:type-name="GtkHPaned"
            glib:get-type="gtk_hpaned_get_type">
     </class>
+    <record name="HPanedClass" c:type="GtkHPanedClass">
+      <field name="parent_class">
+        <type name="PanedClass" c:type="GtkPanedClass"/>
+      </field>
+    </record>
     <function name="hpaned_new" c:identifier="gtk_hpaned_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -45475,6 +52444,51 @@
         </return-value>
       </callback>
     </class>
+    <record name="RulerClass" c:type="GtkRulerClass">
+      <field name="parent_class">
+        <type name="WidgetClass" c:type="GtkWidgetClass"/>
+      </field>
+      <callback name="draw_ticks" c:type="draw_ticks">
+        <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="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_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>
+    </record>
     <record name="RulerMetric" c:type="GtkRulerMetric">
       <field name="metric_name">
         <type name="string" c:type="gchar*"/>
@@ -45498,6 +52512,11 @@
            glib:type-name="GtkHRuler"
            glib:get-type="gtk_hruler_get_type">
     </class>
+    <record name="HRulerClass" c:type="GtkHRulerClass">
+      <field name="parent_class">
+        <type name="RulerClass" c:type="GtkRulerClass"/>
+      </field>
+    </record>
     <function name="hruler_new" c:identifier="gtk_hruler_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -45671,13 +52690,72 @@
         <return-value>
           <type name="string" c:type="gchararray"/>
         </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="double" c:type="gdouble"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-    </class>
+        <parameters>
+          <parameter name="object">
+            <type name="double" c:type="gdouble"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
+    <record name="ScaleClass" c:type="GtkScaleClass">
+      <field name="parent_class">
+        <type name="RangeClass" c:type="GtkRangeClass"/>
+      </field>
+      <callback name="format_value" c:type="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>
+      </callback>
+      <callback name="draw_value" c:type="draw_value">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_layout_offsets" c:type="get_layout_offsets">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="scale">
+            <type name="Scale" c:type="GtkScale*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint*"/>
+          </parameter>
+        </parameters>
+      </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>
+    </record>
     <function name="scale_clear_layout" c:identifier="_gtk_scale_clear_layout">
       <return-value>
         <type name="none" c:type="void"/>
@@ -45724,6 +52802,11 @@
            glib:type-name="GtkHScale"
            glib:get-type="gtk_hscale_get_type">
     </class>
+    <record name="HScaleClass" c:type="GtkHScaleClass">
+      <field name="parent_class">
+        <type name="ScaleClass" c:type="GtkScaleClass"/>
+      </field>
+    </record>
     <function name="hscale_new" c:identifier="gtk_hscale_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -45757,17 +52840,52 @@
            glib:type-name="GtkSeparator"
            glib:get-type="gtk_separator_get_type">
     </class>
+    <record name="SeparatorClass" c:type="GtkSeparatorClass">
+      <field name="parent_class">
+        <type name="WidgetClass" c:type="GtkWidgetClass"/>
+      </field>
+    </record>
     <class name="HSeparator"
            c:type="GtkHSeparator"
            parent="Separator"
            glib:type-name="GtkHSeparator"
            glib:get-type="gtk_hseparator_get_type">
     </class>
+    <record name="HSeparatorClass" c:type="GtkHSeparatorClass">
+      <field name="parent_class">
+        <type name="SeparatorClass" c:type="GtkSeparatorClass"/>
+      </field>
+    </record>
     <function name="hseparator_new" c:identifier="gtk_hseparator_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
       </return-value>
     </function>
+    <record name="IconFactoryClass" c:type="GtkIconFactoryClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </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>
+    </record>
     <function name="icon_factory_lookup_default"
               c:identifier="gtk_icon_factory_lookup_default">
       <return-value>
@@ -45931,7 +53049,7 @@
       <method name="get_builtin_pixbuf"
               c:identifier="gtk_icon_info_get_builtin_pixbuf">
         <return-value>
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="icon_info">
@@ -45941,7 +53059,7 @@
       </method>
       <method name="load_icon" c:identifier="gtk_icon_info_load_icon">
         <return-value>
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="icon_info">
@@ -46192,7 +53310,7 @@
       </method>
       <method name="load_icon" c:identifier="gtk_icon_theme_load_icon">
         <return-value>
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="icon_theme">
@@ -46273,6 +53391,21 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="IconThemeClass" c:type="GtkIconThemeClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <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>
+    </record>
     <record name="IconThemePrivate" c:type="GtkIconThemePrivate"/>
     <function name="icon_theme_error_quark"
               c:identifier="gtk_icon_theme_error_quark">
@@ -46293,7 +53426,7 @@
           <type name="int" c:type="gint"/>
         </parameter>
         <parameter name="pixbuf">
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </parameter>
       </parameters>
     </function>
@@ -47383,6 +54516,116 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="IconViewClass" c:type="GtkIconViewClass">
+      <field name="parent_class">
+        <type name="ContainerClass" c:type="GtkContainerClass"/>
+      </field>
+      <callback name="set_scroll_adjustments" c:type="set_scroll_adjustments">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="hadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+          <parameter name="vadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="item_activated" c:type="item_activated">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="selection_changed" c:type="selection_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="select_all" c:type="select_all">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="unselect_all" c:type="unselect_all">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="select_cursor_item" c:type="select_cursor_item">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="toggle_cursor_item" c:type="toggle_cursor_item">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="move_cursor" c:type="move_cursor">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="icon_view">
+            <type name="IconView" c:type="GtkIconView*"/>
+          </parameter>
+          <parameter name="step">
+            <type name="MovementStep" c:type="GtkMovementStep"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="activate_cursor_item" c:type="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>
+        </parameters>
+      </callback>
+    </record>
     <record name="IconViewPrivate" c:type="GtkIconViewPrivate"/>
     <callback name="IconViewForeachFunc" c:type="GtkIconViewForeachFunc">
       <return-value>
@@ -47448,6 +54691,11 @@
         <type name="Widget" c:type="GtkWidget"/>
       </property>
     </class>
+    <record name="ImageMenuItemClass" c:type="GtkImageMenuItemClass">
+      <field name="parent_class">
+        <type name="MenuItemClass" c:type="GtkMenuItemClass"/>
+      </field>
+    </record>
     <function name="image_menu_item_new"
               c:identifier="gtk_image_menu_item_new">
       <return-value>
@@ -47515,6 +54763,11 @@
         </parameters>
       </method>
     </class>
+    <record name="IMContextSimpleClass" c:type="GtkIMContextSimpleClass">
+      <field name="parent_class">
+        <type name="IMContextClass" c:type="GtkIMContextClass"/>
+      </field>
+    </record>
     <class name="IMMulticontext"
            c:type="GtkIMMulticontext"
            parent="IMContext"
@@ -47555,6 +54808,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="IMMulticontextClass" c:type="GtkIMMulticontextClass">
+      <field name="parent_class">
+        <type name="IMContextClass" c:type="GtkIMContextClass"/>
+      </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>
+    </record>
     <record name="IMMulticontextPrivate" c:type="GtkIMMulticontextPrivate"/>
     <function name="im_multicontext_new"
               c:identifier="gtk_im_multicontext_new">
@@ -47634,6 +54912,57 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="InputDialogClass" c:type="GtkInputDialogClass">
+      <field name="parent_class">
+        <type name="DialogClass" c:type="GtkDialogClass"/>
+      </field>
+      <callback name="enable_device" c:type="enable_device">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="inputd">
+            <type name="InputDialog" c:type="GtkInputDialog*"/>
+          </parameter>
+          <parameter name="device">
+            <type name="Gdk.Device" c:type="GdkDevice*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="disable_device" c:type="disable_device">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="inputd">
+            <type name="InputDialog" c:type="GtkInputDialog*"/>
+          </parameter>
+          <parameter name="device">
+            <type name="Gdk.Device" c:type="GdkDevice*"/>
+          </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>
+    </record>
     <function name="input_dialog_new" c:identifier="gtk_input_dialog_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -47691,6 +55020,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="InvisibleClass" c:type="GtkInvisibleClass">
+      <field name="parent_class">
+        <type name="WidgetClass" c:type="GtkWidgetClass"/>
+      </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>
+    </record>
     <function name="invisible_new" c:identifier="gtk_invisible_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -47910,6 +55264,47 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="LayoutClass" c:type="GtkLayoutClass">
+      <field name="parent_class">
+        <type name="ContainerClass" c:type="GtkContainerClass"/>
+      </field>
+      <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_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>
+    </record>
     <function name="layout_new" c:identifier="gtk_layout_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -47975,6 +55370,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="LinkButtonClass" c:type="GtkLinkButtonClass">
+      <field name="parent_class">
+        <type name="ButtonClass" c:type="GtkButtonClass"/>
+      </field>
+      <callback name="gtk_padding1" c:type="_gtk_padding1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_padding2" c:type="_gtk_padding2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_padding3" c:type="_gtk_padding3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_padding4" c:type="_gtk_padding4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </record>
     <record name="LinkButtonPrivate" c:type="GtkLinkButtonPrivate"/>
     <callback name="LinkButtonUriFunc" c:type="GtkLinkButtonUriFunc">
       <return-value>
@@ -48257,6 +55677,132 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="ListItemClass" c:type="GtkListItemClass">
+      <field name="parent_class">
+        <type name="ItemClass" c:type="GtkItemClass"/>
+      </field>
+      <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>
+        </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>
+        </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>
+      </callback>
+      <callback name="undo_selection" c:type="undo_selection">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="list_item">
+            <type name="ListItem" c:type="GtkListItem*"/>
+          </parameter>
+        </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>
+        </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>
+      </callback>
+      <callback name="extend_selection" c:type="extend_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="scroll_type">
+            <type name="ScrollType" c:type="GtkScrollType"/>
+          </parameter>
+          <parameter name="position">
+            <type name="float" c:type="gfloat"/>
+          </parameter>
+          <parameter name="auto_start_selection">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="scroll_horizontal" c:type="scroll_horizontal">
+        <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="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="float" c:type="gfloat"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="toggle_add_mode" c:type="toggle_add_mode">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="list_item">
+            <type name="ListItem" c:type="GtkListItem*"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
     <function name="list_item_new" c:identifier="gtk_list_item_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -48653,6 +56199,47 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="ListClass" c:type="GtkListClass">
+      <field name="parent_class">
+        <type name="ContainerClass" c:type="GtkContainerClass"/>
+      </field>
+      <callback name="selection_changed" c:type="selection_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="select_child" c:type="select_child">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="unselect_child" c:type="unselect_child">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="list">
+            <type name="List" c:type="GtkList*"/>
+          </parameter>
+          <parameter name="child">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
     <function name="list_new" c:identifier="gtk_list_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -49287,6 +56874,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="MenuBarClass" c:type="GtkMenuBarClass">
+      <field name="parent_class">
+        <type name="MenuShellClass" c:type="GtkMenuShellClass"/>
+      </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>
+    </record>
     <function name="menu_bar_new" c:identifier="gtk_menu_bar_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -49398,7 +57010,32 @@
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-    </class>
+    </class>
+    <record name="TooltipsClass" c:type="GtkTooltipsClass">
+      <field name="parent_class">
+        <type name="ObjectClass" c:type="GtkObjectClass"/>
+      </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>
+    </record>
     <record name="TooltipsData" c:type="GtkTooltipsData">
       <field name="tooltips">
         <type name="Tooltips" c:type="GtkTooltips*"/>
@@ -49835,6 +57472,70 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="ToolItemClass" c:type="GtkToolItemClass">
+      <field name="parent_class">
+        <type name="BinClass" c:type="GtkBinClass"/>
+      </field>
+      <callback name="create_menu_proxy" c:type="create_menu_proxy">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="toolbar_reconfigured" c:type="toolbar_reconfigured">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="tool_item">
+            <type name="ToolItem" c:type="GtkToolItem*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_tooltip" c:type="set_tooltip">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </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>
+          <parameter name="tip_private">
+            <type name="string" c:type="gchar*"/>
+          </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>
+    </record>
     <record name="ToolItemPrivate" c:type="GtkToolItemPrivate"/>
     <function name="tool_item_toolbar_reconfigured"
               c:identifier="_gtk_tool_item_toolbar_reconfigured">
@@ -50055,6 +57756,44 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="ToolButtonClass" c:type="GtkToolButtonClass">
+      <field name="parent_class">
+        <type name="ToolItemClass" c:type="GtkToolItemClass"/>
+      </field>
+      <field name="button_type">
+        <type name="GObject.Type" c:type="GType"/>
+      </field>
+      <callback name="clicked" c:type="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" 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>
+    </record>
     <record name="ToolButtonPrivate" c:type="GtkToolButtonPrivate"/>
     <function name="tool_button_new" c:identifier="gtk_tool_button_new">
       <return-value>
@@ -50091,6 +57830,41 @@
         </parameter>
       </parameters>
     </function>
+    <record name="MenuToolButtonClass" c:type="GtkMenuToolButtonClass">
+      <field name="parent_class">
+        <type name="ToolButtonClass" c:type="GtkToolButtonClass"/>
+      </field>
+      <callback name="show_menu" c:type="show_menu">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="button">
+            <type name="MenuToolButton" c:type="GtkMenuToolButton*"/>
+          </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>
+    </record>
     <class name="MenuToolButton"
            c:type="GtkMenuToolButton"
            parent="ToolButton"
@@ -50333,6 +58107,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="MessageDialogClass" c:type="GtkMessageDialogClass">
+      <field name="parent_class">
+        <type name="DialogClass" c:type="GtkDialogClass"/>
+      </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>
+    </record>
     <function name="message_dialog_new" c:identifier="gtk_message_dialog_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -51414,6 +59213,141 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="NotebookClass" c:type="GtkNotebookClass">
+      <field name="parent_class">
+        <type name="ContainerClass" c:type="GtkContainerClass"/>
+      </field>
+      <callback name="switch_page" c:type="switch_page">
+        <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="NotebookPage" c:type="GtkNotebookPage*"/>
+          </parameter>
+          <parameter name="page_num">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="select_page" c:type="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" c:type="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" c:type="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="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="move_focus_out" c:type="move_focus_out">
+        <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" c:type="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" c:type="insert_page">
+        <return-value>
+          <type name="int" 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="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="create_window" c:type="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="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <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>
+    </record>
     <record name="NotebookPage" c:type="GtkNotebookPage"/>
     <callback name="NotebookWindowCreationFunc"
               c:type="GtkNotebookWindowCreationFunc">
@@ -51755,91 +59689,320 @@
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="set-editable">
+      </glib:signal>
+      <glib:signal name="set-editable">
+        <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="move-word">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="move-page">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <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="move-to-row">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="move-to-column">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="kill-char">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="kill-word">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="kill-line">
+        <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>
+    <record name="OldEditableClass" c:type="GtkOldEditableClass">
+      <field name="parent_class">
+        <type name="WidgetClass" c:type="GtkWidgetClass"/>
+      </field>
+      <callback name="activate" c:type="activate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_editable" c:type="set_editable">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
+          </parameter>
+          <parameter name="is_editable">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="move_cursor" c:type="move_cursor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <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>
+      </callback>
+      <callback name="move_word" c:type="move_word">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
+          </parameter>
+          <parameter name="n">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="move_page" c:type="move_page">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <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>
+      </callback>
+      <callback name="move_to_row" c:type="move_to_row">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="move_to_column" c:type="move_to_column">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
+          </parameter>
+          <parameter name="row">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="kill_char" c:type="kill_char">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
+          </parameter>
+          <parameter name="direction">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="kill_word" c:type="kill_word">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
+          </parameter>
+          <parameter name="direction">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="kill_line" c:type="kill_line">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
+          </parameter>
+          <parameter name="direction">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="cut_clipboard" c:type="cut_clipboard">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="copy_clipboard" c:type="copy_clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="move-word">
+      </callback>
+      <callback name="paste_clipboard" c:type="paste_clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="int" c:type="gint"/>
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="move-page">
+      </callback>
+      <callback name="update_text" c:type="update_text">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
+          </parameter>
+          <parameter name="start_pos">
             <type name="int" c:type="gint"/>
           </parameter>
-          <parameter name="p0">
+          <parameter name="end_pos">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="move-to-row">
+      </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="object">
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
+          </parameter>
+          <parameter name="start_pos">
             <type name="int" c:type="gint"/>
           </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="move-to-column">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
+          <parameter name="end_pos">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="kill-char">
+      </callback>
+      <callback name="set_selection" c:type="set_selection">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
+          </parameter>
+          <parameter name="start_pos">
             <type name="int" c:type="gint"/>
           </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="kill-word">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-        <parameters>
-          <parameter name="object">
+          <parameter name="end_pos">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="kill-line">
+      </callback>
+      <callback name="set_position" c:type="set_position">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
+          <parameter name="editable">
+            <type name="OldEditable" c:type="GtkOldEditable*"/>
+          </parameter>
+          <parameter name="position">
             <type name="int" c:type="gint"/>
           </parameter>
         </parameters>
-      </glib:signal>
-    </class>
+      </callback>
+    </record>
     <callback name="TextFunction" c:type="GtkTextFunction">
       <return-value>
         <type name="none" c:type="void"/>
@@ -51953,6 +60116,41 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="OptionMenuClass" c:type="GtkOptionMenuClass">
+      <field name="parent_class">
+        <type name="ButtonClass" c:type="GtkButtonClass"/>
+      </field>
+      <callback name="changed" c:type="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="option_menu">
+            <type name="OptionMenu" c:type="GtkOptionMenu*"/>
+          </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>
+    </record>
     <function name="option_menu_new" c:identifier="gtk_option_menu_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -52010,6 +60208,11 @@
         </parameters>
       </method>
     </class>
+    <record name="PixmapClass" c:type="GtkPixmapClass">
+      <field name="parent_class">
+        <type name="MiscClass" c:type="GtkMiscClass"/>
+      </field>
+    </record>
     <function name="pixmap_new" c:identifier="gtk_pixmap_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -52115,6 +60318,51 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="SocketClass" c:type="GtkSocketClass">
+      <field name="parent_class">
+        <type name="ContainerClass" c:type="GtkContainerClass"/>
+      </field>
+      <callback name="plug_added" c:type="plug_added">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="socket_">
+            <type name="Socket" c:type="GtkSocket*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="plug_removed" c:type="plug_removed">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="socket_">
+            <type name="Socket" c:type="GtkSocket*"/>
+          </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>
+    </record>
     <function name="socket_new" c:identifier="gtk_socket_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -52204,6 +60452,41 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="PlugClass" c:type="GtkPlugClass">
+      <field name="parent_class">
+        <type name="WindowClass" c:type="GtkWindowClass"/>
+      </field>
+      <callback name="embedded" c:type="embedded">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="plug">
+            <type name="Plug" c:type="GtkPlug*"/>
+          </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>
+    </record>
     <function name="plug_new" c:identifier="gtk_plug_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -52373,6 +60656,22 @@
         <type name="double" c:type="gdouble"/>
       </field>
     </record>
+    <union name="DitherInfo" c:type="GtkDitherInfo">
+      <field name="s">
+        <type name="GLib.ushort" c:type="gushort"/>
+      </field>
+      <field name="c">
+        <type name="GLib.uchar" c:type="guchar"/>
+      </field>
+    </union>
+    <record name="PreviewClass" c:type="GtkPreviewClass">
+      <field name="parent_class">
+        <type name="WidgetClass" c:type="GtkWidgetClass"/>
+      </field>
+      <field name="info">
+        <type name="PreviewInfo" c:type="GtkPreviewInfo"/>
+      </field>
+    </record>
     <function name="preview_uninit" c:identifier="gtk_preview_uninit">
       <return-value>
         <type name="none" c:type="void"/>
@@ -54213,6 +62512,117 @@
         </parameters>
       </glib:signal>
     </interface>
+    <record name="PrintOperationPreviewIface"
+            c:type="GtkPrintOperationPreviewIface">
+      <field name="g_iface">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="ready" c:type="ready">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="preview">
+            <type name="PrintOperationPreview"
+                  c:type="GtkPrintOperationPreview*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="got_page_size" c:type="got_page_size">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <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>
+      </callback>
+      <callback name="render_page" c:type="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>
+      </callback>
+      <callback name="is_selected" c:type="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>
+      </callback>
+      <callback name="end_preview" c:type="end_preview">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="preview">
+            <type name="PrintOperationPreview"
+                  c:type="GtkPrintOperationPreview*"/>
+          </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>
+      <callback name="gtk_reserved7" c:type="_gtk_reserved7">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </record>
     <function name="print_operation_preview_render_page"
               c:identifier="gtk_print_operation_preview_render_page">
       <return-value>
@@ -54255,6 +62665,187 @@
         </parameter>
       </parameters>
     </function>
+    <record name="PrintOperationClass" c:type="GtkPrintOperationClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <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="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <parameter name="context">
+            <type name="PrintContext" c:type="GtkPrintContext*"/>
+          </parameter>
+        </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="draw_page" c:type="draw_page">
+        <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>
+        </parameters>
+      </callback>
+      <callback name="end_print" c:type="end_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="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="custom_widget_apply" c:type="custom_widget_apply">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="operation">
+            <type name="PrintOperation" c:type="GtkPrintOperation*"/>
+          </parameter>
+          <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="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>
+    </record>
     <record name="PrintOperationPrivate" c:type="GtkPrintOperationPrivate"/>
     <class name="PrintOperation"
            c:type="GtkPrintOperation"
@@ -55157,7 +63748,62 @@
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-    </class>
+    </class>
+    <record name="ProgressClass" c:type="GtkProgressClass">
+      <field name="parent_class">
+        <type name="WidgetClass" c:type="GtkWidgetClass"/>
+      </field>
+      <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>
+    </record>
     <class name="ProgressBar"
            c:type="GtkProgressBar"
            parent="Progress"
@@ -55417,6 +64063,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="ProgressBarClass" c:type="GtkProgressBarClass">
+      <field name="parent_class">
+        <type name="ProgressClass" c:type="GtkProgressClass"/>
+      </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>
+    </record>
     <function name="progress_bar_new" c:identifier="gtk_progress_bar_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -55558,6 +64229,41 @@
       </glib:signal>
     </class>
     <record name="ToggleActionPrivate" c:type="GtkToggleActionPrivate"/>
+    <record name="ToggleActionClass" c:type="GtkToggleActionClass">
+      <field name="parent_class">
+        <type name="ActionClass" c:type="GtkActionClass"/>
+      </field>
+      <callback name="toggled" c:type="toggled">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="action">
+            <type name="ToggleAction" c:type="GtkToggleAction*"/>
+          </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>
+    </record>
     <class name="RadioAction"
            c:type="GtkRadioAction"
            parent="ToggleAction"
@@ -55687,6 +64393,44 @@
       </glib:signal>
     </class>
     <record name="RadioActionPrivate" c:type="GtkRadioActionPrivate"/>
+    <record name="RadioActionClass" c:type="GtkRadioActionClass">
+      <field name="parent_class">
+        <type name="ToggleActionClass" c:type="GtkToggleActionClass"/>
+      </field>
+      <callback name="changed" c:type="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="action">
+            <type name="RadioAction" c:type="GtkRadioAction*"/>
+          </parameter>
+          <parameter name="current">
+            <type name="RadioAction" c:type="GtkRadioAction*"/>
+          </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>
+    </record>
     <class name="RadioButton"
            c:type="GtkRadioButton"
            parent="CheckButton"
@@ -55788,6 +64532,36 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="RadioButtonClass" c:type="GtkRadioButtonClass">
+      <field name="parent_class">
+        <type name="CheckButtonClass" c:type="GtkCheckButtonClass"/>
+      </field>
+      <callback name="group_changed" c:type="group_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="radio_button">
+            <type name="RadioButton" c:type="GtkRadioButton*"/>
+          </parameter>
+        </parameters>
+      </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>
+    </record>
     <function name="radio_button_new" c:identifier="gtk_radio_button_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -55927,6 +64701,36 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="RadioMenuItemClass" c:type="GtkRadioMenuItemClass">
+      <field name="parent_class">
+        <type name="CheckMenuItemClass" c:type="GtkCheckMenuItemClass"/>
+      </field>
+      <callback name="group_changed" c:type="group_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="radio_menu_item">
+            <type name="RadioMenuItem" c:type="GtkRadioMenuItem*"/>
+          </parameter>
+        </parameters>
+      </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>
+    </record>
     <function name="radio_menu_item_new"
               c:identifier="gtk_radio_menu_item_new">
       <return-value>
@@ -56035,6 +64839,41 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="ToggleToolButtonClass" c:type="GtkToggleToolButtonClass">
+      <field name="parent_class">
+        <type name="ToolButtonClass" c:type="GtkToolButtonClass"/>
+      </field>
+      <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_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>
+    </record>
     <record name="ToggleToolButtonPrivate"
             c:type="GtkToggleToolButtonPrivate"/>
     <function name="toggle_tool_button_new"
@@ -56131,6 +64970,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="RadioToolButtonClass" c:type="GtkRadioToolButtonClass">
+      <field name="parent_class">
+        <type name="ToggleToolButtonClass" c:type="GtkToggleToolButtonClass"/>
+      </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>
+    </record>
     <function name="radio_tool_button_new"
               c:identifier="gtk_radio_tool_button_new">
       <return-value>
@@ -56354,7 +65218,7 @@
       </method>
       <method name="get_icon" c:identifier="gtk_recent_info_get_icon">
         <return-value>
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="info">
@@ -56678,6 +65542,41 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="RecentManagerClass" c:type="GtkRecentManagerClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="changed" c:type="changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="manager">
+            <type name="RecentManager" c:type="GtkRecentManager*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="gtk_recent1" c:type="_gtk_recent1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_recent2" c:type="_gtk_recent2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_recent3" c:type="_gtk_recent3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="gtk_recent4" c:type="_gtk_recent4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </record>
     <record name="RecentManagerPrivate" c:type="GtkRecentManagerPrivate"/>
     <function name="recent_manager_error_quark"
               c:identifier="gtk_recent_manager_error_quark">
@@ -56726,6 +65625,11 @@
       </property>
     </class>
     <record name="RecentActionPrivate" c:type="GtkRecentActionPrivate"/>
+    <record name="RecentActionClass" c:type="GtkRecentActionClass">
+      <field name="parent_class">
+        <type name="ActionClass" c:type="GtkActionClass"/>
+      </field>
+    </record>
     <function name="recent_action_new" c:identifier="gtk_recent_action_new">
       <return-value>
         <type name="Action" c:type="GtkAction*"/>
@@ -56913,104 +65817,289 @@
       </method>
       <method name="filter" c:identifier="gtk_recent_filter_filter">
         <return-value>
-          <type name="boolean" c:type="gboolean"/>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+          <parameter name="filter_info">
+            <type name="RecentFilterInfo" c:type="GtkRecentFilterInfo*"/>
+          </parameter>
+        </parameters>
+      </method>
+    </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-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="recent-manager">
+        <type name="RecentManager" c:type="GtkRecentManager"/>
+      </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="show-tips">
+        <type name="boolean" c:type="gboolean"/>
+      </property>
+      <property name="filter">
+        <type name="RecentFilter" c:type="GtkRecentFilter"/>
+      </property>
+      <property name="limit">
+        <type name="int" c:type="gint"/>
+      </property>
+      <property name="sort-type">
+        <type name="RecentSortType" c:type="GtkRecentSortType"/>
+      </property>
+      <callback name="set_current_uri" c:type="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.Error" c:type="GError**"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_current_uri" c:type="get_current_uri">
+        <return-value>
+          <type name="string" c:type="gchar*"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="select_uri" c:type="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>
+      </callback>
+      <callback name="unselect_uri" c:type="unselect_uri">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+          </parameter>
+          <parameter name="uri">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="select_all" c:type="select_all">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="unselect_all" c:type="unselect_all">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_items" c:type="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>
+      </callback>
+      <callback name="get_recent_manager" c:type="get_recent_manager">
+        <return-value>
+          <type name="RecentManager" c:type="GtkRecentManager*"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="add_filter" c:type="add_filter">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+          </parameter>
+          <parameter name="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="remove_filter" 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="filter">
+            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="list_filters" c:type="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>
+      </callback>
+      <callback name="set_sort_func" c:type="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="data">
+            <type name="any" c:type="gpointer"/>
+          </parameter>
+          <parameter name="destroy">
+            <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="item_activated" c:type="item_activated">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="selection_changed" c:type="selection_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="filter">
-            <type name="RecentFilter" c:type="GtkRecentFilter*"/>
-          </parameter>
-          <parameter name="filter_info">
-            <type name="RecentFilterInfo" c:type="GtkRecentFilterInfo*"/>
+          <parameter name="chooser">
+            <type name="RecentChooser" c:type="GtkRecentChooser*"/>
           </parameter>
         </parameters>
-      </method>
-    </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"/>
+      </callback>
+      <glib:signal name="selection-changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="item-activated">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </interface>
+    <record name="RecentChooserIface" c:type="GtkRecentChooserIface">
+      <field name="base_iface">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
       </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="boolean" c:type="gboolean"/>
@@ -57181,17 +66270,7 @@
           </parameter>
         </parameters>
       </callback>
-      <glib:signal name="selection-changed">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-      <glib:signal name="item-activated">
-        <return-value>
-          <type name="none" c:type="void"/>
-        </return-value>
-      </glib:signal>
-    </interface>
+    </record>
     <function name="recent_chooser_error_quark"
               c:identifier="gtk_recent_chooser_error_quark">
       <return-value>
@@ -57630,6 +66709,12 @@
            glib:type-name="GtkRecentChooserDialog"
            glib:get-type="gtk_recent_chooser_dialog_get_type">
     </class>
+    <record name="RecentChooserDialogClass"
+            c:type="GtkRecentChooserDialogClass">
+      <field name="parent_class">
+        <type name="DialogClass" c:type="GtkDialogClass"/>
+      </field>
+    </record>
     <record name="RecentChooserDialogPrivate"
             c:type="GtkRecentChooserDialogPrivate"/>
     <function name="recent_chooser_dialog_new"
@@ -57723,6 +66808,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="RecentChooserMenuClass" c:type="GtkRecentChooserMenuClass">
+      <field name="parent_class">
+        <type name="MenuClass" c:type="GtkMenuClass"/>
+      </field>
+      <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>
+    </record>
     <record name="RecentChooserMenuPrivate"
             c:type="GtkRecentChooserMenuPrivate"/>
     <function name="recent_chooser_menu_new"
@@ -57748,6 +66858,12 @@
            glib:type-name="GtkRecentChooserWidget"
            glib:get-type="gtk_recent_chooser_widget_get_type">
     </class>
+    <record name="RecentChooserWidgetClass"
+            c:type="GtkRecentChooserWidgetClass">
+      <field name="parent_class">
+        <type name="VBoxClass" c:type="GtkVBoxClass"/>
+      </field>
+    </record>
     <record name="RecentChooserWidgetPrivate"
             c:type="GtkRecentChooserWidgetPrivate"/>
     <function name="recent_chooser_widget_new"
@@ -57899,6 +67015,44 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="ScaleButtonClass" c:type="GtkScaleButtonClass">
+      <field name="parent_class">
+        <type name="ButtonClass" c:type="GtkButtonClass"/>
+      </field>
+      <callback name="value_changed" c:type="value_changed">
+        <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>
+        </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>
+    </record>
     <record name="ScaleButtonPrivate" c:type="GtkScaleButtonPrivate"/>
     <function name="scale_button_new" c:identifier="gtk_scale_button_new">
       <return-value>
@@ -58041,6 +67195,27 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="ViewportClass" c:type="GtkViewportClass">
+      <field name="parent_class">
+        <type name="BinClass" c:type="GtkBinClass"/>
+      </field>
+      <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>
+    </record>
     <function name="viewport_new" c:identifier="gtk_viewport_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -58335,6 +67510,63 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="ScrolledWindowClass" c:type="GtkScrolledWindowClass">
+      <field name="parent_class">
+        <type name="BinClass" c:type="GtkBinClass"/>
+      </field>
+      <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="scroll">
+            <type name="ScrollType" c:type="GtkScrollType"/>
+          </parameter>
+          <parameter name="horizontal">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="move_focus_out" c:type="move_focus_out">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="scrolled_window">
+            <type name="ScrolledWindow" c:type="GtkScrolledWindow*"/>
+          </parameter>
+          <parameter name="direction">
+            <type name="DirectionType" c:type="GtkDirectionType"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved1" 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>
+    </record>
     <function name="scrolled_window_new"
               c:identifier="gtk_scrolled_window_new">
       <return-value>
@@ -58366,6 +67598,11 @@
            glib:type-name="GtkSeparatorMenuItem"
            glib:get-type="gtk_separator_menu_item_get_type">
     </class>
+    <record name="SeparatorMenuItemClass" c:type="GtkSeparatorMenuItemClass">
+      <field name="parent_class">
+        <type name="MenuItemClass" c:type="GtkMenuItemClass"/>
+      </field>
+    </record>
     <function name="separator_menu_item_new"
               c:identifier="gtk_separator_menu_item_new">
       <return-value>
@@ -58424,6 +67661,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="SeparatorToolItemClass" c:type="GtkSeparatorToolItemClass">
+      <field name="parent_class">
+        <type name="ToolItemClass" c:type="GtkToolItemClass"/>
+      </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>
+    </record>
     <record name="SeparatorToolItemPrivate"
             c:type="GtkSeparatorToolItemPrivate"/>
     <function name="separator_tool_item_new"
@@ -58558,6 +67820,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="SizeGroupClass" c:type="GtkSizeGroupClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </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>
+    </record>
     <function name="size_group_get_child_requisition"
               c:identifier="_gtk_size_group_get_child_requisition">
       <return-value>
@@ -59025,6 +68312,82 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="SpinButtonClass" c:type="GtkSpinButtonClass">
+      <field name="parent_class">
+        <type name="EntryClass" c:type="GtkEntryClass"/>
+      </field>
+      <callback name="input" c:type="input">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+          <parameter name="new_value">
+            <type name="double" c:type="gdouble*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="output" c:type="output">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="value_changed" c:type="value_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </parameter>
+        </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="scroll">
+            <type name="ScrollType" c:type="GtkScrollType"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="wrapped" c:type="wrapped">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="spin_button">
+            <type name="SpinButton" c:type="GtkSpinButton*"/>
+          </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>
+    </record>
     <function name="spin_button_new" c:identifier="gtk_spin_button_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -59232,6 +68595,66 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="StatusbarClass" c:type="GtkStatusbarClass">
+      <field name="parent_class">
+        <type name="HBoxClass" c:type="GtkHBoxClass"/>
+      </field>
+      <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="statusbar">
+            <type name="Statusbar" c:type="GtkStatusbar*"/>
+          </parameter>
+          <parameter name="context_id">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="text_popped" c:type="text_popped">
+        <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="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="text">
+            <type name="string" c:type="gchar*"/>
+          </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>
+    </record>
     <function name="statusbar_new" c:identifier="gtk_statusbar_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -59254,7 +68677,7 @@
         </return-value>
         <parameters>
           <parameter name="pixbuf">
-            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+            <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </constructor>
@@ -59301,7 +68724,7 @@
             <type name="StatusIcon" c:type="GtkStatusIcon*"/>
           </parameter>
           <parameter name="pixbuf" allow-none="1">
-            <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+            <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
           </parameter>
         </parameters>
       </method>
@@ -59360,7 +68783,7 @@
       </method>
       <method name="get_pixbuf" c:identifier="gtk_status_icon_get_pixbuf">
         <return-value>
-          <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf*"/>
+          <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf*"/>
         </return-value>
         <parameters>
           <parameter name="status_icon">
@@ -59511,7 +68934,7 @@
         </parameters>
       </method>
       <property name="pixbuf">
-        <type name="Pixbuf.Pixbuf" c:type="GdkPixbuf"/>
+        <type name="GdkPixbuf.Pixbuf" c:type="GdkPixbuf"/>
       </property>
       <property name="file">
         <type name="string" c:type="gchararray"/>
@@ -59629,6 +69052,68 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="StatusIconClass" c:type="GtkStatusIconClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="activate" c:type="activate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="popup_menu" c:type="popup_menu">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          </parameter>
+          <parameter name="button">
+            <type name="uint" c:type="guint"/>
+          </parameter>
+          <parameter name="activate_time">
+            <type name="uint32" c:type="guint32"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="size_changed" c:type="size_changed">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="status_icon">
+            <type name="StatusIcon" c:type="GtkStatusIcon*"/>
+          </parameter>
+          <parameter name="size">
+            <type name="int" c:type="gint"/>
+          </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>
+    </record>
     <record name="StatusIconPrivate" c:type="GtkStatusIconPrivate"/>
     <function name="status_icon_position_menu"
               c:identifier="gtk_status_icon_position_menu">
@@ -59984,6 +69469,11 @@
         <type name="boolean" c:type="gboolean"/>
       </property>
     </class>
+    <record name="TableClass" c:type="GtkTableClass">
+      <field name="parent_class">
+        <type name="ContainerClass" c:type="GtkContainerClass"/>
+      </field>
+    </record>
     <record name="TableChild" c:type="GtkTableChild">
       <field name="widget">
         <type name="Widget" c:type="GtkWidget*"/>
@@ -60092,7 +69582,32 @@
           <type name="none" c:type="void"/>
         </return-value>
       </callback>
-    </class>
+    </class>
+    <record name="TearoffMenuItemClass" c:type="GtkTearoffMenuItemClass">
+      <field name="parent_class">
+        <type name="MenuItemClass" c:type="GtkMenuItemClass"/>
+      </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>
+    </record>
     <function name="tearoff_menu_item_new"
               c:identifier="gtk_tearoff_menu_item_new">
       <return-value>
@@ -60112,6 +69627,73 @@
         </parameter>
       </parameters>
     </callback>
+    <record name="TextTagTableClass" c:type="GtkTextTagTableClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <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>
+    </record>
     <function name="text_tag_table_add_buffer"
               c:identifier="_gtk_text_tag_table_add_buffer">
       <return-value>
@@ -60249,8 +69831,242 @@
         </return-value>
       </callback>
     </class>
+    <record name="TextMarkClass" c:type="GtkTextMarkClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </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>
+    </record>
     <record name="TextBTree" c:type="GtkTextBTree"/>
     <record name="TextLogAttrCache" c:type="GtkTextLogAttrCache"/>
+    <record name="TextBufferClass" c:type="GtkTextBufferClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <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="GdkPixbuf.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>
+    </record>
     <function name="text_buffer_spew" c:identifier="_gtk_text_buffer_spew">
       <return-value>
         <type name="none" c:type="void"/>
@@ -61453,104 +71269,310 @@
           <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 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"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="string" c:type="gchararray"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="delete-from-cursor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="DeleteType" c:type="GtkDeleteType"/>
+          </parameter>
+          <parameter name="p0">
+            <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>
+      <glib:signal name="page-horizontally">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="move-viewport">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="ScrollStep" c:type="GtkScrollStep"/>
+          </parameter>
+          <parameter name="p0">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="set-anchor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+      <glib:signal name="toggle-cursor-visible">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </glib:signal>
+    </class>
+    <record name="TextViewClass" c:type="GtkTextViewClass">
+      <field name="parent_class">
+        <type name="ContainerClass" c:type="GtkContainerClass"/>
+      </field>
+      <callback name="set_scroll_adjustments" c:type="set_scroll_adjustments">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="hadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+          <parameter name="vadjustment">
+            <type name="Adjustment" c:type="GtkAdjustment*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="populate_popup" c:type="populate_popup">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="menu">
+            <type name="Menu" c:type="GtkMenu*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="move_cursor" c:type="move_cursor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="step">
+            <type name="MovementStep" c:type="GtkMovementStep"/>
+          </parameter>
+          <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="page_horizontally" c:type="page_horizontally">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="extend_selection">
+            <type name="boolean" c:type="gboolean"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="set_anchor" c:type="set_anchor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="insert_at_cursor" c:type="insert_at_cursor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="str">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="delete_from_cursor" c:type="delete_from_cursor">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="type">
+            <type name="DeleteType" c:type="GtkDeleteType"/>
+          </parameter>
+          <parameter name="count">
+            <type name="int" c:type="gint"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="backspace" c:type="backspace">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="cut_clipboard" c:type="cut_clipboard">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="select-all">
+      </callback>
+      <callback name="copy_clipboard" c:type="copy_clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="boolean" c:type="gboolean"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="insert-at-cursor">
+      </callback>
+      <callback name="paste_clipboard" c:type="paste_clipboard">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="string" c:type="gchararray"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="delete-from-cursor">
+      </callback>
+      <callback name="toggle_overwrite" c:type="toggle_overwrite">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
-          <parameter name="object">
-            <type name="DeleteType" c:type="GtkDeleteType"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="int" c:type="gint"/>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
           </parameter>
         </parameters>
-      </glib:signal>
-      <glib:signal name="backspace">
+      </callback>
+      <callback name="move_focus" c:type="move_focus">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="cut-clipboard">
+        <parameters>
+          <parameter name="text_view">
+            <type name="TextView" c:type="GtkTextView*"/>
+          </parameter>
+          <parameter name="direction">
+            <type name="DirectionType" c:type="GtkDirectionType"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="gtk_reserved1" c:type="_gtk_reserved1">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="paste-clipboard">
+      </callback>
+      <callback name="gtk_reserved2" c:type="_gtk_reserved2">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="toggle-overwrite">
+      </callback>
+      <callback name="gtk_reserved3" c:type="_gtk_reserved3">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="page-horizontally">
+      </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="int" c:type="gint"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="boolean" c:type="gboolean"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="move-viewport">
+      </callback>
+      <callback name="gtk_reserved5" c:type="_gtk_reserved5">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-        <parameters>
-          <parameter name="object">
-            <type name="ScrollStep" c:type="GtkScrollStep"/>
-          </parameter>
-          <parameter name="p0">
-            <type name="int" c:type="gint"/>
-          </parameter>
-        </parameters>
-      </glib:signal>
-      <glib:signal name="set-anchor">
+      </callback>
+      <callback name="gtk_reserved6" c:type="_gtk_reserved6">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-      <glib:signal name="toggle-cursor-visible">
+      </callback>
+      <callback name="gtk_reserved7" c:type="_gtk_reserved7">
         <return-value>
           <type name="none" c:type="void"/>
         </return-value>
-      </glib:signal>
-    </class>
+      </callback>
+    </record>
     <record name="TextWindow" c:type="GtkTextWindow"/>
     <record name="TextPendingScroll" c:type="GtkTextPendingScroll"/>
     <function name="text_view_new" c:identifier="gtk_text_view_new">
@@ -61762,6 +71784,92 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="TipsQueryClass" c:type="GtkTipsQueryClass">
+      <field name="parent_class">
+        <type name="LabelClass" c:type="GtkLabelClass"/>
+      </field>
+      <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="TipsQuery" c:type="GtkTipsQuery*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <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="TipsQuery" c:type="GtkTipsQuery*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <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="TipsQuery" c:type="GtkTipsQuery*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="tip_text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="tip_private">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="widget_selected" c:type="widget_selected">
+        <return-value>
+          <type name="int" c:type="gint"/>
+        </return-value>
+        <parameters>
+          <parameter name="tips_query">
+            <type name="TipsQuery" c:type="GtkTipsQuery*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+          <parameter name="tip_text">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="tip_private">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+          <parameter name="event">
+            <type name="Gdk.EventButton" c:type="GdkEventButton*"/>
+          </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>
+    </record>
     <function name="tips_query_new" c:identifier="gtk_tips_query_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -62472,6 +72580,71 @@
         </parameters>
       </glib:signal>
     </class>
+    <record name="ToolbarClass" c:type="GtkToolbarClass">
+      <field name="parent_class">
+        <type name="ContainerClass" c:type="GtkContainerClass"/>
+      </field>
+      <callback name="orientation_changed" c:type="orientation_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
+          </parameter>
+          <parameter name="orientation">
+            <type name="Orientation" c:type="GtkOrientation"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="style_changed" c:type="style_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
+          </parameter>
+          <parameter name="style">
+            <type name="ToolbarStyle" c:type="GtkToolbarStyle"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="popup_context_menu" c:type="popup_context_menu">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="toolbar">
+            <type name="Toolbar" c:type="GtkToolbar*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="gint"/>
+          </parameter>
+          <parameter name="button_number">
+            <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>
+    </record>
     <record name="ToolbarPrivate" c:type="GtkToolbarPrivate"/>
     <function name="toolbar_new" c:identifier="gtk_toolbar_new">
       <return-value>
@@ -62573,6 +72746,53 @@
         </parameters>
       </callback>
     </interface>
+    <record name="TreeDragSourceIface" c:type="GtkTreeDragSourceIface">
+      <field name="g_iface">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="row_draggable" c:type="row_draggable">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="drag_source">
+            <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="drag_data_get" c:type="drag_data_get">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="drag_source">
+            <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="selection_data">
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="drag_data_delete" c:type="drag_data_delete">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="drag_source">
+            <type name="TreeDragSource" c:type="GtkTreeDragSource*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
     <function name="tree_drag_source_row_draggable"
               c:identifier="gtk_tree_drag_source_row_draggable">
       <return-value>
@@ -62655,6 +72875,43 @@
         </parameters>
       </callback>
     </interface>
+    <record name="TreeDragDestIface" c:type="GtkTreeDragDestIface">
+      <field name="g_iface">
+        <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
+      </field>
+      <callback name="drag_data_received" c:type="drag_data_received">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="drag_dest">
+            <type name="TreeDragDest" c:type="GtkTreeDragDest*"/>
+          </parameter>
+          <parameter name="dest">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="selection_data">
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="row_drop_possible" c:type="row_drop_possible">
+        <return-value>
+          <type name="boolean" c:type="gboolean"/>
+        </return-value>
+        <parameters>
+          <parameter name="drag_dest">
+            <type name="TreeDragDest" c:type="GtkTreeDragDest*"/>
+          </parameter>
+          <parameter name="dest_path">
+            <type name="TreePath" c:type="GtkTreePath*"/>
+          </parameter>
+          <parameter name="selection_data">
+            <type name="SelectionData" c:type="GtkSelectionData*"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
     <function name="tree_drag_dest_drag_data_received"
               c:identifier="gtk_tree_drag_dest_drag_data_received">
       <return-value>
@@ -62860,6 +73117,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="TreeModelSortClass" c:type="GtkTreeModelSortClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </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>
+    </record>
     <function name="tree_model_sort_new_with_model"
               c:identifier="gtk_tree_model_sort_new_with_model">
       <return-value>
@@ -63300,6 +73582,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="TreeStoreClass" c:type="GtkTreeStoreClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </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>
+    </record>
     <class name="UIManager"
            c:type="GtkUIManager"
            parent="GObject.Object"
@@ -63720,6 +74027,128 @@
         </return-value>
       </glib:signal>
     </class>
+    <record name="UIManagerClass" c:type="GtkUIManagerClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="add_widget" c:type="add_widget">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="merge">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+          <parameter name="widget">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="actions_changed" c:type="actions_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="merge">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="connect_proxy" c:type="connect_proxy">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="merge">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
+          </parameter>
+          <parameter name="proxy">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="disconnect_proxy" c:type="disconnect_proxy">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="merge">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
+          </parameter>
+          <parameter name="proxy">
+            <type name="Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="pre_activate" c:type="pre_activate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="merge">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="post_activate" c:type="post_activate">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="merge">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+          <parameter name="action">
+            <type name="Action" c:type="GtkAction*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_widget" c:type="get_widget">
+        <return-value>
+          <type name="Widget" c:type="GtkWidget*"/>
+        </return-value>
+        <parameters>
+          <parameter name="manager">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_action" c:type="get_action">
+        <return-value>
+          <type name="Action" c:type="GtkAction*"/>
+        </return-value>
+        <parameters>
+          <parameter name="manager">
+            <type name="UIManager" c:type="GtkUIManager*"/>
+          </parameter>
+          <parameter name="path">
+            <type name="string" c:type="gchar*"/>
+          </parameter>
+        </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>
+    </record>
     <record name="UIManagerPrivate" c:type="GtkUIManagerPrivate"/>
     <class name="VButtonBox"
            c:type="GtkVButtonBox"
@@ -63727,6 +74156,11 @@
            glib:type-name="GtkVButtonBox"
            glib:get-type="gtk_vbutton_box_get_type">
     </class>
+    <record name="VButtonBoxClass" c:type="GtkVButtonBoxClass">
+      <field name="parent_class">
+        <type name="ButtonBoxClass" c:type="GtkButtonBoxClass"/>
+      </field>
+    </record>
     <function name="vbutton_box_new" c:identifier="gtk_vbutton_box_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -63792,6 +74226,31 @@
         </return-value>
       </callback>
     </class>
+    <record name="VolumeButtonClass" c:type="GtkVolumeButtonClass">
+      <field name="parent_class">
+        <type name="ScaleButtonClass" c:type="GtkScaleButtonClass"/>
+      </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>
+    </record>
     <function name="volume_button_new" c:identifier="gtk_volume_button_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -63803,6 +74262,11 @@
            glib:type-name="GtkVPaned"
            glib:get-type="gtk_vpaned_get_type">
     </class>
+    <record name="VPanedClass" c:type="GtkVPanedClass">
+      <field name="parent_class">
+        <type name="PanedClass" c:type="GtkPanedClass"/>
+      </field>
+    </record>
     <function name="vpaned_new" c:identifier="gtk_vpaned_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -63814,6 +74278,11 @@
            glib:type-name="GtkVRuler"
            glib:get-type="gtk_vruler_get_type">
     </class>
+    <record name="VRulerClass" c:type="GtkVRulerClass">
+      <field name="parent_class">
+        <type name="RulerClass" c:type="GtkRulerClass"/>
+      </field>
+    </record>
     <function name="vruler_new" c:identifier="gtk_vruler_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -63825,6 +74294,11 @@
            glib:type-name="GtkVScale"
            glib:get-type="gtk_vscale_get_type">
     </class>
+    <record name="VScaleClass" c:type="GtkVScaleClass">
+      <field name="parent_class">
+        <type name="ScaleClass" c:type="GtkScaleClass"/>
+      </field>
+    </record>
     <function name="vscale_new" c:identifier="gtk_vscale_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>
@@ -63858,6 +74332,11 @@
            glib:type-name="GtkVSeparator"
            glib:get-type="gtk_vseparator_get_type">
     </class>
+    <record name="VSeparatorClass" c:type="GtkVSeparatorClass">
+      <field name="parent_class">
+        <type name="SeparatorClass" c:type="GtkSeparatorClass"/>
+      </field>
+    </record>
     <function name="vseparator_new" c:identifier="gtk_vseparator_new">
       <return-value>
         <type name="Widget" c:type="GtkWidget*"/>

Modified: trunk/gir/pango.gir
==============================================================================
--- trunk/gir/pango.gir	(original)
+++ trunk/gir/pango.gir	Wed Aug 20 13:46:55 2008
@@ -3222,6 +3222,7 @@
         </parameters>
       </method>
     </class>
+    <record name="ContextClass" c:type="PangoContextClass"/>
     <function name="itemize" c:identifier="pango_itemize">
       <return-value>
         <type name="GLib.List" c:type="GList*"/>
@@ -4532,6 +4533,7 @@
         </parameters>
       </method>
     </class>
+    <record name="LayoutClass" c:type="PangoLayoutClass"/>
     <glib:boxed c:type="PangoLayoutLine"
                 glib:name="LayoutLine"
                 glib:type-name="PangoLayoutLine"
@@ -5373,6 +5375,218 @@
         </return-value>
       </callback>
     </class>
+    <record name="RendererClass" c:type="PangoRendererClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="draw_glyphs" c:type="draw_glyphs">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="renderer">
+            <type name="Renderer" c:type="PangoRenderer*"/>
+          </parameter>
+          <parameter name="font">
+            <type name="Font" c:type="PangoFont*"/>
+          </parameter>
+          <parameter name="glyphs">
+            <type name="GlyphString" c:type="PangoGlyphString*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="int"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="int"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="draw_rectangle" c:type="draw_rectangle">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="renderer">
+            <type name="Renderer" c:type="PangoRenderer*"/>
+          </parameter>
+          <parameter name="part">
+            <type name="RenderPart" c:type="PangoRenderPart"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="int"/>
+          </parameter>
+          <parameter name="y">
+            <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>
+      </callback>
+      <callback name="draw_error_underline" c:type="draw_error_underline">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="renderer">
+            <type name="Renderer" c:type="PangoRenderer*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="int"/>
+          </parameter>
+          <parameter name="y">
+            <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>
+      </callback>
+      <callback name="draw_shape" c:type="draw_shape">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="renderer">
+            <type name="Renderer" c:type="PangoRenderer*"/>
+          </parameter>
+          <parameter name="attr">
+            <type name="AttrShape" c:type="PangoAttrShape*"/>
+          </parameter>
+          <parameter name="x">
+            <type name="int" c:type="int"/>
+          </parameter>
+          <parameter name="y">
+            <type name="int" c:type="int"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="draw_trapezoid" c:type="draw_trapezoid">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="renderer">
+            <type name="Renderer" c:type="PangoRenderer*"/>
+          </parameter>
+          <parameter name="part">
+            <type name="RenderPart" c:type="PangoRenderPart"/>
+          </parameter>
+          <parameter name="y1_">
+            <type name="double" c:type="double"/>
+          </parameter>
+          <parameter name="x11">
+            <type name="double" c:type="double"/>
+          </parameter>
+          <parameter name="x21">
+            <type name="double" c:type="double"/>
+          </parameter>
+          <parameter name="y2">
+            <type name="double" c:type="double"/>
+          </parameter>
+          <parameter name="x12">
+            <type name="double" c:type="double"/>
+          </parameter>
+          <parameter name="x22">
+            <type name="double" c:type="double"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="draw_glyph" c:type="draw_glyph">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="renderer">
+            <type name="Renderer" c:type="PangoRenderer*"/>
+          </parameter>
+          <parameter name="font">
+            <type name="Font" c:type="PangoFont*"/>
+          </parameter>
+          <parameter name="glyph">
+            <type name="Glyph" c:type="PangoGlyph"/>
+          </parameter>
+          <parameter name="x">
+            <type name="double" c:type="double"/>
+          </parameter>
+          <parameter name="y">
+            <type name="double" c:type="double"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="part_changed" c:type="part_changed">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="renderer">
+            <type name="Renderer" c:type="PangoRenderer*"/>
+          </parameter>
+          <parameter name="part">
+            <type name="RenderPart" c:type="PangoRenderPart"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="begin" c:type="begin">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="renderer">
+            <type name="Renderer" c:type="PangoRenderer*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="end" c:type="end">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="renderer">
+            <type name="Renderer" c:type="PangoRenderer*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="prepare_run" c:type="prepare_run">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="renderer">
+            <type name="Renderer" c:type="PangoRenderer*"/>
+          </parameter>
+          <parameter name="run">
+            <type name="LayoutRun" c:type="PangoLayoutRun*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="pango_reserved1" c:type="_pango_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="pango_reserved2" c:type="_pango_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="pango_reserved3" c:type="_pango_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="pango_reserved4" c:type="_pango_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </record>
     <record name="RendererPrivate" c:type="PangoRendererPrivate"/>
     <function name="split_file_list" c:identifier="pango_split_file_list">
       <return-value>

Modified: trunk/gir/pangoft2.gir
==============================================================================
--- trunk/gir/pangoft2.gir	(original)
+++ trunk/gir/pangoft2.gir	Wed Aug 20 13:46:55 2008
@@ -32,6 +32,7 @@
         <type name="any" c:type="gpointer"/>
       </property>
     </class>
+    <record name="PangoFcFontClass" c:type="PangoFcFontClass"/>
     <class name="FontMap"
            c:type="PangoFT2FontMap"
            parent="PangoFcFontMap"
@@ -407,6 +408,60 @@
         </return-value>
       </callback>
     </class>
+    <record name="PangoFcDecoderClass" c:type="PangoFcDecoderClass">
+      <field name="parent_class">
+        <type name="GObject.Class" c:type="GObjectClass"/>
+      </field>
+      <callback name="get_charset" c:type="get_charset">
+        <return-value>
+          <type name="fontconfig.CharSet" c:type="FcCharSet*"/>
+        </return-value>
+        <parameters>
+          <parameter name="decoder">
+            <type name="PangoFcDecoder" c:type="PangoFcDecoder*"/>
+          </parameter>
+          <parameter name="fcfont">
+            <type name="PangoFcFont" c:type="PangoFcFont*"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="get_glyph" c:type="get_glyph">
+        <return-value>
+          <type name="Pango.Glyph" c:type="PangoGlyph"/>
+        </return-value>
+        <parameters>
+          <parameter name="decoder">
+            <type name="PangoFcDecoder" c:type="PangoFcDecoder*"/>
+          </parameter>
+          <parameter name="fcfont">
+            <type name="PangoFcFont" c:type="PangoFcFont*"/>
+          </parameter>
+          <parameter name="wc">
+            <type name="uint32" c:type="guint32"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="pango_reserved1" c:type="_pango_reserved1">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="pango_reserved2" c:type="_pango_reserved2">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="pango_reserved3" c:type="_pango_reserved3">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+      <callback name="pango_reserved4" c:type="_pango_reserved4">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+      </callback>
+    </record>
     <class name="PangoFcFontMap"
            c:type="PangoFcFontMap"
            parent="Pango.FontMap"
@@ -434,6 +489,7 @@
         </parameters>
       </method>
     </class>
+    <record name="PangoFcFontMapClass" c:type="PangoFcFontMapClass"/>
     <record name="PangoFcFontMapPrivate" c:type="PangoFcFontMapPrivate"/>
     <callback name="PangoFcDecoderFindFunc" c:type="PangoFcDecoderFindFunc">
       <return-value>

Modified: trunk/gir/pangoxft.gir
==============================================================================
--- trunk/gir/pangoxft.gir	(original)
+++ trunk/gir/pangoxft.gir	Wed Aug 20 13:46:55 2008
@@ -80,6 +80,49 @@
         </parameters>
       </callback>
     </class>
+    <record name="RendererClass" c:type="PangoXftRendererClass">
+      <field name="parent_class">
+        <type name="Pango.RendererClass" c:type="PangoRendererClass"/>
+      </field>
+      <callback name="composite_trapezoids" c:type="composite_trapezoids">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="xftrenderer">
+            <type name="Renderer" c:type="PangoXftRenderer*"/>
+          </parameter>
+          <parameter name="part">
+            <type name="Pango.RenderPart" c:type="PangoRenderPart"/>
+          </parameter>
+          <parameter name="trapezoids">
+            <type name="XTrapezoid" c:type="XTrapezoid*"/>
+          </parameter>
+          <parameter name="n_trapezoids">
+            <type name="int" c:type="int"/>
+          </parameter>
+        </parameters>
+      </callback>
+      <callback name="composite_glyphs" c:type="composite_glyphs">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="xftrenderer">
+            <type name="Renderer" c:type="PangoXftRenderer*"/>
+          </parameter>
+          <parameter name="xft_font">
+            <type name="XftFont" c:type="XftFont*"/>
+          </parameter>
+          <parameter name="glyphs">
+            <type name="XftGlyphSpec" c:type="XftGlyphSpec*"/>
+          </parameter>
+          <parameter name="n_glyphs">
+            <type name="int" c:type="int"/>
+          </parameter>
+        </parameters>
+      </callback>
+    </record>
     <record name="RendererPrivate" c:type="PangoXftRendererPrivate"/>
     <function name="pango_xft_renderer_new"
               c:identifier="pango_xft_renderer_new">



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