diff --git a/ChangeLog b/ChangeLog
index ad66b0e09..34cad2a8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-08  Mike Kestner <mkestner@speakeasy.net>
+
+	* glue/Makefile.in : s/BASE_SOURCES/BASESOURCES
+	* parser/gapi_pp.pl : handle nested #if/#endif in ignored #if's
+	* parser/makefile : make gtkapi.xml depend on gapi*.pl
+
 2002-07-06  Rachel Hestilow  <hestilow@ximian.com>
 
 	* generator/Parameters.cs (Initialize): Initialize error
diff --git a/generator/gtkapi.xml b/generator/gtkapi.xml
index 2463ed742..d2a5140c7 100644
--- a/generator/gtkapi.xml
+++ b/generator/gtkapi.xml
@@ -326,7 +326,7 @@
         <return-type type="void"/>
         <parameters>
           <parameter type="const-gchar*" name="first_arg_name"/>
-          <parameter type="c" name=""/>
+          <parameter type="c"/>
         </parameters>
       </method>
       <method name="AffineAbsolute" cname="gnome_canvas_item_affine_absolute">
@@ -355,7 +355,7 @@
           <parameter type="GnomeCanvasGroup*" name="parent"/>
           <parameter type="GType" name="type"/>
           <parameter type="const-gchar*" name="first_arg_name"/>
-          <parameter type="o" name=""/>
+          <parameter type="o"/>
         </parameters>
       </constructor>
       <method name="I2cAffine" cname="gnome_canvas_item_i2c_affine">
@@ -2356,7 +2356,7 @@
           <parameter type="gboolean" name="positions_in_pixels"/>
           <parameter type="PangoTabAlign" name="first_alignment"/>
           <parameter type="gint" name="first_position"/>
-          <parameter type="g" name=""/>
+          <parameter type="g"/>
         </parameters>
       </constructor>
       <method name="GetTab" cname="pango_tab_array_get_tab">
@@ -3051,7 +3051,7 @@
       <method name="AddStaticArg" cname="gnome_client_add_static_arg">
         <return-type type="void"/>
         <parameters>
-          <parameter type="GnomeClient *client, ..." name=""/>
+          <parameter type="GnomeClient *client, ..."/>
         </parameters>
       </method>
       <method name="RequestInteraction" cname="gnome_client_request_interaction">
@@ -5079,7 +5079,7 @@
         <return-type type="gboolean"/>
         <parameters>
           <parameter type="GtkHTML*" name="html"/>
-          <parameter type="*" name=""/>
+          <parameter type="*"/>
         </parameters>
       </signal>
       <signal name="CurrentParagraphStyleChanged" cname="current_paragraph_style_changed" when="FIRST">
@@ -5764,10 +5764,6 @@
       <member cname="GDK_FILTER_TRANSLATE" name="Translate"/>
       <member cname="GDK_FILTER_REMOVE" name="Remove"/>
     </enum>
-    <enum name="FontType" cname="GdkFontType" type="enum">
-      <member cname="GDK_FONT_FONT" name="Font"/>
-      <member cname="GDK_FONT_FONTSET" name="Fontset"/>
-    </enum>
     <enum name="Function" cname="GdkFunction" type="enum">
       <member cname="GDK_COPY" name="Copy"/>
       <member cname="GDK_INVERT" name="Invert"/>
@@ -7149,29 +7145,6 @@
       <field cname="changed_mask" type="GdkWindowState"/>
       <field cname="new_window_state" type="GdkWindowState"/>
     </struct>
-    <boxed name="Font" cname="GdkFont">
-      <field cname="type" type="GdkFontType"/>
-      <field cname="ascent" type="gint"/>
-      <field cname="descent" type="gint"/>
-      <method name="Id" cname="gdk_font_id">
-        <return-type type="gint"/>
-      </method>
-      <method name="Unref" cname="gdk_font_unref">
-        <return-type type="void"/>
-      </method>
-      <method name="Ref" cname="gdk_font_ref">
-        <return-type type="GdkFont*"/>
-      </method>
-      <method name="Equal" cname="gdk_font_equal">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="const-GdkFont*" name="fontb"/>
-        </parameters>
-      </method>
-      <method name="FullNameGet" cname="gdk_font_full_name_get">
-        <return-type type="gchar*"/>
-      </method>
-    </boxed>
     <struct name="GCValues" cname="GdkGCValues">
       <field cname="foreground" type="GdkColor"/>
       <field cname="background" type="GdkColor"/>
@@ -7689,7 +7662,7 @@
           <parameter type="const-char*" name="filename"/>
           <parameter type="const-char*" name="type"/>
           <parameter type="GError**" name="error"/>
-          <parameter type=" " name=""/>
+          <parameter type=" "/>
         </parameters>
       </method>
       <method name="GetColorspace" cname="gdk_pixbuf_get_colorspace">
@@ -7969,12 +7942,6 @@
       <member cname="GTK_SHRINK" name="Shrink" value="1 &lt;&lt; 1"/>
       <member cname="GTK_FILL" name="Fill" value="1 &lt;&lt; 2"/>
     </enum>
-    <enum name="ButtonAction" cname="GtkButtonAction" type="flags">
-      <member cname="GTK_BUTTON_IGNORED" name="Ignored"/>
-      <member cname="GTK_BUTTON_SELECTS" name="Selects" value="1 &lt;&lt; 0"/>
-      <member cname="GTK_BUTTON_DRAGS" name="Drags" value="1 &lt;&lt; 1"/>
-      <member cname="GTK_BUTTON_EXPANDS" name="Expands" value="1 &lt;&lt; 2"/>
-    </enum>
     <enum name="ButtonBoxStyle" cname="GtkButtonBoxStyle" type="enum">
       <member cname="GTK_BUTTONBOX_DEFAULT_STYLE" name="DefaultStyle"/>
       <member cname="GTK_BUTTONBOX_SPREAD" name="Spread"/>
@@ -7990,37 +7957,6 @@
       <member cname="GTK_BUTTONS_YES_NO" name="YesNo"/>
       <member cname="GTK_BUTTONS_OK_CANCEL" name="OkCancel"/>
     </enum>
-    <enum name="CListDragPos" cname="GtkCListDragPos" type="enum">
-      <member cname="GTK_CLIST_DRAG_NONE" name="None"/>
-      <member cname="GTK_CLIST_DRAG_BEFORE" name="Before"/>
-      <member cname="GTK_CLIST_DRAG_INTO" name="Into"/>
-      <member cname="GTK_CLIST_DRAG_AFTER" name="After"/>
-    </enum>
-    <enum name="CTreeExpanderStyle" cname="GtkCTreeExpanderStyle" type="enum">
-      <member cname="GTK_CTREE_EXPANDER_NONE" name="None"/>
-      <member cname="GTK_CTREE_EXPANDER_SQUARE" name="Square"/>
-      <member cname="GTK_CTREE_EXPANDER_TRIANGLE" name="Triangle"/>
-      <member cname="GTK_CTREE_EXPANDER_CIRCULAR" name="Circular"/>
-    </enum>
-    <enum name="CTreeExpansionType" cname="GtkCTreeExpansionType" type="enum">
-      <member cname="GTK_CTREE_EXPANSION_EXPAND" name="Expand"/>
-      <member cname="GTK_CTREE_EXPANSION_EXPAND_RECURSIVE" name="ExpandRecursive"/>
-      <member cname="GTK_CTREE_EXPANSION_COLLAPSE" name="Collapse"/>
-      <member cname="GTK_CTREE_EXPANSION_COLLAPSE_RECURSIVE" name="CollapseRecursive"/>
-      <member cname="GTK_CTREE_EXPANSION_TOGGLE" name="Toggle"/>
-      <member cname="GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE" name="ToggleRecursive"/>
-    </enum>
-    <enum name="CTreeLineStyle" cname="GtkCTreeLineStyle" type="enum">
-      <member cname="GTK_CTREE_LINES_NONE" name="None"/>
-      <member cname="GTK_CTREE_LINES_SOLID" name="Solid"/>
-      <member cname="GTK_CTREE_LINES_DOTTED" name="Dotted"/>
-      <member cname="GTK_CTREE_LINES_TABBED" name="Tabbed"/>
-    </enum>
-    <enum name="CTreePos" cname="GtkCTreePos" type="enum">
-      <member cname="GTK_CTREE_POS_BEFORE" name="Before"/>
-      <member cname="GTK_CTREE_POS_AS_CHILD" name="AsChild"/>
-      <member cname="GTK_CTREE_POS_AFTER" name="After"/>
-    </enum>
     <enum name="CalendarDisplayOptions" cname="GtkCalendarDisplayOptions" type="flags">
       <member cname="GTK_CALENDAR_SHOW_HEADING" name="ShowHeading" value="1 &lt;&lt; 0"/>
       <member cname="GTK_CALENDAR_SHOW_DAY_NAMES" name="ShowDayNames" value="1 &lt;&lt; 1"/>
@@ -8039,13 +7975,6 @@
       <member cname="GTK_CELL_RENDERER_INSENSITIVE" name="Insensitive" value="1 &lt;&lt; 2"/>
       <member cname="GTK_CELL_RENDERER_SORTED" name="Sorted" value="1 &lt;&lt; 3"/>
     </enum>
-    <enum name="CellType" cname="GtkCellType" type="enum">
-      <member cname="GTK_CELL_EMPTY" name="Empty"/>
-      <member cname="GTK_CELL_TEXT" name="Text"/>
-      <member cname="GTK_CELL_PIXMAP" name="Pixmap"/>
-      <member cname="GTK_CELL_PIXTEXT" name="Pixtext"/>
-      <member cname="GTK_CELL_WIDGET" name="Widget"/>
-    </enum>
     <enum name="CornerType" cname="GtkCornerType" type="enum">
       <member cname="GTK_CORNER_TOP_LEFT" name="TopLeft"/>
       <member cname="GTK_CORNER_BOTTOM_LEFT" name="BottomLeft"/>
@@ -8398,10 +8327,6 @@
       <member cname="GTK_TREE_VIEW_DROP_INTO_OR_BEFORE" name="IntoOrBefore"/>
       <member cname="GTK_TREE_VIEW_DROP_INTO_OR_AFTER" name="IntoOrAfter"/>
     </enum>
-    <enum name="TreeViewMode" cname="GtkTreeViewMode" type="enum">
-      <member cname="GTK_TREE_VIEW_LINE" name="Line"/>
-      <member cname="GTK_TREE_VIEW_ITEM" name="Item"/>
-    </enum>
     <enum name="UpdateType" cname="GtkUpdateType" type="enum">
       <member cname="GTK_UPDATE_CONTINUOUS" name="Continuous"/>
       <member cname="GTK_UPDATE_DISCONTINUOUS" name="Discontinuous"/>
@@ -8471,41 +8396,6 @@
         <parameter type="gboolean" name="changed"/>
       </parameters>
     </callback>
-    <callback name="CListCompareFunc" cname="GtkCListCompareFunc">
-      <return-type type="gint"/>
-      <parameters>
-        <parameter type="GtkCList*" name="clist"/>
-        <parameter type="gconstpointer" name="ptr1"/>
-        <parameter type="gconstpointer" name="ptr2"/>
-      </parameters>
-    </callback>
-    <callback name="CTreeCompareDragFunc" cname="GtkCTreeCompareDragFunc">
-      <return-type type="gboolean"/>
-      <parameters>
-        <parameter type="GtkCTree*" name="ctree"/>
-        <parameter type="GtkCTreeNode*" name="source_node"/>
-        <parameter type="GtkCTreeNode*" name="new_parent"/>
-        <parameter type="GtkCTreeNode*" name="new_sibling"/>
-      </parameters>
-    </callback>
-    <callback name="CTreeFunc" cname="GtkCTreeFunc">
-      <return-type type="void"/>
-      <parameters>
-        <parameter type="GtkCTree*" name="ctree"/>
-        <parameter type="GtkCTreeNode*" name="node"/>
-        <parameter type="gpointer" name="data"/>
-      </parameters>
-    </callback>
-    <callback name="CTreeGNodeFunc" cname="GtkCTreeGNodeFunc">
-      <return-type type="gboolean"/>
-      <parameters>
-        <parameter type="GtkCTree*" name="ctree"/>
-        <parameter type="guint" name="depth"/>
-        <parameter type="GNode*" name="gnode"/>
-        <parameter type="GtkCTreeNode*" name="cnode"/>
-        <parameter type="gpointer" name="data"/>
-      </parameters>
-    </callback>
     <callback name="Callback" cname="GtkCallback">
       <return-type type="void"/>
       <parameters>
@@ -8649,13 +8539,6 @@
         <parameter type="gpointer" name="user_data"/>
       </parameters>
     </callback>
-    <callback name="TextFunction" cname="GtkTextFunction">
-      <return-type type="void"/>
-      <parameters>
-        <parameter type="GtkOldEditable*" name="editable"/>
-        <parameter type="guint32" name="time"/>
-      </parameters>
-    </callback>
     <callback name="TextSegCheckFunc" cname="GtkTextSegCheckFunc">
       <return-type type="void"/>
       <parameters>
@@ -8808,18 +8691,18 @@
       </parameters>
     </callback>
     <interface name="CellEditable" cname="GtkCellEditable">
-      <method name="RemoveWidget" cname="gtk_cell_editable_remove_widget">
-        <return-type type="void"/>
-      </method>
-      <method name="FinishEditing" cname="gtk_cell_editable_editing_done">
-        <return-type type="void"/>
-      </method>
       <method name="StartEditing" cname="gtk_cell_editable_start_editing">
         <return-type type="void"/>
         <parameters>
           <parameter type="GdkEvent*" name="event"/>
         </parameters>
       </method>
+      <method name="RemoveWidget" cname="gtk_cell_editable_remove_widget">
+        <return-type type="void"/>
+      </method>
+      <method name="FinishEditing" cname="gtk_cell_editable_editing_done">
+        <return-type type="void"/>
+      </method>
       <signal name="EditingDone" cname="editing_done" when="LAST">
         <return-type type="void"/>
         <parameters>
@@ -8834,6 +8717,9 @@
       </signal>
     </interface>
     <interface name="Editable" cname="GtkEditable">
+      <method name="DeleteSelection" cname="gtk_editable_delete_selection">
+        <return-type type="void"/>
+      </method>
       <method name="SetIsEditable" cname="gtk_editable_set_editable">
         <return-type type="void"/>
         <parameters>
@@ -8847,6 +8733,14 @@
           <parameter type="gint" name="end_pos"/>
         </parameters>
       </method>
+      <method name="InsertText" cname="gtk_editable_insert_text">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="const-gchar*" name="new_text"/>
+          <parameter type="gint" name="new_text_length"/>
+          <parameter type="gint*" name="position" pass_as="out"/>
+        </parameters>
+      </method>
       <method name="CopyClipboard" cname="gtk_editable_copy_clipboard">
         <return-type type="void"/>
       </method>
@@ -8859,24 +8753,6 @@
           <parameter type="gint" name="position"/>
         </parameters>
       </method>
-      <method name="SelectRegion" cname="gtk_editable_select_region">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="start"/>
-          <parameter type="gint" name="end"/>
-        </parameters>
-      </method>
-      <method name="DeleteSelection" cname="gtk_editable_delete_selection">
-        <return-type type="void"/>
-      </method>
-      <method name="InsertText" cname="gtk_editable_insert_text">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-gchar*" name="new_text"/>
-          <parameter type="gint" name="new_text_length"/>
-          <parameter type="gint*" name="position" pass_as="out"/>
-        </parameters>
-      </method>
       <method name="GetIsEditable" cname="gtk_editable_get_editable">
         <return-type type="gboolean"/>
       </method>
@@ -8900,6 +8776,13 @@
       <method name="GetPosition" cname="gtk_editable_get_position">
         <return-type type="gint"/>
       </method>
+      <method name="SelectRegion" cname="gtk_editable_select_region">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="start"/>
+          <parameter type="gint" name="end"/>
+        </parameters>
+      </method>
       <signal name="TextInserted" cname="insert_text" when="LAST">
         <return-type type="void"/>
         <parameters>
@@ -8941,6 +8824,12 @@
       </method>
     </interface>
     <interface name="TreeDragSource" cname="GtkTreeDragSource">
+      <method name="RowDraggable" cname="gtk_tree_drag_source_row_draggable">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkTreePath*" name="path"/>
+        </parameters>
+      </method>
       <method name="DragDataDelete" cname="gtk_tree_drag_source_drag_data_delete">
         <return-type type="gboolean"/>
         <parameters>
@@ -8954,14 +8843,11 @@
           <parameter type="GtkSelectionData*" name="selection_data"/>
         </parameters>
       </method>
-      <method name="RowDraggable" cname="gtk_tree_drag_source_row_draggable">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
-        </parameters>
-      </method>
     </interface>
     <interface name="TreeModel" cname="GtkTreeModel">
+      <method name="GetNColumns" cname="gtk_tree_model_get_n_columns">
+        <return-type type="gint"/>
+      </method>
       <method name="ToggleRowHasChild" cname="gtk_tree_model_row_has_child_toggled">
         <return-type type="void"/>
         <parameters>
@@ -8992,45 +8878,6 @@
       <method name="GetFlags" cname="gtk_tree_model_get_flags">
         <return-type type="GtkTreeModelFlags"/>
       </method>
-      <method name="GetPath" cname="gtk_tree_model_get_path">
-        <return-type type="GtkTreePath*"/>
-        <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-        </parameters>
-      </method>
-      <method name="Get" cname="gtk_tree_model_get">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="G" name=""/>
-        </parameters>
-      </method>
-      <method name="GetIterFromString" cname="gtk_tree_model_get_iter_from_string">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="const-gchar*" name="path_string"/>
-        </parameters>
-      </method>
-      <method name="ChangeRow" cname="gtk_tree_model_row_changed">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
-          <parameter type="GtkTreeIter*" name="iter"/>
-        </parameters>
-      </method>
-      <method name="SortNewWithModel" cname="gtk_tree_model_sort_new_with_model">
-        <return-type type="GtkTreeModel*"/>
-      </method>
-      <method name="DeleteRow" cname="gtk_tree_model_row_deleted">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
-        </parameters>
-      </method>
-      <method name="GetNColumns" cname="gtk_tree_model_get_n_columns">
-        <return-type type="gint"/>
-      </method>
       <method name="IterNthChild" cname="gtk_tree_model_iter_nth_child">
         <return-type type="gboolean"/>
         <parameters>
@@ -9084,6 +8931,12 @@
           <parameter type="GtkTreeIter*" name="iter"/>
         </parameters>
       </method>
+      <method name="GetPath" cname="gtk_tree_model_get_path">
+        <return-type type="GtkTreePath*"/>
+        <parameters>
+          <parameter type="GtkTreeIter*" name="iter"/>
+        </parameters>
+      </method>
       <method name="ReorderRows" cname="gtk_tree_model_rows_reordered">
         <return-type type="void"/>
         <parameters>
@@ -9092,12 +8945,42 @@
           <parameter type="gint*" name="new_order"/>
         </parameters>
       </method>
+      <method name="Get" cname="gtk_tree_model_get">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="G"/>
+        </parameters>
+      </method>
+      <method name="GetIterFromString" cname="gtk_tree_model_get_iter_from_string">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="const-gchar*" name="path_string"/>
+        </parameters>
+      </method>
+      <method name="ChangeRow" cname="gtk_tree_model_row_changed">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GtkTreeIter*" name="iter"/>
+        </parameters>
+      </method>
       <method name="UnrefNode" cname="gtk_tree_model_unref_node">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkTreeIter*" name="iter"/>
         </parameters>
       </method>
+      <method name="SortNewWithModel" cname="gtk_tree_model_sort_new_with_model">
+        <return-type type="GtkTreeModel*"/>
+      </method>
+      <method name="DeleteRow" cname="gtk_tree_model_row_deleted">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTreePath*" name="path"/>
+        </parameters>
+      </method>
       <method name="IterChildren" cname="gtk_tree_model_iter_children">
         <return-type type="gboolean"/>
         <parameters>
@@ -9169,16 +9052,6 @@
           <parameter type="GtkDestroyNotify" name="destroy"/>
         </parameters>
       </method>
-      <method name="GetSortColumnId" cname="gtk_tree_sortable_get_sort_column_id">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="gint*" name="sort_column_id"/>
-          <parameter type="GtkSortType*" name="order"/>
-        </parameters>
-      </method>
-      <method name="ChangeSortColumn" cname="gtk_tree_sortable_sort_column_changed">
-        <return-type type="void"/>
-      </method>
       <method name="SetSortColumnId" cname="gtk_tree_sortable_set_sort_column_id">
         <return-type type="void"/>
         <parameters>
@@ -9195,9 +9068,19 @@
           <parameter type="GtkDestroyNotify" name="destroy"/>
         </parameters>
       </method>
+      <method name="GetSortColumnId" cname="gtk_tree_sortable_get_sort_column_id">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="gint*" name="sort_column_id"/>
+          <parameter type="GtkSortType*" name="order"/>
+        </parameters>
+      </method>
       <method name="HasDefaultSortFunc" cname="gtk_tree_sortable_has_default_sort_func">
         <return-type type="gboolean"/>
       </method>
+      <method name="ChangeSortColumn" cname="gtk_tree_sortable_sort_column_changed">
+        <return-type type="void"/>
+      </method>
       <signal name="SortColumnChanged" cname="sort_column_changed" when="LAST">
         <return-type type="void"/>
         <parameters>
@@ -9273,6 +9156,9 @@
           <parameter type="GClosure*" name="closure"/>
         </parameters>
       </method>
+      <method name="Lock" cname="gtk_accel_group_lock">
+        <return-type type="void"/>
+      </method>
       <method name="Query" cname="gtk_accel_group_query">
         <return-type type="GtkAccelGroupEntry*"/>
         <parameters>
@@ -9281,9 +9167,6 @@
           <parameter type="guint*" name="n_entries"/>
         </parameters>
       </method>
-      <method name="Lock" cname="gtk_accel_group_lock">
-        <return-type type="void"/>
-      </method>
     </object>
     <object name="AccelLabel" cname="GtkAccelLabel" parent="GtkLabel">
       <field cname="queue_id" type="guint"/>
@@ -9295,15 +9178,6 @@
       <field cname="accel_string_width" type="guint16"/>
       <property name="AccelClosure" cname="accel_closure" type="GClosure" doc-string=" _(The closure to be monitored for accelerator changes)" readable="true" writeable="true"/>
       <property name="AccelWidget" cname="accel_widget" type="GtkWidget" doc-string=" _(The widget to be monitored for accelerator changes)" readable="true" writeable="true"/>
-      <method name="SetAccelClosure" cname="gtk_accel_label_set_accel_closure">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GClosure*" name="accel_closure"/>
-        </parameters>
-      </method>
-      <method name="GetAccelWidget" cname="gtk_accel_label_get_accel_widget">
-        <return-type type="GtkWidget*"/>
-      </method>
       <method name="SetAccelWidget" cname="gtk_accel_label_set_accel_widget">
         <return-type type="void"/>
         <parameters>
@@ -9321,6 +9195,15 @@
           <parameter type="const-gchar*" name="string"/>
         </parameters>
       </constructor>
+      <method name="SetAccelClosure" cname="gtk_accel_label_set_accel_closure">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GClosure*" name="accel_closure"/>
+        </parameters>
+      </method>
+      <method name="GetAccelWidget" cname="gtk_accel_label_get_accel_widget">
+        <return-type type="GtkWidget*"/>
+      </method>
     </object>
     <object name="Accessible" cname="GtkAccessible" parent="AtkObject">
       <field cname="widget" type="GtkWidget*"/>
@@ -9347,6 +9230,12 @@
           <parameter type="GtkAdjustment*" name="adjustment"/>
         </parameters>
       </signal>
+      <method name="SetValue" cname="gtk_adjustment_set_value">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gdouble" name="value"/>
+        </parameters>
+      </method>
       <method name="GetValue" cname="gtk_adjustment_get_value">
         <return-type type="gdouble"/>
       </method>
@@ -9357,18 +9246,12 @@
           <parameter type="gdouble" name="upper"/>
         </parameters>
       </method>
-      <method name="ChangeValue" cname="gtk_adjustment_value_changed">
-        <return-type type="void"/>
-      </method>
-      <method name="SetValue" cname="gtk_adjustment_set_value">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gdouble" name="value"/>
-        </parameters>
-      </method>
       <method name="Change" cname="gtk_adjustment_changed">
         <return-type type="void"/>
       </method>
+      <method name="ChangeValue" cname="gtk_adjustment_value_changed">
+        <return-type type="void"/>
+      </method>
       <constructor cname="gtk_adjustment_new">
         <parameters>
           <parameter type="gdouble" name="value"/>
@@ -9412,12 +9295,6 @@
       <field cname="shadow_type" type="gint16"/>
       <property name="ArrowType" cname="arrow_type" type="GtkArrowType" doc-string=" _(The direction the arrow should point)" readable="true" writeable="true"/>
       <property name="ShadowType" cname="shadow_type" type="GtkShadowType" doc-string=" _(Appearance of the shadow surrounding the arrow)" readable="true" writeable="true"/>
-      <constructor cname="gtk_arrow_new">
-        <parameters>
-          <parameter type="GtkArrowType" name="arrow_type"/>
-          <parameter type="GtkShadowType" name="shadow_type"/>
-        </parameters>
-      </constructor>
       <method name="Set" cname="gtk_arrow_set">
         <return-type type="void"/>
         <parameters>
@@ -9425,6 +9302,12 @@
           <parameter type="GtkShadowType" name="shadow_type"/>
         </parameters>
       </method>
+      <constructor cname="gtk_arrow_new">
+        <parameters>
+          <parameter type="GtkArrowType" name="arrow_type"/>
+          <parameter type="GtkShadowType" name="shadow_type"/>
+        </parameters>
+      </constructor>
     </object>
     <object name="AspectFrame" cname="GtkAspectFrame" parent="GtkFrame">
       <field cname="xalign" type="gfloat"/>
@@ -9436,15 +9319,6 @@
       <property name="Yalign" cname="yalign" type="gfloat" doc-string=" _(Y alignment of the child)" readable="true" writeable="true"/>
       <property name="Ratio" cname="ratio" type="gfloat" doc-string=" _(Aspect ratio if obey_child is FALSE)" readable="true" writeable="true"/>
       <property name="ObeyChild" cname="obey_child" type="gboolean" doc-string=" _(Force aspect ratio to match that of the frame's child)" readable="true" writeable="true"/>
-      <constructor cname="gtk_aspect_frame_new">
-        <parameters>
-          <parameter type="const-gchar*" name="label"/>
-          <parameter type="gfloat" name="xalign"/>
-          <parameter type="gfloat" name="yalign"/>
-          <parameter type="gfloat" name="ratio"/>
-          <parameter type="gboolean" name="obey_child"/>
-        </parameters>
-      </constructor>
       <method name="Set" cname="gtk_aspect_frame_set">
         <return-type type="void"/>
         <parameters>
@@ -9454,6 +9328,15 @@
           <parameter type="gboolean" name="obey_child"/>
         </parameters>
       </method>
+      <constructor cname="gtk_aspect_frame_new">
+        <parameters>
+          <parameter type="const-gchar*" name="label"/>
+          <parameter type="gfloat" name="xalign"/>
+          <parameter type="gfloat" name="yalign"/>
+          <parameter type="gfloat" name="ratio"/>
+          <parameter type="gboolean" name="obey_child"/>
+        </parameters>
+      </constructor>
     </object>
     <object name="Bin" cname="GtkBin" parent="GtkContainer">
       <field cname="child" type="GtkWidget*"/>
@@ -9488,6 +9371,16 @@
           <parameter type="guint" name="padding"/>
         </parameters>
       </method>
+      <method name="QueryChildPacking" cname="gtk_box_query_child_packing">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="gboolean*" name="expand"/>
+          <parameter type="gboolean*" name="fill"/>
+          <parameter type="guint*" name="padding"/>
+          <parameter type="GtkPackType*" name="pack_type"/>
+        </parameters>
+      </method>
       <method name="PackEndDefaults" cname="gtk_box_pack_end_defaults">
         <return-type type="void"/>
         <parameters>
@@ -9532,16 +9425,6 @@
       <method name="GetHomogeneous" cname="gtk_box_get_homogeneous">
         <return-type type="gboolean"/>
       </method>
-      <method name="QueryChildPacking" cname="gtk_box_query_child_packing">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="gboolean*" name="expand"/>
-          <parameter type="gboolean*" name="fill"/>
-          <parameter type="guint*" name="padding"/>
-          <parameter type="GtkPackType*" name="pack_type"/>
-        </parameters>
-      </method>
     </object>
     <object name="Button" cname="GtkButton" parent="GtkBin">
       <field cname="event_window" type="GdkWindow*"/>
@@ -9595,13 +9478,33 @@
           <parameter type="GtkButton*" name="button"/>
         </parameters>
       </signal>
+      <method name="SetUseUnderline" cname="gtk_button_set_use_underline">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="use_underline"/>
+        </parameters>
+      </method>
+      <method name="SetLabel" cname="gtk_button_set_label">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="const-gchar*" name="label"/>
+        </parameters>
+      </method>
       <constructor cname="gtk_button_new"/>
       <method name="GetUseStock" cname="gtk_button_get_use_stock">
         <return-type type="gboolean"/>
       </method>
+      <constructor cname="gtk_button_new_with_mnemonic" preferred="1">
+        <parameters>
+          <parameter type="const-gchar*" name="label"/>
+        </parameters>
+      </constructor>
       <method name="GetLabel" cname="gtk_button_get_label">
         <return-type type="const-gchar*"/>
       </method>
+      <method name="GetUseUnderline" cname="gtk_button_get_use_underline">
+        <return-type type="gboolean"/>
+      </method>
       <method name="SetRelief" cname="gtk_button_set_relief">
         <return-type type="void"/>
         <parameters>
@@ -9614,40 +9517,14 @@
       <method name="Enter" cname="gtk_button_enter">
         <return-type type="void"/>
       </method>
+      <method name="Click" cname="gtk_button_clicked">
+        <return-type type="void"/>
+      </method>
       <constructor cname="gtk_button_new_with_label">
         <parameters>
           <parameter type="const-gchar*" name="label"/>
         </parameters>
       </constructor>
-      <method name="SetUseStock" cname="gtk_button_set_use_stock">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="use_stock"/>
-        </parameters>
-      </method>
-      <method name="SetUseUnderline" cname="gtk_button_set_use_underline">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="use_underline"/>
-        </parameters>
-      </method>
-      <method name="SetLabel" cname="gtk_button_set_label">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-gchar*" name="label"/>
-        </parameters>
-      </method>
-      <constructor cname="gtk_button_new_with_mnemonic" preferred="1">
-        <parameters>
-          <parameter type="const-gchar*" name="label"/>
-        </parameters>
-      </constructor>
-      <method name="GetUseUnderline" cname="gtk_button_get_use_underline">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="Click" cname="gtk_button_clicked">
-        <return-type type="void"/>
-      </method>
       <constructor cname="gtk_button_new_from_stock">
         <parameters>
           <parameter type="const-gchar*" name="stock_id"/>
@@ -9659,6 +9536,12 @@
       <method name="GetRelief" cname="gtk_button_get_relief">
         <return-type type="GtkReliefStyle"/>
       </method>
+      <method name="SetUseStock" cname="gtk_button_set_use_stock">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="use_stock"/>
+        </parameters>
+      </method>
       <method name="Press" cname="gtk_button_pressed">
         <return-type type="void"/>
       </method>
@@ -9670,9 +9553,6 @@
       <field cname="child_ipad_y" type="gint"/>
       <field cname="layout_style" type="GtkButtonBoxStyle"/>
       <property name="LayoutStyle" cname="layout_style" type="GtkButtonBoxStyle" doc-string=" _(How to layout the buttons in the box. Possible values are default, spread, edge, start and end)" readable="true" writeable="true"/>
-      <method name="GetLayout" cname="gtk_button_box_get_layout">
-        <return-type type="GtkButtonBoxStyle"/>
-      </method>
       <method name="SetLayout" cname="gtk_button_box_set_layout">
         <return-type type="void"/>
         <parameters>
@@ -9686,6 +9566,9 @@
           <parameter type="gboolean" name="is_secondary"/>
         </parameters>
       </method>
+      <method name="GetLayout" cname="gtk_button_box_get_layout">
+        <return-type type="GtkButtonBoxStyle"/>
+      </method>
     </object>
     <object name="Calendar" cname="GtkCalendar" parent="GtkWidget">
       <field cname="header_style" type="GtkStyle*"/>
@@ -9785,18 +9668,6 @@
           <parameter type="guint*" name="day"/>
         </parameters>
       </method>
-      <method name="DisplayOptions" cname="gtk_calendar_display_options">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCalendarDisplayOptions" name="flags"/>
-        </parameters>
-      </method>
-      <method name="SelectDay" cname="gtk_calendar_select_day">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="guint" name="day"/>
-        </parameters>
-      </method>
       <method name="SelectMonth" cname="gtk_calendar_select_month">
         <return-type type="gboolean"/>
         <parameters>
@@ -9804,6 +9675,12 @@
           <parameter type="guint" name="year"/>
         </parameters>
       </method>
+      <method name="DisplayOptions" cname="gtk_calendar_display_options">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkCalendarDisplayOptions" name="flags"/>
+        </parameters>
+      </method>
       <method name="Thaw" cname="gtk_calendar_thaw">
         <return-type type="void"/>
       </method>
@@ -9819,6 +9696,12 @@
           <parameter type="guint" name="day"/>
         </parameters>
       </method>
+      <method name="SelectDay" cname="gtk_calendar_select_day">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="guint" name="day"/>
+        </parameters>
+      </method>
       <method name="ClearMarks" cname="gtk_calendar_clear_marks">
         <return-type type="void"/>
       </method>
@@ -9873,17 +9756,6 @@
           <parameter type="gint*" name="height"/>
         </parameters>
       </method>
-      <method name="GetSize" cname="gtk_cell_renderer_get_size">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="GdkRectangle*" name="cell_area"/>
-          <parameter type="gint*" name="x_offset"/>
-          <parameter type="gint*" name="y_offset"/>
-          <parameter type="gint*" name="width"/>
-          <parameter type="gint*" name="height"/>
-        </parameters>
-      </method>
       <method name="Render" cname="gtk_cell_renderer_render">
         <return-type type="void"/>
         <parameters>
@@ -9902,6 +9774,17 @@
           <parameter type="gint" name="height"/>
         </parameters>
       </method>
+      <method name="GetSize" cname="gtk_cell_renderer_get_size">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="GdkRectangle*" name="cell_area"/>
+          <parameter type="gint*" name="x_offset"/>
+          <parameter type="gint*" name="y_offset"/>
+          <parameter type="gint*" name="width"/>
+          <parameter type="gint*" name="height"/>
+        </parameters>
+      </method>
     </object>
     <object name="CellRendererPixbuf" cname="GtkCellRendererPixbuf" parent="GtkCellRenderer">
       <field cname="pixbuf" type="GdkPixbuf*"/>
@@ -9983,6 +9866,12 @@
           <parameter type="const-gchar*" name="path"/>
         </parameters>
       </signal>
+      <method name="SetActive" cname="gtk_cell_renderer_toggle_set_active">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="setting"/>
+        </parameters>
+      </method>
       <method name="GetRadio" cname="gtk_cell_renderer_toggle_get_radio">
         <return-type type="gboolean"/>
       </method>
@@ -9996,20 +9885,14 @@
           <parameter type="gboolean" name="radio"/>
         </parameters>
       </method>
-      <method name="SetActive" cname="gtk_cell_renderer_toggle_set_active">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="setting"/>
-        </parameters>
-      </method>
     </object>
     <object name="CheckButton" cname="GtkCheckButton" parent="GtkToggleButton">
-      <constructor cname="gtk_check_button_new"/>
       <constructor cname="gtk_check_button_new_with_label">
         <parameters>
           <parameter type="const-gchar*" name="label"/>
         </parameters>
       </constructor>
+      <constructor cname="gtk_check_button_new"/>
       <constructor cname="gtk_check_button_new_with_mnemonic" preferred="1">
         <parameters>
           <parameter type="const-gchar*" name="label"/>
@@ -10028,6 +9911,9 @@
           <parameter type="GtkCheckMenuItem*" name="check_menu_item"/>
         </parameters>
       </signal>
+      <method name="Toggle" cname="gtk_check_menu_item_toggled">
+        <return-type type="void"/>
+      </method>
       <constructor cname="gtk_check_menu_item_new"/>
       <method name="SetInconsistent" cname="gtk_check_menu_item_set_inconsistent">
         <return-type type="void"/>
@@ -10051,9 +9937,6 @@
           <parameter type="const-gchar*" name="label"/>
         </parameters>
       </constructor>
-      <method name="Toggle" cname="gtk_check_menu_item_toggled">
-        <return-type type="void"/>
-      </method>
       <method name="GetInconsistent" cname="gtk_check_menu_item_get_inconsistent">
         <return-type type="gboolean"/>
       </method>
@@ -10061,627 +9944,6 @@
         <return-type type="gboolean"/>
       </method>
     </object>
-    <object name="CList" cname="GtkCList" parent="GtkContainer">
-      <field cname="flags" type="guint16"/>
-      <field cname="row_mem_chunk" type="GMemChunk*"/>
-      <field cname="cell_mem_chunk" type="GMemChunk*"/>
-      <field cname="freeze_count" type="guint"/>
-      <field cname="internal_allocation" type="GdkRectangle"/>
-      <field cname="rows" type="gint"/>
-      <field cname="row_height" type="gint"/>
-      <field cname="row_list" type="GList*"/>
-      <field cname="row_list_end" type="GList*"/>
-      <field cname="columns" type="gint"/>
-      <field cname="column_title_area" type="GdkRectangle"/>
-      <field cname="title_window" type="GdkWindow*"/>
-      <field cname="column" type="GtkCListColumn*"/>
-      <field cname="clist_window" type="GdkWindow*"/>
-      <field cname="clist_window_width" type="gint"/>
-      <field cname="clist_window_height" type="gint"/>
-      <field cname="hoffset" type="gint"/>
-      <field cname="voffset" type="gint"/>
-      <field cname="shadow_type" type="GtkShadowType"/>
-      <field cname="selection_mode" type="GtkSelectionMode"/>
-      <field cname="selection" type="GList*"/>
-      <field cname="selection_end" type="GList*"/>
-      <field cname="undo_selection" type="GList*"/>
-      <field cname="undo_unselection" type="GList*"/>
-      <field cname="undo_anchor" type="gint"/>
-      <field cname="button_actions" array_len="5" type="guint8"/>
-      <field cname="drag_button" type="guint8"/>
-      <field cname="click_cell" type="GtkCListCellInfo"/>
-      <field cname="hadjustment" type="GtkAdjustment*"/>
-      <field cname="vadjustment" type="GtkAdjustment*"/>
-      <field cname="xor_gc" type="GdkGC*"/>
-      <field cname="fg_gc" type="GdkGC*"/>
-      <field cname="bg_gc" type="GdkGC*"/>
-      <field cname="cursor_drag" type="GdkCursor*"/>
-      <field cname="x_drag" type="gint"/>
-      <field cname="focus_row" type="gint"/>
-      <field cname="focus_header_column" type="gint"/>
-      <field cname="anchor" type="gint"/>
-      <field cname="anchor_state" type="GtkStateType"/>
-      <field cname="drag_pos" type="gint"/>
-      <field cname="htimer" type="gint"/>
-      <field cname="vtimer" type="gint"/>
-      <field cname="sort_type" type="GtkSortType"/>
-      <field cname="compare" type="GtkCListCompareFunc"/>
-      <field cname="sort_column" type="gint"/>
-      <field cname="drag_highlight_row" type="gint"/>
-      <field cname="drag_highlight_pos" type="GtkCListDragPos"/>
-      <signal name="SetScrollAdjustments" cname="set_scroll_adjustments" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCList*" name="clist"/>
-          <parameter type="GtkAdjustment*" name="hadjustment"/>
-          <parameter type="GtkAdjustment*" name="vadjustment"/>
-        </parameters>
-      </signal>
-      <signal name="RowSelected" cname="select_row" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCList*" name="clist"/>
-          <parameter type="gint" name="row"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="GdkEvent*" name="event"/>
-        </parameters>
-      </signal>
-      <signal name="RowUnselected" cname="unselect_row" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCList*" name="clist"/>
-          <parameter type="gint" name="row"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="GdkEvent*" name="event"/>
-        </parameters>
-      </signal>
-      <signal name="RowMoved" cname="row_move" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCList*" name="clist"/>
-          <parameter type="gint" name="source_row"/>
-          <parameter type="gint" name="dest_row"/>
-        </parameters>
-      </signal>
-      <signal name="ClickColumn" cname="click_column" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCList*" name="clist"/>
-          <parameter type="gint" name="column"/>
-        </parameters>
-      </signal>
-      <signal name="ResizeColumn" cname="resize_column" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCList*" name="clist"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="gint" name="width"/>
-        </parameters>
-      </signal>
-      <signal name="ToggleFocusRow" cname="toggle_focus_row" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCList*" name="clist"/>
-        </parameters>
-      </signal>
-      <signal name="AllSelected" cname="select_all" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCList*" name="clist"/>
-        </parameters>
-      </signal>
-      <signal name="AllUnselected" cname="unselect_all" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCList*" name="clist"/>
-        </parameters>
-      </signal>
-      <signal name="SelectionUndone" cname="undo_selection" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCList*" name="clist"/>
-        </parameters>
-      </signal>
-      <signal name="StartSelection" cname="start_selection" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCList*" name="clist"/>
-        </parameters>
-      </signal>
-      <signal name="EndSelection" cname="end_selection" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCList*" name="clist"/>
-        </parameters>
-      </signal>
-      <signal name="ToggleAddMode" cname="toggle_add_mode" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCList*" name="clist"/>
-        </parameters>
-      </signal>
-      <signal name="ExtendSelection" cname="extend_selection" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCList*" name="clist"/>
-          <parameter type="GtkScrollType" name="scroll_type"/>
-          <parameter type="gfloat" name="position"/>
-          <parameter type="gboolean" name="auto_start_selection"/>
-        </parameters>
-      </signal>
-      <signal name="ScrollVertical" cname="scroll_vertical" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCList*" name="clist"/>
-          <parameter type="GtkScrollType" name="scroll_type"/>
-          <parameter type="gfloat" name="position"/>
-        </parameters>
-      </signal>
-      <signal name="ScrollHorizontal" cname="scroll_horizontal" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCList*" name="clist"/>
-          <parameter type="GtkScrollType" name="scroll_type"/>
-          <parameter type="gfloat" name="position"/>
-        </parameters>
-      </signal>
-      <signal name="AbortColumnResize" cname="abort_column_resize" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCList*" name="clist"/>
-        </parameters>
-      </signal>
-      <method name="GetPixmap" cname="gtk_clist_get_pixmap">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="GdkPixmap**" name="pixmap"/>
-          <parameter type="GdkBitmap**" name="mask"/>
-        </parameters>
-      </method>
-      <method name="SetColumnWidget" cname="gtk_clist_set_column_widget">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="column"/>
-          <parameter type="GtkWidget*" name="widget"/>
-        </parameters>
-      </method>
-      <method name="GetHadjustment" cname="gtk_clist_get_hadjustment">
-        <return-type type="GtkAdjustment*"/>
-      </method>
-      <method name="ColumnTitlesActive" cname="gtk_clist_column_titles_active">
-        <return-type type="void"/>
-      </method>
-      <method name="SetForeground" cname="gtk_clist_set_foreground">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-          <parameter type="GdkColor*" name="color"/>
-        </parameters>
-      </method>
-      <method name="SetRowData" cname="gtk_clist_set_row_data">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-          <parameter type="gpointer" name="data"/>
-        </parameters>
-      </method>
-      <method name="SelectRow" cname="gtk_clist_select_row">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-          <parameter type="gint" name="column"/>
-        </parameters>
-      </method>
-      <method name="SetColumnWidth" cname="gtk_clist_set_column_width">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="column"/>
-          <parameter type="gint" name="width"/>
-        </parameters>
-      </method>
-      <method name="SetColumnJustification" cname="gtk_clist_set_column_justification">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="column"/>
-          <parameter type="GtkJustification" name="justification"/>
-        </parameters>
-      </method>
-      <method name="SetColumnVisibility" cname="gtk_clist_set_column_visibility">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="column"/>
-          <parameter type="gboolean" name="visible"/>
-        </parameters>
-      </method>
-      <method name="SetCellStyle" cname="gtk_clist_set_cell_style">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="GtkStyle*" name="style"/>
-        </parameters>
-      </method>
-      <method name="GetColumnWidget" cname="gtk_clist_get_column_widget">
-        <return-type type="GtkWidget*"/>
-        <parameters>
-          <parameter type="gint" name="column"/>
-        </parameters>
-      </method>
-      <method name="SetReorderable" cname="gtk_clist_set_reorderable">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="reorderable"/>
-        </parameters>
-      </method>
-      <method name="SetPixmap" cname="gtk_clist_set_pixmap">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="GdkPixmap*" name="pixmap"/>
-          <parameter type="GdkBitmap*" name="mask"/>
-        </parameters>
-      </method>
-      <method name="ColumnTitlesPassive" cname="gtk_clist_column_titles_passive">
-        <return-type type="void"/>
-      </method>
-      <method name="SetSortType" cname="gtk_clist_set_sort_type">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkSortType" name="sort_type"/>
-        </parameters>
-      </method>
-      <method name="SetColumnMinWidth" cname="gtk_clist_set_column_min_width">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="column"/>
-          <parameter type="gint" name="min_width"/>
-        </parameters>
-      </method>
-      <method name="GetRowStyle" cname="gtk_clist_get_row_style">
-        <return-type type="GtkStyle*"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-        </parameters>
-      </method>
-      <method name="UnselectRow" cname="gtk_clist_unselect_row">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-          <parameter type="gint" name="column"/>
-        </parameters>
-      </method>
-      <method name="SetSelectable" cname="gtk_clist_set_selectable">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-          <parameter type="gboolean" name="selectable"/>
-        </parameters>
-      </method>
-      <method name="SetText" cname="gtk_clist_set_text">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="const-gchar*" name="text"/>
-        </parameters>
-      </method>
-      <method name="Prepend" cname="gtk_clist_prepend">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="gchar*" array="true" name="text"/>
-        </parameters>
-      </method>
-      <method name="SetCompareFunc" cname="gtk_clist_set_compare_func">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCListCompareFunc" name="cmp_func"/>
-        </parameters>
-      </method>
-      <constructor cname="gtk_clist_new_with_titles">
-        <parameters>
-          <parameter type="gint" name="columns"/>
-          <parameter type="gchar*" array="true" name="titles"/>
-        </parameters>
-      </constructor>
-      <method name="SetRowHeight" cname="gtk_clist_set_row_height">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="guint" name="height"/>
-        </parameters>
-      </method>
-      <method name="ColumnTitleActive" cname="gtk_clist_column_title_active">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="column"/>
-        </parameters>
-      </method>
-      <method name="UndoSelection" cname="gtk_clist_undo_selection">
-        <return-type type="void"/>
-      </method>
-      <method name="SetSelectionMode" cname="gtk_clist_set_selection_mode">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkSelectionMode" name="mode"/>
-        </parameters>
-      </method>
-      <method name="SetShadowType" cname="gtk_clist_set_shadow_type">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkShadowType" name="type"/>
-        </parameters>
-      </method>
-      <method name="GetColumnTitle" cname="gtk_clist_get_column_title">
-        <return-type type="gchar*"/>
-        <parameters>
-          <parameter type="gint" name="column"/>
-        </parameters>
-      </method>
-      <method name="SelectAll" cname="gtk_clist_select_all">
-        <return-type type="void"/>
-      </method>
-      <method name="SetShift" cname="gtk_clist_set_shift">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="gint" name="vertical"/>
-          <parameter type="gint" name="horizontal"/>
-        </parameters>
-      </method>
-      <method name="Insert" cname="gtk_clist_insert">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-          <parameter type="gchar*" array="true" name="text"/>
-        </parameters>
-      </method>
-      <method name="ColumnTitlePassive" cname="gtk_clist_column_title_passive">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="column"/>
-        </parameters>
-      </method>
-      <method name="Append" cname="gtk_clist_append">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="gchar*" array="true" name="text"/>
-        </parameters>
-      </method>
-      <method name="SetVadjustment" cname="gtk_clist_set_vadjustment">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment"/>
-        </parameters>
-      </method>
-      <method name="ColumnTitlesHide" cname="gtk_clist_column_titles_hide">
-        <return-type type="void"/>
-      </method>
-      <method name="SetColumnAutoResize" cname="gtk_clist_set_column_auto_resize">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="column"/>
-          <parameter type="gboolean" name="auto_resize"/>
-        </parameters>
-      </method>
-      <method name="GetSelectionInfo" cname="gtk_clist_get_selection_info">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint*" name="row"/>
-          <parameter type="gint*" name="column"/>
-        </parameters>
-      </method>
-      <method name="SetColumnResizeable" cname="gtk_clist_set_column_resizeable">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="column"/>
-          <parameter type="gboolean" name="resizeable"/>
-        </parameters>
-      </method>
-      <method name="GetVadjustment" cname="gtk_clist_get_vadjustment">
-        <return-type type="GtkAdjustment*"/>
-      </method>
-      <method name="UnselectAll" cname="gtk_clist_unselect_all">
-        <return-type type="void"/>
-      </method>
-      <method name="FindRowFromData" cname="gtk_clist_find_row_from_data">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="gpointer" name="data"/>
-        </parameters>
-      </method>
-      <method name="GetCellStyle" cname="gtk_clist_get_cell_style">
-        <return-type type="GtkStyle*"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-          <parameter type="gint" name="column"/>
-        </parameters>
-      </method>
-      <method name="SetRowStyle" cname="gtk_clist_set_row_style">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-          <parameter type="GtkStyle*" name="style"/>
-        </parameters>
-      </method>
-      <method name="OptimalColumnWidth" cname="gtk_clist_optimal_column_width">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="gint" name="column"/>
-        </parameters>
-      </method>
-      <method name="GetPixtext" cname="gtk_clist_get_pixtext">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="gchar**" name="text"/>
-          <parameter type="guint8*" name="spacing"/>
-          <parameter type="GdkPixmap**" name="pixmap"/>
-          <parameter type="GdkBitmap**" name="mask"/>
-        </parameters>
-      </method>
-      <method name="Moveto" cname="gtk_clist_moveto">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="gfloat" name="row_align"/>
-          <parameter type="gfloat" name="col_align"/>
-        </parameters>
-      </method>
-      <method name="GetText" cname="gtk_clist_get_text">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="gchar**" name="text"/>
-        </parameters>
-      </method>
-      <method name="SetButtonActions" cname="gtk_clist_set_button_actions">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="guint" name="button"/>
-          <parameter type="guint8" name="button_actions"/>
-        </parameters>
-      </method>
-      <method name="SetColumnMaxWidth" cname="gtk_clist_set_column_max_width">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="column"/>
-          <parameter type="gint" name="max_width"/>
-        </parameters>
-      </method>
-      <method name="SetColumnTitle" cname="gtk_clist_set_column_title">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="column"/>
-          <parameter type="const-gchar*" name="title"/>
-        </parameters>
-      </method>
-      <method name="SwapRows" cname="gtk_clist_swap_rows">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="row1"/>
-          <parameter type="gint" name="row2"/>
-        </parameters>
-      </method>
-      <method name="GetSelectable" cname="gtk_clist_get_selectable">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-        </parameters>
-      </method>
-      <method name="GetCellType" cname="gtk_clist_get_cell_type">
-        <return-type type="GtkCellType"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-          <parameter type="gint" name="column"/>
-        </parameters>
-      </method>
-      <method name="Remove" cname="gtk_clist_remove">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-        </parameters>
-      </method>
-      <method name="Clear" cname="gtk_clist_clear">
-        <return-type type="void"/>
-      </method>
-      <method name="Freeze" cname="gtk_clist_freeze">
-        <return-type type="void"/>
-      </method>
-      <method name="Thaw" cname="gtk_clist_thaw">
-        <return-type type="void"/>
-      </method>
-      <method name="ColumnsAutosize" cname="gtk_clist_columns_autosize">
-        <return-type type="gint"/>
-      </method>
-      <method name="Sort" cname="gtk_clist_sort">
-        <return-type type="void"/>
-      </method>
-      <method name="ColumnTitlesShow" cname="gtk_clist_column_titles_show">
-        <return-type type="void"/>
-      </method>
-      <method name="SetPixtext" cname="gtk_clist_set_pixtext">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="const-gchar*" name="text"/>
-          <parameter type="guint8" name="spacing"/>
-          <parameter type="GdkPixmap*" name="pixmap"/>
-          <parameter type="GdkBitmap*" name="mask"/>
-        </parameters>
-      </method>
-      <method name="SetRowDataFull" cname="gtk_clist_set_row_data_full">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-          <parameter type="gpointer" name="data"/>
-          <parameter type="GtkDestroyNotify" name="destroy"/>
-        </parameters>
-      </method>
-      <method name="GetRowData" cname="gtk_clist_get_row_data">
-        <return-type type="gpointer"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-        </parameters>
-      </method>
-      <method name="SetBackground" cname="gtk_clist_set_background">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-          <parameter type="GdkColor*" name="color"/>
-        </parameters>
-      </method>
-      <constructor cname="gtk_clist_new">
-        <parameters>
-          <parameter type="gint" name="columns"/>
-        </parameters>
-      </constructor>
-      <method name="RowIsVisible" cname="gtk_clist_row_is_visible">
-        <return-type type="GtkVisibility"/>
-        <parameters>
-          <parameter type="gint" name="row"/>
-        </parameters>
-      </method>
-      <method name="SetHadjustment" cname="gtk_clist_set_hadjustment">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment"/>
-        </parameters>
-      </method>
-      <method name="SetSortColumn" cname="gtk_clist_set_sort_column">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="column"/>
-        </parameters>
-      </method>
-      <method name="SetUseDragIcons" cname="gtk_clist_set_use_drag_icons">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="use_icons"/>
-        </parameters>
-      </method>
-      <method name="SetAutoSort" cname="gtk_clist_set_auto_sort">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="auto_sort"/>
-        </parameters>
-      </method>
-      <method name="RowMove" cname="gtk_clist_row_move">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="source_row"/>
-          <parameter type="gint" name="dest_row"/>
-        </parameters>
-      </method>
-    </object>
     <object name="ColorSelection" cname="GtkColorSelection" parent="GtkVBox">
       <field cname="private_data" type="gpointer"/>
       <property name="HasOpacityControl" cname="has_opacity_control" type="gboolean" doc-string=" _(Whether the color selector should allow setting opacity)" readable="true" writeable="true"/>
@@ -10694,12 +9956,24 @@
           <parameter type="GtkColorSelection*" name="color_selection"/>
         </parameters>
       </signal>
+      <method name="IsAdjusting" cname="gtk_color_selection_is_adjusting">
+        <return-type type="gboolean"/>
+      </method>
+      <method name="GetHasPalette" cname="gtk_color_selection_get_has_palette">
+        <return-type type="gboolean"/>
+      </method>
       <method name="SetPreviousColor" cname="gtk_color_selection_set_previous_color">
         <return-type type="void"/>
         <parameters>
           <parameter type="GdkColor*" name="color"/>
         </parameters>
       </method>
+      <method name="GetCurrentColor" cname="gtk_color_selection_get_current_color">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdkColor*" name="color"/>
+        </parameters>
+      </method>
       <method name="SetHasOpacityControl" cname="gtk_color_selection_set_has_opacity_control">
         <return-type type="void"/>
         <parameters>
@@ -10712,7 +9986,19 @@
           <parameter type="guint16" name="alpha"/>
         </parameters>
       </method>
+      <method name="GetPreviousColor" cname="gtk_color_selection_get_previous_color">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdkColor*" name="color"/>
+        </parameters>
+      </method>
       <constructor cname="gtk_color_selection_new"/>
+      <method name="SetPreviousAlpha" cname="gtk_color_selection_set_previous_alpha">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="guint16" name="alpha"/>
+        </parameters>
+      </method>
       <method name="GetCurrentAlpha" cname="gtk_color_selection_get_current_alpha">
         <return-type type="guint16"/>
       </method>
@@ -10734,30 +10020,6 @@
           <parameter type="gboolean" name="has_palette"/>
         </parameters>
       </method>
-      <method name="IsAdjusting" cname="gtk_color_selection_is_adjusting">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="GetHasPalette" cname="gtk_color_selection_get_has_palette">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="GetCurrentColor" cname="gtk_color_selection_get_current_color">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdkColor*" name="color"/>
-        </parameters>
-      </method>
-      <method name="GetPreviousColor" cname="gtk_color_selection_get_previous_color">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdkColor*" name="color"/>
-        </parameters>
-      </method>
-      <method name="SetPreviousAlpha" cname="gtk_color_selection_set_previous_alpha">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="guint16" name="alpha"/>
-        </parameters>
-      </method>
     </object>
     <object name="ColorSelectionDialog" cname="GtkColorSelectionDialog" parent="GtkDialog">
       <field cname="colorsel" type="GtkWidget*"/>
@@ -10790,6 +10052,19 @@
       <property name="CaseSensitive" cname="case_sensitive" type="gboolean" doc-string=" _(Whether list item matching is case sensitive)" readable="true" writeable="true"/>
       <property name="AllowEmpty" cname="allow_empty" type="gboolean" doc-string=" _(Whether an empty value may be entered in this field)" readable="true" writeable="true"/>
       <property name="ValueInList" cname="value_in_list" type="gboolean" doc-string=" _(Whether entered values must already be present in the list)" readable="true" writeable="true"/>
+      <method name="SetItemString" cname="gtk_combo_set_item_string">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkItem*" name="item"/>
+          <parameter type="const-gchar*" name="item_value"/>
+        </parameters>
+      </method>
+      <method name="SetUseArrows" cname="gtk_combo_set_use_arrows">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="val"/>
+        </parameters>
+      </method>
       <constructor cname="gtk_combo_new"/>
       <method name="DisableActivate" cname="gtk_combo_disable_activate">
         <return-type type="void"/>
@@ -10807,19 +10082,6 @@
           <parameter type="gboolean" name="ok_if_empty"/>
         </parameters>
       </method>
-      <method name="SetItemString" cname="gtk_combo_set_item_string">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkItem*" name="item"/>
-          <parameter type="const-gchar*" name="item_value"/>
-        </parameters>
-      </method>
-      <method name="SetUseArrows" cname="gtk_combo_set_use_arrows">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="val"/>
-        </parameters>
-      </method>
       <method name="SetPopdownStrings" cname="gtk_combo_set_popdown_strings">
         <return-type type="void"/>
         <parameters>
@@ -10870,91 +10132,12 @@
           <parameter type="GtkWidget*" name="widget"/>
         </parameters>
       </signal>
-      <method name="ChildSetValist" cname="gtk_container_child_set_valist">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="const-gchar*" name="first_property_name"/>
-          <parameter type="va_list" name="var_args"/>
-        </parameters>
-      </method>
-      <method name="ChildGet" cname="gtk_container_child_get">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="const-gchar*" name="first_prop_name"/>
-          <parameter type="c" name=""/>
-        </parameters>
-      </method>
-      <method name="SetFocusVadjustment" cname="gtk_container_set_focus_vadjustment">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment"/>
-        </parameters>
-      </method>
-      <method name="ChildGetProperty" cname="gtk_container_child_get_property">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="const-gchar*" name="property_name"/>
-          <parameter type="GValue*" name="value"/>
-        </parameters>
-      </method>
-      <method name="Forall" cname="gtk_container_forall">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCallback" name="callback"/>
-          <parameter type="gpointer" name="callback_data"/>
-        </parameters>
-      </method>
-      <method name="GetBorderWidth" cname="gtk_container_get_border_width">
-        <return-type type="guint"/>
-      </method>
-      <method name="GetFocusVadjustment" cname="gtk_container_get_focus_vadjustment">
-        <return-type type="GtkAdjustment*"/>
-      </method>
-      <method name="PropagateExpose" cname="gtk_container_propagate_expose">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="GdkEventExpose*" name="event"/>
-        </parameters>
-      </method>
-      <method name="ChildSet" cname="gtk_container_child_set">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="const-gchar*" name="first_prop_name"/>
-          <parameter type="c" name=""/>
-        </parameters>
-      </method>
-      <method name="Foreach" cname="gtk_container_foreach">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCallback" name="callback"/>
-          <parameter type="gpointer" name="callback_data"/>
-        </parameters>
-      </method>
-      <method name="ChildSetProperty" cname="gtk_container_child_set_property">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="const-gchar*" name="property_name"/>
-          <parameter type="const-GValue*" name="value"/>
-        </parameters>
-      </method>
-      <method name="SetFocusChain" cname="gtk_container_set_focus_chain">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GList*" name="focusable_widgets"/>
-        </parameters>
-      </method>
       <method name="AddWithProperties" cname="gtk_container_add_with_properties">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkWidget*" name="widget"/>
           <parameter type="const-gchar*" name="first_prop_name"/>
-          <parameter type="c" name=""/>
+          <parameter type="c"/>
         </parameters>
       </method>
       <method name="CheckResize" cname="gtk_container_check_resize">
@@ -10969,12 +10152,34 @@
           <parameter type="GtkAdjustment*" name="adjustment"/>
         </parameters>
       </method>
+      <method name="ChildSetValist" cname="gtk_container_child_set_valist">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="const-gchar*" name="first_property_name"/>
+          <parameter type="va_list" name="var_args"/>
+        </parameters>
+      </method>
       <method name="Remove" cname="gtk_container_remove">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkWidget*" name="widget"/>
         </parameters>
       </method>
+      <method name="ChildGet" cname="gtk_container_child_get">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="const-gchar*" name="first_prop_name"/>
+          <parameter type="c"/>
+        </parameters>
+      </method>
+      <method name="SetFocusVadjustment" cname="gtk_container_set_focus_vadjustment">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkAdjustment*" name="adjustment"/>
+        </parameters>
+      </method>
       <method name="GetFocusChain" cname="gtk_container_get_focus_chain">
         <return-type type="gboolean"/>
         <parameters>
@@ -10999,9 +10204,24 @@
           <parameter type="GtkWidget*" name="child"/>
         </parameters>
       </method>
+      <method name="ChildGetProperty" cname="gtk_container_child_get_property">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="const-gchar*" name="property_name"/>
+          <parameter type="GValue*" name="value"/>
+        </parameters>
+      </method>
       <method name="UnsetFocusChain" cname="gtk_container_unset_focus_chain">
         <return-type type="void"/>
       </method>
+      <method name="Forall" cname="gtk_container_forall">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkCallback" name="callback"/>
+          <parameter type="gpointer" name="callback_data"/>
+        </parameters>
+      </method>
       <method name="ResizeChildren" cname="gtk_container_resize_children">
         <return-type type="void"/>
       </method>
@@ -11019,566 +10239,61 @@
           <parameter type="va_list" name="var_args"/>
         </parameters>
       </method>
+      <method name="GetBorderWidth" cname="gtk_container_get_border_width">
+        <return-type type="guint"/>
+      </method>
       <method name="SetReallocateRedraws" cname="gtk_container_set_reallocate_redraws">
         <return-type type="void"/>
         <parameters>
           <parameter type="gboolean" name="needs_redraws"/>
         </parameters>
       </method>
+      <method name="GetFocusVadjustment" cname="gtk_container_get_focus_vadjustment">
+        <return-type type="GtkAdjustment*"/>
+      </method>
       <method name="SetResizeMode" cname="gtk_container_set_resize_mode">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkResizeMode" name="resize_mode"/>
         </parameters>
       </method>
+      <method name="PropagateExpose" cname="gtk_container_propagate_expose">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="GdkEventExpose*" name="event"/>
+        </parameters>
+      </method>
+      <method name="ChildSet" cname="gtk_container_child_set">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="const-gchar*" name="first_prop_name"/>
+          <parameter type="c"/>
+        </parameters>
+      </method>
+      <method name="Foreach" cname="gtk_container_foreach">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkCallback" name="callback"/>
+          <parameter type="gpointer" name="callback_data"/>
+        </parameters>
+      </method>
+      <method name="ChildSetProperty" cname="gtk_container_child_set_property">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="const-gchar*" name="property_name"/>
+          <parameter type="const-GValue*" name="value"/>
+        </parameters>
+      </method>
       <method name="GetResizeMode" cname="gtk_container_get_resize_mode">
         <return-type type="GtkResizeMode"/>
       </method>
-    </object>
-    <object name="CTree" cname="GtkCTree" parent="GtkCList">
-      <field cname="lines_gc" type="GdkGC*"/>
-      <field cname="tree_indent" type="gint"/>
-      <field cname="tree_spacing" type="gint"/>
-      <field cname="tree_column" type="gint"/>
-      <field cname="line_style" bits="2" type="guint"/>
-      <field cname="expander_style" bits="2" type="guint"/>
-      <field cname="show_stub" bits="1" type="guint"/>
-      <field cname="drag_compare" type="GtkCTreeCompareDragFunc"/>
-      <signal name="TreeSelectRow" cname="tree_select_row" when="FIRST">
+      <method name="SetFocusChain" cname="gtk_container_set_focus_chain">
         <return-type type="void"/>
         <parameters>
-          <parameter type="GtkCTree*" name="ctree"/>
-          <parameter type="GtkCTreeNode*" name="row"/>
-          <parameter type="gint" name="column"/>
-        </parameters>
-      </signal>
-      <signal name="TreeUnselectRow" cname="tree_unselect_row" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTree*" name="ctree"/>
-          <parameter type="GtkCTreeNode*" name="row"/>
-          <parameter type="gint" name="column"/>
-        </parameters>
-      </signal>
-      <signal name="TreeExpand" cname="tree_expand" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTree*" name="ctree"/>
-          <parameter type="GtkCTreeNode*" name="node"/>
-        </parameters>
-      </signal>
-      <signal name="TreeCollapse" cname="tree_collapse" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTree*" name="ctree"/>
-          <parameter type="GtkCTreeNode*" name="node"/>
-        </parameters>
-      </signal>
-      <signal name="TreeMove" cname="tree_move" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTree*" name="ctree"/>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="GtkCTreeNode*" name="new_parent"/>
-          <parameter type="GtkCTreeNode*" name="new_sibling"/>
-        </parameters>
-      </signal>
-      <signal name="ChangeFocusRowExpansion" cname="change_focus_row_expansion" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTree*" name="ctree"/>
-          <parameter type="GtkCTreeExpansionType" name="action"/>
-        </parameters>
-      </signal>
-      <method name="SetLineStyle" cname="gtk_ctree_set_line_style">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeLineStyle" name="line_style"/>
-        </parameters>
-      </method>
-      <method name="RealSelectRecursive" cname="gtk_ctree_real_select_recursive">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gint" name="state"/>
-        </parameters>
-      </method>
-      <method name="FindAllByRowData" cname="gtk_ctree_find_all_by_row_data">
-        <return-type type="GList*"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gpointer" name="data"/>
-        </parameters>
-      </method>
-      <method name="NodeSetRowData" cname="gtk_ctree_node_set_row_data">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gpointer" name="data"/>
-        </parameters>
-      </method>
-      <method name="SetNodeInfo" cname="gtk_ctree_set_node_info">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="const-gchar*" name="text"/>
-          <parameter type="guint8" name="spacing"/>
-          <parameter type="GdkPixmap*" name="pixmap_closed"/>
-          <parameter type="GdkBitmap*" name="mask_closed"/>
-          <parameter type="GdkPixmap*" name="pixmap_opened"/>
-          <parameter type="GdkBitmap*" name="mask_opened"/>
-          <parameter type="gboolean" name="is_leaf"/>
-          <parameter type="gboolean" name="expanded"/>
-        </parameters>
-      </method>
-      <method name="NodeNth" cname="gtk_ctree_node_nth">
-        <return-type type="GtkCTreeNode*"/>
-        <parameters>
-          <parameter type="guint" name="row"/>
-        </parameters>
-      </method>
-      <method name="FindByRowData" cname="gtk_ctree_find_by_row_data">
-        <return-type type="GtkCTreeNode*"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gpointer" name="data"/>
-        </parameters>
-      </method>
-      <method name="SelectRecursive" cname="gtk_ctree_select_recursive">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-        </parameters>
-      </method>
-      <method name="ToggleExpansionRecursive" cname="gtk_ctree_toggle_expansion_recursive">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-        </parameters>
-      </method>
-      <method name="PostRecursiveToDepth" cname="gtk_ctree_post_recursive_to_depth">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gint" name="depth"/>
-          <parameter type="GtkCTreeFunc" name="func"/>
-          <parameter type="gpointer" name="data"/>
-        </parameters>
-      </method>
-      <method name="FindAllByRowDataCustom" cname="gtk_ctree_find_all_by_row_data_custom">
-        <return-type type="GList*"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gpointer" name="data"/>
-          <parameter type="GCompareFunc" name="func"/>
-        </parameters>
-      </method>
-      <method name="NodeSetRowDataFull" cname="gtk_ctree_node_set_row_data_full">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gpointer" name="data"/>
-          <parameter type="GtkDestroyNotify" name="destroy"/>
-        </parameters>
-      </method>
-      <method name="NodeGetPixmap" cname="gtk_ctree_node_get_pixmap">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="GdkPixmap**" name="pixmap"/>
-          <parameter type="GdkBitmap**" name="mask"/>
-        </parameters>
-      </method>
-      <method name="Find" cname="gtk_ctree_find">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="GtkCTreeNode*" name="child"/>
-        </parameters>
-      </method>
-      <method name="SetDragCompareFunc" cname="gtk_ctree_set_drag_compare_func">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeCompareDragFunc" name="cmp_func"/>
-        </parameters>
-      </method>
-      <method name="InsertGnode" cname="gtk_ctree_insert_gnode">
-        <return-type type="GtkCTreeNode*"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="parent"/>
-          <parameter type="GtkCTreeNode*" name="sibling"/>
-          <parameter type="GNode*" name="gnode"/>
-          <parameter type="GtkCTreeGNodeFunc" name="func"/>
-          <parameter type="gpointer" name="data"/>
-        </parameters>
-      </method>
-      <method name="InsertNode" cname="gtk_ctree_insert_node">
-        <return-type type="GtkCTreeNode*"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="parent"/>
-          <parameter type="GtkCTreeNode*" name="sibling"/>
-          <parameter type="gchar*" array="true" name="text"/>
-          <parameter type="guint8" name="spacing"/>
-          <parameter type="GdkPixmap*" name="pixmap_closed"/>
-          <parameter type="GdkBitmap*" name="mask_closed"/>
-          <parameter type="GdkPixmap*" name="pixmap_opened"/>
-          <parameter type="GdkBitmap*" name="mask_opened"/>
-          <parameter type="gboolean" name="is_leaf"/>
-          <parameter type="gboolean" name="expanded"/>
-        </parameters>
-      </method>
-      <method name="NodeGetCellStyle" cname="gtk_ctree_node_get_cell_style">
-        <return-type type="GtkStyle*"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gint" name="column"/>
-        </parameters>
-      </method>
-      <method name="Move" cname="gtk_ctree_move">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="GtkCTreeNode*" name="new_parent"/>
-          <parameter type="GtkCTreeNode*" name="new_sibling"/>
-        </parameters>
-      </method>
-      <method name="PreRecursiveToDepth" cname="gtk_ctree_pre_recursive_to_depth">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gint" name="depth"/>
-          <parameter type="GtkCTreeFunc" name="func"/>
-          <parameter type="gpointer" name="data"/>
-        </parameters>
-      </method>
-      <method name="SortRecursive" cname="gtk_ctree_sort_recursive">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-        </parameters>
-      </method>
-      <method name="Collapse" cname="gtk_ctree_collapse">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-        </parameters>
-      </method>
-      <method name="NodeGetSelectable" cname="gtk_ctree_node_get_selectable">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-        </parameters>
-      </method>
-      <method name="SetSpacing" cname="gtk_ctree_set_spacing">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="spacing"/>
-        </parameters>
-      </method>
-      <method name="Last" cname="gtk_ctree_last">
-        <return-type type="GtkCTreeNode*"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-        </parameters>
-      </method>
-      <method name="CollapseRecursive" cname="gtk_ctree_collapse_recursive">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-        </parameters>
-      </method>
-      <method name="Select" cname="gtk_ctree_select">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-        </parameters>
-      </method>
-      <method name="NodeGetRowStyle" cname="gtk_ctree_node_get_row_style">
-        <return-type type="GtkStyle*"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-        </parameters>
-      </method>
-      <method name="NodeSetShift" cname="gtk_ctree_node_set_shift">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="gint" name="vertical"/>
-          <parameter type="gint" name="horizontal"/>
-        </parameters>
-      </method>
-      <method name="PreRecursive" cname="gtk_ctree_pre_recursive">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="GtkCTreeFunc" name="func"/>
-          <parameter type="gpointer" name="data"/>
-        </parameters>
-      </method>
-      <method name="SetShowStub" cname="gtk_ctree_set_show_stub">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="show_stub"/>
-        </parameters>
-      </method>
-      <method name="ExportToGnode" cname="gtk_ctree_export_to_gnode">
-        <return-type type="GNode*"/>
-        <parameters>
-          <parameter type="GNode*" name="parent"/>
-          <parameter type="GNode*" name="sibling"/>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="GtkCTreeGNodeFunc" name="func"/>
-          <parameter type="gpointer" name="data"/>
-        </parameters>
-      </method>
-      <method name="NodeSetPixmap" cname="gtk_ctree_node_set_pixmap">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="GdkPixmap*" name="pixmap"/>
-          <parameter type="GdkBitmap*" name="mask"/>
-        </parameters>
-      </method>
-      <method name="NodeSetText" cname="gtk_ctree_node_set_text">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="const-gchar*" name="text"/>
-        </parameters>
-      </method>
-      <method name="NodeSetBackground" cname="gtk_ctree_node_set_background">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="GdkColor*" name="color"/>
-        </parameters>
-      </method>
-      <method name="CollapseToDepth" cname="gtk_ctree_collapse_to_depth">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gint" name="depth"/>
-        </parameters>
-      </method>
-      <method name="FindNodePtr" cname="gtk_ctree_find_node_ptr">
-        <return-type type="GtkCTreeNode*"/>
-        <parameters>
-          <parameter type="GtkCTreeRow*" name="ctree_row"/>
-        </parameters>
-      </method>
-      <method name="Unselect" cname="gtk_ctree_unselect">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-        </parameters>
-      </method>
-      <method name="ToggleExpansion" cname="gtk_ctree_toggle_expansion">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-        </parameters>
-      </method>
-      <method name="NodeMoveto" cname="gtk_ctree_node_moveto">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="gfloat" name="row_align"/>
-          <parameter type="gfloat" name="col_align"/>
-        </parameters>
-      </method>
-      <constructor cname="gtk_ctree_new">
-        <parameters>
-          <parameter type="gint" name="columns"/>
-          <parameter type="gint" name="tree_column"/>
-        </parameters>
-      </constructor>
-      <method name="RemoveNode" cname="gtk_ctree_remove_node">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-        </parameters>
-      </method>
-      <method name="NodeIsVisible" cname="gtk_ctree_node_is_visible">
-        <return-type type="GtkVisibility"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-        </parameters>
-      </method>
-      <method name="FindByRowDataCustom" cname="gtk_ctree_find_by_row_data_custom">
-        <return-type type="GtkCTreeNode*"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gpointer" name="data"/>
-          <parameter type="GCompareFunc" name="func"/>
-        </parameters>
-      </method>
-      <method name="PostRecursive" cname="gtk_ctree_post_recursive">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="GtkCTreeFunc" name="func"/>
-          <parameter type="gpointer" name="data"/>
-        </parameters>
-      </method>
-      <method name="NodeSetForeground" cname="gtk_ctree_node_set_foreground">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="GdkColor*" name="color"/>
-        </parameters>
-      </method>
-      <method name="NodeSetRowStyle" cname="gtk_ctree_node_set_row_style">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="GtkStyle*" name="style"/>
-        </parameters>
-      </method>
-      <method name="GetNodeInfo" cname="gtk_ctree_get_node_info">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gchar**" name="text"/>
-          <parameter type="guint8*" name="spacing"/>
-          <parameter type="GdkPixmap**" name="pixmap_closed"/>
-          <parameter type="GdkBitmap**" name="mask_closed"/>
-          <parameter type="GdkPixmap**" name="pixmap_opened"/>
-          <parameter type="GdkBitmap**" name="mask_opened"/>
-          <parameter type="gboolean*" name="is_leaf"/>
-          <parameter type="gboolean*" name="expanded"/>
-        </parameters>
-      </method>
-      <method name="NodeGetPixtext" cname="gtk_ctree_node_get_pixtext">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="gchar**" name="text"/>
-          <parameter type="guint8*" name="spacing"/>
-          <parameter type="GdkPixmap**" name="pixmap"/>
-          <parameter type="GdkBitmap**" name="mask"/>
-        </parameters>
-      </method>
-      <constructor cname="gtk_ctree_new_with_titles">
-        <parameters>
-          <parameter type="gint" name="columns"/>
-          <parameter type="gint" name="tree_column"/>
-          <parameter type="gchar*" array="true" name="titles"/>
-        </parameters>
-      </constructor>
-      <method name="NodeGetText" cname="gtk_ctree_node_get_text">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="gchar**" name="text"/>
-        </parameters>
-      </method>
-      <method name="NodeSetCellStyle" cname="gtk_ctree_node_set_cell_style">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="GtkStyle*" name="style"/>
-        </parameters>
-      </method>
-      <method name="SetExpanderStyle" cname="gtk_ctree_set_expander_style">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeExpanderStyle" name="expander_style"/>
-        </parameters>
-      </method>
-      <method name="NodeGetCellType" cname="gtk_ctree_node_get_cell_type">
-        <return-type type="GtkCellType"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gint" name="column"/>
-        </parameters>
-      </method>
-      <method name="IsViewable" cname="gtk_ctree_is_viewable">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-        </parameters>
-      </method>
-      <method name="IsHotSpot" cname="gtk_ctree_is_hot_spot">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-        </parameters>
-      </method>
-      <method name="NodeGetRowData" cname="gtk_ctree_node_get_row_data">
-        <return-type type="gpointer"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-        </parameters>
-      </method>
-      <method name="Expand" cname="gtk_ctree_expand">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-        </parameters>
-      </method>
-      <method name="SortNode" cname="gtk_ctree_sort_node">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-        </parameters>
-      </method>
-      <method name="NodeSetSelectable" cname="gtk_ctree_node_set_selectable">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gboolean" name="selectable"/>
-        </parameters>
-      </method>
-      <method name="IsAncestor" cname="gtk_ctree_is_ancestor">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="GtkCTreeNode*" name="child"/>
-        </parameters>
-      </method>
-      <method name="NodeSetPixtext" cname="gtk_ctree_node_set_pixtext">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="const-gchar*" name="text"/>
-          <parameter type="guint8" name="spacing"/>
-          <parameter type="GdkPixmap*" name="pixmap"/>
-          <parameter type="GdkBitmap*" name="mask"/>
-        </parameters>
-      </method>
-      <method name="SetIndent" cname="gtk_ctree_set_indent">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="indent"/>
-        </parameters>
-      </method>
-      <method name="ExpandToDepth" cname="gtk_ctree_expand_to_depth">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-          <parameter type="gint" name="depth"/>
-        </parameters>
-      </method>
-      <method name="UnselectRecursive" cname="gtk_ctree_unselect_recursive">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
-        </parameters>
-      </method>
-      <method name="ExpandRecursive" cname="gtk_ctree_expand_recursive">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCTreeNode*" name="node"/>
+          <parameter type="GList*" name="focusable_widgets"/>
         </parameters>
       </method>
     </object>
@@ -11666,30 +10381,13 @@
           <parameter type="GtkDialog*" name="dialog"/>
         </parameters>
       </signal>
-      <method name="Run" cname="gtk_dialog_run">
-        <return-type type="gint"/>
-      </method>
-      <method name="SetResponseSensitive" cname="gtk_dialog_set_response_sensitive">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="response_id"/>
-          <parameter type="gboolean" name="setting"/>
-        </parameters>
-      </method>
-      <method name="AddButton" cname="gtk_dialog_add_button">
-        <return-type type="GtkWidget*"/>
-        <parameters>
-          <parameter type="const-gchar*" name="button_text"/>
-          <parameter type="gint" name="response_id"/>
-        </parameters>
-      </method>
       <constructor cname="gtk_dialog_new_with_buttons">
         <parameters>
           <parameter type="const-gchar*" name="title"/>
           <parameter type="GtkWindow*" name="parent"/>
           <parameter type="GtkDialogFlags" name="flags"/>
           <parameter type="const-gchar*" name="first_button_text"/>
-          <parameter type="c" name=""/>
+          <parameter type="c"/>
         </parameters>
       </constructor>
       <method name="SetHasSeparator" cname="gtk_dialog_set_has_separator">
@@ -11698,12 +10396,22 @@
           <parameter type="gboolean" name="setting"/>
         </parameters>
       </method>
+      <method name="Run" cname="gtk_dialog_run">
+        <return-type type="gint"/>
+      </method>
       <method name="SetDefaultResponse" cname="gtk_dialog_set_default_response">
         <return-type type="void"/>
         <parameters>
           <parameter type="gint" name="response_id"/>
         </parameters>
       </method>
+      <method name="SetResponseSensitive" cname="gtk_dialog_set_response_sensitive">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="response_id"/>
+          <parameter type="gboolean" name="setting"/>
+        </parameters>
+      </method>
       <method name="Respond" cname="gtk_dialog_response">
         <return-type type="void"/>
         <parameters>
@@ -11725,7 +10433,14 @@
         <return-type type="void"/>
         <parameters>
           <parameter type="const-gchar*" name="first_button_text"/>
-          <parameter type="c" name=""/>
+          <parameter type="c"/>
+        </parameters>
+      </method>
+      <method name="AddButton" cname="gtk_dialog_add_button">
+        <return-type type="GtkWidget*"/>
+        <parameters>
+          <parameter type="const-gchar*" name="button_text"/>
+          <parameter type="gint" name="response_id"/>
         </parameters>
       </method>
     </object>
@@ -11847,6 +10562,9 @@
         <interface cname="GtkEditable"/>
         <interface cname="GtkCellEditable"/>
       </implements>
+      <method name="GetInvisibleChar" cname="gtk_entry_get_invisible_char">
+        <return-type type="gunichar"/>
+      </method>
       <method name="GetLayout" cname="gtk_entry_get_layout">
         <return-type type="PangoLayout*"/>
       </method>
@@ -11869,21 +10587,18 @@
           <parameter type="gboolean" name="setting"/>
         </parameters>
       </method>
-      <method name="GetActivatesDefault" cname="gtk_entry_get_activates_default">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="GetVisibility" cname="gtk_entry_get_visibility">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="GetInvisibleChar" cname="gtk_entry_get_invisible_char">
-        <return-type type="gunichar"/>
-      </method>
       <method name="SetMaxLength" cname="gtk_entry_set_max_length">
         <return-type type="void"/>
         <parameters>
           <parameter type="gint" name="max"/>
         </parameters>
       </method>
+      <method name="GetActivatesDefault" cname="gtk_entry_get_activates_default">
+        <return-type type="gboolean"/>
+      </method>
+      <method name="GetVisibility" cname="gtk_entry_get_visibility">
+        <return-type type="gboolean"/>
+      </method>
       <method name="SetWidthChars" cname="gtk_entry_set_width_chars">
         <return-type type="void"/>
         <parameters>
@@ -11960,18 +10675,6 @@
       <method name="GetSelectMultiple" cname="gtk_file_selection_get_select_multiple">
         <return-type type="gboolean"/>
       </method>
-      <method name="SetSelectMultiple" cname="gtk_file_selection_set_select_multiple">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="select_multiple"/>
-        </parameters>
-      </method>
-      <method name="Complete" cname="gtk_file_selection_complete">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-gchar*" name="pattern"/>
-        </parameters>
-      </method>
       <constructor cname="gtk_file_selection_new">
         <parameters>
           <parameter type="const-gchar*" name="title"/>
@@ -11980,9 +10683,21 @@
       <method name="GetFilename" cname="gtk_file_selection_get_filename">
         <return-type type="const-gchar*"/>
       </method>
+      <method name="SetSelectMultiple" cname="gtk_file_selection_set_select_multiple">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="select_multiple"/>
+        </parameters>
+      </method>
       <method name="GetSelections" cname="gtk_file_selection_get_selections">
         <return-type type="gchar**"/>
       </method>
+      <method name="Complete" cname="gtk_file_selection_complete">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="const-gchar*" name="pattern"/>
+        </parameters>
+      </method>
       <method name="ShowFileopButtons" cname="gtk_file_selection_show_fileop_buttons">
         <return-type type="void"/>
       </method>
@@ -11992,6 +10707,17 @@
     </object>
     <object name="Fixed" cname="GtkFixed" parent="GtkContainer">
       <field cname="children" type="GList*"/>
+      <method name="Put" cname="gtk_fixed_put">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="gint" name="x"/>
+          <parameter type="gint" name="y"/>
+        </parameters>
+      </method>
+      <method name="GetHasWindow" cname="gtk_fixed_get_has_window">
+        <return-type type="gboolean"/>
+      </method>
       <method name="SetHasWindow" cname="gtk_fixed_set_has_window">
         <return-type type="void"/>
         <parameters>
@@ -12006,17 +10732,6 @@
           <parameter type="gint" name="y"/>
         </parameters>
       </method>
-      <method name="Put" cname="gtk_fixed_put">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-        </parameters>
-      </method>
-      <method name="GetHasWindow" cname="gtk_fixed_get_has_window">
-        <return-type type="gboolean"/>
-      </method>
       <constructor cname="gtk_fixed_new"/>
     </object>
     <object name="FontSelection" cname="GtkFontSelection" parent="GtkVBox">
@@ -12043,19 +10758,19 @@
           <parameter type="const-gchar*" name="fontname"/>
         </parameters>
       </method>
+      <constructor cname="gtk_font_selection_new"/>
       <method name="GetPreviewText" cname="gtk_font_selection_get_preview_text">
         <return-type type="const-gchar*"/>
       </method>
+      <method name="GetFontName" cname="gtk_font_selection_get_font_name">
+        <return-type type="gchar*"/>
+      </method>
       <method name="SetPreviewText" cname="gtk_font_selection_set_preview_text">
         <return-type type="void"/>
         <parameters>
           <parameter type="const-gchar*" name="text"/>
         </parameters>
       </method>
-      <constructor cname="gtk_font_selection_new"/>
-      <method name="GetFontName" cname="gtk_font_selection_get_font_name">
-        <return-type type="gchar*"/>
-      </method>
     </object>
     <object name="FontSelectionDialog" cname="GtkFontSelectionDialog" parent="GtkDialog">
       <field cname="fontsel" type="GtkWidget*"/>
@@ -12074,6 +10789,12 @@
           <parameter type="const-gchar*" name="title"/>
         </parameters>
       </constructor>
+      <method name="SetFontName" cname="gtk_font_selection_dialog_set_font_name">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="const-gchar*" name="fontname"/>
+        </parameters>
+      </method>
       <method name="GetFontName" cname="gtk_font_selection_dialog_get_font_name">
         <return-type type="gchar*"/>
       </method>
@@ -12083,12 +10804,6 @@
           <parameter type="const-gchar*" name="text"/>
         </parameters>
       </method>
-      <method name="SetFontName" cname="gtk_font_selection_dialog_set_font_name">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="const-gchar*" name="fontname"/>
-        </parameters>
-      </method>
     </object>
     <object name="Frame" cname="GtkFrame" parent="GtkBin">
       <field cname="label_widget" type="GtkWidget*"/>
@@ -12108,14 +10823,6 @@
           <parameter type="GtkWidget*" name="label_widget"/>
         </parameters>
       </method>
-      <constructor cname="gtk_frame_new">
-        <parameters>
-          <parameter type="const-gchar*" name="label"/>
-        </parameters>
-      </constructor>
-      <method name="GetLabel" cname="gtk_frame_get_label">
-        <return-type type="const-gchar*"/>
-      </method>
       <method name="SetLabelAlign" cname="gtk_frame_set_label_align">
         <return-type type="void"/>
         <parameters>
@@ -12123,6 +10830,11 @@
           <parameter type="gfloat" name="yalign"/>
         </parameters>
       </method>
+      <constructor cname="gtk_frame_new">
+        <parameters>
+          <parameter type="const-gchar*" name="label"/>
+        </parameters>
+      </constructor>
       <method name="SetShadowType" cname="gtk_frame_set_shadow_type">
         <return-type type="void"/>
         <parameters>
@@ -12148,6 +10860,9 @@
       <method name="GetShadowType" cname="gtk_frame_get_shadow_type">
         <return-type type="GtkShadowType"/>
       </method>
+      <method name="GetLabel" cname="gtk_frame_get_label">
+        <return-type type="const-gchar*"/>
+      </method>
     </object>
     <object name="GammaCurve" cname="GtkGammaCurve" parent="GtkVBox">
       <field cname="table" type="GtkWidget*"/>
@@ -12202,12 +10917,6 @@
           <parameter type="GtkPositionType" name="position"/>
         </parameters>
       </method>
-      <method name="SetSnapEdge" cname="gtk_handle_box_set_snap_edge">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkPositionType" name="edge"/>
-        </parameters>
-      </method>
       <method name="SetShadowType" cname="gtk_handle_box_set_shadow_type">
         <return-type type="void"/>
         <parameters>
@@ -12215,6 +10924,12 @@
         </parameters>
       </method>
       <constructor cname="gtk_handle_box_new"/>
+      <method name="SetSnapEdge" cname="gtk_handle_box_set_snap_edge">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkPositionType" name="edge"/>
+        </parameters>
+      </method>
       <method name="GetShadowType" cname="gtk_handle_box_get_shadow_type">
         <return-type type="GtkShadowType"/>
       </method>
@@ -12290,6 +11005,13 @@
           <parameter type="gint" name="ring_width"/>
         </parameters>
       </method>
+      <method name="GetMetrics" cname="gtk_hsv_get_metrics">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint*" name="size"/>
+          <parameter type="gint*" name="ring_width"/>
+        </parameters>
+      </method>
       <method name="SetColor" cname="gtk_hsv_set_color">
         <return-type type="void"/>
         <parameters>
@@ -12302,13 +11024,6 @@
       <method name="IsAdjusting" cname="gtk_hsv_is_adjusting">
         <return-type type="gboolean"/>
       </method>
-      <method name="GetMetrics" cname="gtk_hsv_get_metrics">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint*" name="size"/>
-          <parameter type="gint*" name="ring_width"/>
-        </parameters>
-      </method>
     </object>
     <object name="IconFactory" cname="GtkIconFactory" parent="GObject">
       <field cname="icons" type="GHashTable*"/>
@@ -12354,6 +11069,9 @@
       <property name="IconSize" cname="icon_size" type="gint" doc-string=" _(Size to use for stock icon or icon set.)" readable="true" writeable="true"/>
       <property name="PixbufAnimation" cname="pixbuf_animation" type="GdkPixbufAnimation" doc-string=" _(GdkPixbufAnimation to display.)" readable="true" writeable="true"/>
       <property name="StorageType" cname="storage_type" type="GtkImageType" doc-string=" _(The representation being used for image data.)" readable="true"/>
+      <method name="GetPixbuf" cname="gtk_image_get_pixbuf">
+        <return-type type="GdkPixbuf*"/>
+      </method>
       <method name="GetStock" cname="gtk_image_get_stock">
         <return-type type="void"/>
         <parameters>
@@ -12375,62 +11093,14 @@
           <parameter type="GdkBitmap**" name="mask"/>
         </parameters>
       </method>
+      <method name="GetAnimation" cname="gtk_image_get_animation">
+        <return-type type="GdkPixbufAnimation*"/>
+      </method>
       <constructor cname="gtk_image_new_from_animation">
         <parameters>
           <parameter type="GdkPixbufAnimation*" name="animation"/>
         </parameters>
       </constructor>
-      <method name="SetFromAnimation" cname="gtk_image_set_from_animation">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdkPixbufAnimation*" name="animation"/>
-        </parameters>
-      </method>
-      <method name="GetIconSet" cname="gtk_image_get_icon_set">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkIconSet**" name="icon_set"/>
-          <parameter type="GtkIconSize*" name="size"/>
-        </parameters>
-      </method>
-      <method name="SetFromPixmap" cname="gtk_image_set_from_pixmap">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdkPixmap*" name="pixmap"/>
-          <parameter type="GdkBitmap*" name="mask"/>
-        </parameters>
-      </method>
-      <constructor cname="gtk_image_new"/>
-      <method name="GetPixmap" cname="gtk_image_get_pixmap">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdkPixmap**" name="pixmap"/>
-          <parameter type="GdkBitmap**" name="mask"/>
-        </parameters>
-      </method>
-      <constructor cname="gtk_image_new_from_file">
-        <parameters>
-          <parameter type="const-gchar*" name="filename"/>
-        </parameters>
-      </constructor>
-      <constructor cname="gtk_image_new_from_icon_set">
-        <parameters>
-          <parameter type="GtkIconSet*" name="icon_set"/>
-          <parameter type="GtkIconSize" name="size"/>
-        </parameters>
-      </constructor>
-      <method name="SetFromPixbuf" cname="gtk_image_set_from_pixbuf">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdkPixbuf*" name="pixbuf"/>
-        </parameters>
-      </method>
-      <method name="GetPixbuf" cname="gtk_image_get_pixbuf">
-        <return-type type="GdkPixbuf*"/>
-      </method>
-      <method name="GetAnimation" cname="gtk_image_get_animation">
-        <return-type type="GdkPixbufAnimation*"/>
-      </method>
       <constructor cname="gtk_image_new_from_stock">
         <parameters>
           <parameter type="const-gchar*" name="stock_id"/>
@@ -12466,32 +11136,66 @@
           <parameter type="GdkBitmap*" name="mask"/>
         </parameters>
       </constructor>
+      <method name="SetFromAnimation" cname="gtk_image_set_from_animation">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdkPixbufAnimation*" name="animation"/>
+        </parameters>
+      </method>
+      <method name="GetIconSet" cname="gtk_image_get_icon_set">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkIconSet**" name="icon_set"/>
+          <parameter type="GtkIconSize*" name="size"/>
+        </parameters>
+      </method>
+      <method name="SetFromPixmap" cname="gtk_image_set_from_pixmap">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdkPixmap*" name="pixmap"/>
+          <parameter type="GdkBitmap*" name="mask"/>
+        </parameters>
+      </method>
+      <constructor cname="gtk_image_new"/>
+      <method name="GetPixmap" cname="gtk_image_get_pixmap">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdkPixmap**" name="pixmap"/>
+          <parameter type="GdkBitmap**" name="mask"/>
+        </parameters>
+      </method>
+      <constructor cname="gtk_image_new_from_file">
+        <parameters>
+          <parameter type="const-gchar*" name="filename"/>
+        </parameters>
+      </constructor>
       <method name="SetFromFile" cname="gtk_image_set_from_file">
         <return-type type="void"/>
         <parameters>
           <parameter type="const-gchar*" name="filename"/>
         </parameters>
       </method>
+      <constructor cname="gtk_image_new_from_icon_set">
+        <parameters>
+          <parameter type="GtkIconSet*" name="icon_set"/>
+          <parameter type="GtkIconSize" name="size"/>
+        </parameters>
+      </constructor>
       <constructor cname="gtk_image_new_from_pixbuf">
         <parameters>
           <parameter type="GdkPixbuf*" name="pixbuf"/>
         </parameters>
       </constructor>
+      <method name="SetFromPixbuf" cname="gtk_image_set_from_pixbuf">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdkPixbuf*" name="pixbuf"/>
+        </parameters>
+      </method>
     </object>
     <object name="ImageMenuItem" cname="GtkImageMenuItem" parent="GtkMenuItem">
       <field cname="image" type="GtkWidget*"/>
       <property name="Image" cname="image" type="GtkWidget" doc-string=" _(Child widget to appear next to the menu text)" readable="true" writeable="true"/>
-      <constructor cname="gtk_image_menu_item_new_with_mnemonic" preferred="1">
-        <parameters>
-          <parameter type="const-gchar*" name="label"/>
-        </parameters>
-      </constructor>
-      <constructor cname="gtk_image_menu_item_new_from_stock">
-        <parameters>
-          <parameter type="const-gchar*" name="stock_id"/>
-          <parameter type="GtkAccelGroup*" name="accel_group"/>
-        </parameters>
-      </constructor>
       <method name="GetImage" cname="gtk_image_menu_item_get_image">
         <return-type type="GtkWidget*"/>
       </method>
@@ -12507,6 +11211,17 @@
           <parameter type="GtkWidget*" name="image"/>
         </parameters>
       </method>
+      <constructor cname="gtk_image_menu_item_new_with_mnemonic" preferred="1">
+        <parameters>
+          <parameter type="const-gchar*" name="label"/>
+        </parameters>
+      </constructor>
+      <constructor cname="gtk_image_menu_item_new_from_stock">
+        <parameters>
+          <parameter type="const-gchar*" name="stock_id"/>
+          <parameter type="GtkAccelGroup*" name="accel_group"/>
+        </parameters>
+      </constructor>
     </object>
     <object name="IMContext" cname="GtkIMContext" parent="GObject">
       <signal name="PreeditStart" cname="preedit_start" when="LAST">
@@ -12611,10 +11326,10 @@
           <parameter type="GtkItem*" name="item"/>
         </parameters>
       </signal>
-      <method name="Deselect" cname="gtk_item_deselect">
+      <method name="Select" cname="gtk_item_select">
         <return-type type="void"/>
       </method>
-      <method name="Select" cname="gtk_item_select">
+      <method name="Deselect" cname="gtk_item_deselect">
         <return-type type="void"/>
       </method>
       <method name="Toggle" cname="gtk_item_toggle">
@@ -12645,6 +11360,20 @@
           <parameter type="guint32" name="time"/>
         </parameters>
       </method>
+      <method name="Construct" cname="gtk_item_factory_construct">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkType" name="container_type"/>
+          <parameter type="const-gchar*" name="path"/>
+          <parameter type="GtkAccelGroup*" name="accel_group"/>
+        </parameters>
+      </method>
+      <method name="GetItemByAction" cname="gtk_item_factory_get_item_by_action">
+        <return-type type="GtkWidget*"/>
+        <parameters>
+          <parameter type="guint" name="action"/>
+        </parameters>
+      </method>
       <method name="CreateItems" cname="gtk_item_factory_create_items">
         <return-type type="void"/>
         <parameters>
@@ -12660,49 +11389,18 @@
           <parameter type="GtkAccelGroup*" name="accel_group"/>
         </parameters>
       </constructor>
-      <method name="GetItem" cname="gtk_item_factory_get_item">
-        <return-type type="GtkWidget*"/>
-        <parameters>
-          <parameter type="const-gchar*" name="path"/>
-        </parameters>
-      </method>
-      <method name="GetWidgetByAction" cname="gtk_item_factory_get_widget_by_action">
-        <return-type type="GtkWidget*"/>
-        <parameters>
-          <parameter type="guint" name="action"/>
-        </parameters>
-      </method>
-      <method name="PopupWithData" cname="gtk_item_factory_popup_with_data">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gpointer" name="popup_data"/>
-          <parameter type="GtkDestroyNotify" name="destroy"/>
-          <parameter type="guint" name="x"/>
-          <parameter type="guint" name="y"/>
-          <parameter type="guint" name="mouse_button"/>
-          <parameter type="guint32" name="time"/>
-        </parameters>
-      </method>
-      <method name="Construct" cname="gtk_item_factory_construct">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkType" name="container_type"/>
-          <parameter type="const-gchar*" name="path"/>
-          <parameter type="GtkAccelGroup*" name="accel_group"/>
-        </parameters>
-      </method>
-      <method name="GetItemByAction" cname="gtk_item_factory_get_item_by_action">
-        <return-type type="GtkWidget*"/>
-        <parameters>
-          <parameter type="guint" name="action"/>
-        </parameters>
-      </method>
       <method name="DeleteItem" cname="gtk_item_factory_delete_item">
         <return-type type="void"/>
         <parameters>
           <parameter type="const-gchar*" name="path"/>
         </parameters>
       </method>
+      <method name="GetItem" cname="gtk_item_factory_get_item">
+        <return-type type="GtkWidget*"/>
+        <parameters>
+          <parameter type="const-gchar*" name="path"/>
+        </parameters>
+      </method>
       <method name="CreateItem" cname="gtk_item_factory_create_item">
         <return-type type="void"/>
         <parameters>
@@ -12725,6 +11423,12 @@
           <parameter type="const-gchar*" name="path"/>
         </parameters>
       </method>
+      <method name="GetWidgetByAction" cname="gtk_item_factory_get_widget_by_action">
+        <return-type type="GtkWidget*"/>
+        <parameters>
+          <parameter type="guint" name="action"/>
+        </parameters>
+      </method>
       <method name="DeleteEntry" cname="gtk_item_factory_delete_entry">
         <return-type type="void"/>
         <parameters>
@@ -12734,6 +11438,17 @@
       <method name="PopupData" cname="gtk_item_factory_popup_data">
         <return-type type="gpointer"/>
       </method>
+      <method name="PopupWithData" cname="gtk_item_factory_popup_with_data">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gpointer" name="popup_data"/>
+          <parameter type="GtkDestroyNotify" name="destroy"/>
+          <parameter type="guint" name="x"/>
+          <parameter type="guint" name="y"/>
+          <parameter type="guint" name="mouse_button"/>
+          <parameter type="guint32" name="time"/>
+        </parameters>
+      </method>
     </object>
     <object name="Label" cname="GtkLabel" parent="GtkMisc">
       <field cname="label" type="gchar*"/>
@@ -12789,64 +11504,6 @@
           <parameter type="PangoAttrList*" name="attrs"/>
         </parameters>
       </method>
-      <method name="SetMarkup" cname="gtk_label_set_markup">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-gchar*" name="str"/>
-        </parameters>
-      </method>
-      <method name="GetLayout" cname="gtk_label_get_layout">
-        <return-type type="PangoLayout*"/>
-      </method>
-      <method name="SetJustify" cname="gtk_label_set_justify">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkJustification" name="jtype"/>
-        </parameters>
-      </method>
-      <method name="GetLineWrap" cname="gtk_label_get_line_wrap">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="SelectRegion" cname="gtk_label_select_region">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="start_offset"/>
-          <parameter type="gint" name="end_offset"/>
-        </parameters>
-      </method>
-      <constructor cname="gtk_label_new" preferred="1">
-        <parameters>
-          <parameter type="const-char*" name="str"/>
-        </parameters>
-      </constructor>
-      <method name="SetMarkupWithMnemonic" cname="gtk_label_set_markup_with_mnemonic">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-gchar*" name="str"/>
-        </parameters>
-      </method>
-      <method name="SetSelectable" cname="gtk_label_set_selectable">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="setting"/>
-        </parameters>
-      </method>
-      <method name="GetSelectionBounds" cname="gtk_label_get_selection_bounds">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="gint*" name="start"/>
-          <parameter type="gint*" name="end"/>
-        </parameters>
-      </method>
-      <method name="GetAttributes" cname="gtk_label_get_attributes">
-        <return-type type="PangoAttrList*"/>
-      </method>
-      <method name="SetText" cname="gtk_label_set_text">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-char*" name="str"/>
-        </parameters>
-      </method>
       <method name="GetLabel" cname="gtk_label_get_label">
         <return-type type="const-gchar*"/>
       </method>
@@ -12862,12 +11519,21 @@
           <parameter type="gboolean" name="wrap"/>
         </parameters>
       </method>
+      <method name="SetMarkup" cname="gtk_label_set_markup">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="const-gchar*" name="str"/>
+        </parameters>
+      </method>
       <method name="SetUseUnderline" cname="gtk_label_set_use_underline">
         <return-type type="void"/>
         <parameters>
           <parameter type="gboolean" name="setting"/>
         </parameters>
       </method>
+      <method name="GetLayout" cname="gtk_label_get_layout">
+        <return-type type="PangoLayout*"/>
+      </method>
       <method name="GetMnemonicWidget" cname="gtk_label_get_mnemonic_widget">
         <return-type type="GtkWidget*"/>
       </method>
@@ -12877,15 +11543,31 @@
           <parameter type="const-gchar*" name="str"/>
         </parameters>
       </method>
+      <method name="SetJustify" cname="gtk_label_set_justify">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkJustification" name="jtype"/>
+        </parameters>
+      </method>
+      <method name="GetLineWrap" cname="gtk_label_get_line_wrap">
+        <return-type type="gboolean"/>
+      </method>
+      <method name="SetMnemonicWidget" cname="gtk_label_set_mnemonic_widget">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="widget"/>
+        </parameters>
+      </method>
       <constructor cname="gtk_label_new_with_mnemonic">
         <parameters>
           <parameter type="const-char*" name="str"/>
         </parameters>
       </constructor>
-      <method name="SetMnemonicWidget" cname="gtk_label_set_mnemonic_widget">
+      <method name="SelectRegion" cname="gtk_label_select_region">
         <return-type type="void"/>
         <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="gint" name="start_offset"/>
+          <parameter type="gint" name="end_offset"/>
         </parameters>
       </method>
       <method name="GetSelectable" cname="gtk_label_get_selectable">
@@ -12894,6 +11576,17 @@
       <method name="GetUseUnderline" cname="gtk_label_get_use_underline">
         <return-type type="gboolean"/>
       </method>
+      <constructor cname="gtk_label_new" preferred="1">
+        <parameters>
+          <parameter type="const-char*" name="str"/>
+        </parameters>
+      </constructor>
+      <method name="SetMarkupWithMnemonic" cname="gtk_label_set_markup_with_mnemonic">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="const-gchar*" name="str"/>
+        </parameters>
+      </method>
       <method name="GetLayoutOffsets" cname="gtk_label_get_layout_offsets">
         <return-type type="void"/>
         <parameters>
@@ -12904,6 +11597,12 @@
       <method name="GetText" cname="gtk_label_get_text">
         <return-type type="const-gchar*"/>
       </method>
+      <method name="SetSelectable" cname="gtk_label_set_selectable">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="setting"/>
+        </parameters>
+      </method>
       <method name="SetPattern" cname="gtk_label_set_pattern">
         <return-type type="void"/>
         <parameters>
@@ -12916,6 +11615,16 @@
           <parameter type="const-gchar*" name="str"/>
         </parameters>
       </method>
+      <method name="GetSelectionBounds" cname="gtk_label_get_selection_bounds">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="gint*" name="start"/>
+          <parameter type="gint*" name="end"/>
+        </parameters>
+      </method>
+      <method name="GetAttributes" cname="gtk_label_get_attributes">
+        <return-type type="PangoAttrList*"/>
+      </method>
       <method name="GetUseMarkup" cname="gtk_label_get_use_markup">
         <return-type type="gboolean"/>
       </method>
@@ -12925,6 +11634,12 @@
       <method name="GetMnemonicKeyval" cname="gtk_label_get_mnemonic_keyval">
         <return-type type="guint"/>
       </method>
+      <method name="SetText" cname="gtk_label_set_text">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="const-char*" name="str"/>
+        </parameters>
+      </method>
     </object>
     <object name="Layout" cname="GtkLayout" parent="GtkContainer">
       <field cname="children" type="GList*"/>
@@ -12949,30 +11664,15 @@
           <parameter type="GtkAdjustment*" name="vadjustment"/>
         </parameters>
       </signal>
-      <method name="GetHadjustment" cname="gtk_layout_get_hadjustment">
-        <return-type type="GtkAdjustment*"/>
-      </method>
-      <method name="GetSize" cname="gtk_layout_get_size">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="guint*" name="width"/>
-          <parameter type="guint*" name="height"/>
-        </parameters>
-      </method>
-      <method name="Put" cname="gtk_layout_put">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="child_widget"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-        </parameters>
-      </method>
       <method name="SetVadjustment" cname="gtk_layout_set_vadjustment">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkAdjustment*" name="adjustment"/>
         </parameters>
       </method>
+      <method name="GetHadjustment" cname="gtk_layout_get_hadjustment">
+        <return-type type="GtkAdjustment*"/>
+      </method>
       <method name="GetVadjustment" cname="gtk_layout_get_vadjustment">
         <return-type type="GtkAdjustment*"/>
       </method>
@@ -12982,6 +11682,13 @@
           <parameter type="GtkAdjustment*" name="vadjustment"/>
         </parameters>
       </constructor>
+      <method name="GetSize" cname="gtk_layout_get_size">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="guint*" name="width"/>
+          <parameter type="guint*" name="height"/>
+        </parameters>
+      </method>
       <method name="Move" cname="gtk_layout_move">
         <return-type type="void"/>
         <parameters>
@@ -12997,6 +11704,14 @@
           <parameter type="guint" name="height"/>
         </parameters>
       </method>
+      <method name="Put" cname="gtk_layout_put">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="child_widget"/>
+          <parameter type="gint" name="x"/>
+          <parameter type="gint" name="y"/>
+        </parameters>
+      </method>
       <method name="SetHadjustment" cname="gtk_layout_set_hadjustment">
         <return-type type="void"/>
         <parameters>
@@ -13004,250 +11719,6 @@
         </parameters>
       </method>
     </object>
-    <object name="List" cname="GtkList" parent="GtkContainer">
-      <field cname="children" type="GList*"/>
-      <field cname="selection" type="GList*"/>
-      <field cname="undo_selection" type="GList*"/>
-      <field cname="undo_unselection" type="GList*"/>
-      <field cname="last_focus_child" type="GtkWidget*"/>
-      <field cname="undo_focus_child" type="GtkWidget*"/>
-      <field cname="htimer" type="guint"/>
-      <field cname="vtimer" type="guint"/>
-      <field cname="anchor" type="gint"/>
-      <field cname="drag_pos" type="gint"/>
-      <field cname="anchor_state" type="GtkStateType"/>
-      <field cname="selection_mode" bits="2" type="guint"/>
-      <field cname="drag_selection" bits="1" type="guint"/>
-      <field cname="add_mode" bits="1" type="guint"/>
-      <signal name="SelectionChanged" cname="selection_changed" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkList*" name="list"/>
-        </parameters>
-      </signal>
-      <signal name="ChildSelected" cname="select_child" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkList*" name="list"/>
-          <parameter type="GtkWidget*" name="child"/>
-        </parameters>
-      </signal>
-      <signal name="ChildUnselected" cname="unselect_child" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkList*" name="list"/>
-          <parameter type="GtkWidget*" name="child"/>
-        </parameters>
-      </signal>
-      <method name="ScrollHorizontal" cname="gtk_list_scroll_horizontal">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkScrollType" name="scroll_type"/>
-          <parameter type="gfloat" name="position"/>
-        </parameters>
-      </method>
-      <method name="InsertItems" cname="gtk_list_insert_items">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GList*" name="items"/>
-          <parameter type="gint" name="position"/>
-        </parameters>
-      </method>
-      <method name="PrependItems" cname="gtk_list_prepend_items">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GList*" name="items"/>
-        </parameters>
-      </method>
-      <method name="ToggleRow" cname="gtk_list_toggle_row">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="item"/>
-        </parameters>
-      </method>
-      <method name="SelectAll" cname="gtk_list_select_all">
-        <return-type type="void"/>
-      </method>
-      <method name="ExtendSelection" cname="gtk_list_extend_selection">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkScrollType" name="scroll_type"/>
-          <parameter type="gfloat" name="position"/>
-          <parameter type="gboolean" name="auto_start_selection"/>
-        </parameters>
-      </method>
-      <method name="RemoveItemsNoUnref" cname="gtk_list_remove_items_no_unref">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GList*" name="items"/>
-        </parameters>
-      </method>
-      <method name="UndoSelection" cname="gtk_list_undo_selection">
-        <return-type type="void"/>
-      </method>
-      <method name="StartSelection" cname="gtk_list_start_selection">
-        <return-type type="void"/>
-      </method>
-      <method name="SelectItem" cname="gtk_list_select_item">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="item"/>
-        </parameters>
-      </method>
-      <method name="SelectChild" cname="gtk_list_select_child">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-        </parameters>
-      </method>
-      <method name="UnselectChild" cname="gtk_list_unselect_child">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-        </parameters>
-      </method>
-      <method name="ScrollVertical" cname="gtk_list_scroll_vertical">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkScrollType" name="scroll_type"/>
-          <parameter type="gfloat" name="position"/>
-        </parameters>
-      </method>
-      <method name="RemoveItems" cname="gtk_list_remove_items">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GList*" name="items"/>
-        </parameters>
-      </method>
-      <method name="ClearItems" cname="gtk_list_clear_items">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="start"/>
-          <parameter type="gint" name="end"/>
-        </parameters>
-      </method>
-      <method name="UnselectItem" cname="gtk_list_unselect_item">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="item"/>
-        </parameters>
-      </method>
-      <method name="ChildPosition" cname="gtk_list_child_position">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-        </parameters>
-      </method>
-      <method name="ToggleFocusRow" cname="gtk_list_toggle_focus_row">
-        <return-type type="void"/>
-      </method>
-      <method name="AppendItems" cname="gtk_list_append_items">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GList*" name="items"/>
-        </parameters>
-      </method>
-      <method name="EndSelection" cname="gtk_list_end_selection">
-        <return-type type="void"/>
-      </method>
-      <constructor cname="gtk_list_new"/>
-      <method name="ToggleAddMode" cname="gtk_list_toggle_add_mode">
-        <return-type type="void"/>
-      </method>
-      <method name="EndDragSelection" cname="gtk_list_end_drag_selection">
-        <return-type type="void"/>
-      </method>
-      <method name="SetSelectionMode" cname="gtk_list_set_selection_mode">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkSelectionMode" name="mode"/>
-        </parameters>
-      </method>
-      <method name="UnselectAll" cname="gtk_list_unselect_all">
-        <return-type type="void"/>
-      </method>
-    </object>
-    <object name="ListItem" cname="GtkListItem" parent="GtkItem">
-      <signal name="ToggleFocusRow" cname="toggle_focus_row" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkListItem*" name="list_item"/>
-        </parameters>
-      </signal>
-      <signal name="SelectAll" cname="select_all" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkListItem*" name="list_item"/>
-        </parameters>
-      </signal>
-      <signal name="UnselectAll" cname="unselect_all" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkListItem*" name="list_item"/>
-        </parameters>
-      </signal>
-      <signal name="UndoSelection" cname="undo_selection" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkListItem*" name="list_item"/>
-        </parameters>
-      </signal>
-      <signal name="StartSelection" cname="start_selection" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkListItem*" name="list_item"/>
-        </parameters>
-      </signal>
-      <signal name="EndSelection" cname="end_selection" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkListItem*" name="list_item"/>
-        </parameters>
-      </signal>
-      <signal name="ToggleAddMode" cname="toggle_add_mode" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkListItem*" name="list_item"/>
-        </parameters>
-      </signal>
-      <signal name="ExtendSelection" cname="extend_selection" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkListItem*" name="list_item"/>
-          <parameter type="GtkScrollType" name="scroll_type"/>
-          <parameter type="gfloat" name="position"/>
-          <parameter type="gboolean" name="auto_start_selection"/>
-        </parameters>
-      </signal>
-      <signal name="ScrollVertical" cname="scroll_vertical" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkListItem*" name="list_item"/>
-          <parameter type="GtkScrollType" name="scroll_type"/>
-          <parameter type="gfloat" name="position"/>
-        </parameters>
-      </signal>
-      <signal name="ScrollHorizontal" cname="scroll_horizontal" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkListItem*" name="list_item"/>
-          <parameter type="GtkScrollType" name="scroll_type"/>
-          <parameter type="gfloat" name="position"/>
-        </parameters>
-      </signal>
-      <method name="Select" cname="gtk_list_item_select">
-        <return-type type="void"/>
-      </method>
-      <constructor cname="gtk_list_item_new"/>
-      <constructor cname="gtk_list_item_new_with_label">
-        <parameters>
-          <parameter type="const-gchar*" name="label"/>
-        </parameters>
-      </constructor>
-      <method name="Deselect" cname="gtk_list_item_deselect">
-        <return-type type="void"/>
-      </method>
-    </object>
     <object name="ListStore" cname="GtkListStore" parent="GObject">
       <field cname="stamp" type="gint"/>
       <field cname="root" type="gpointer"/>
@@ -13268,40 +11739,6 @@
         <interface cname="GtkTreeDragDest"/>
         <interface cname="GtkTreeSortable"/>
       </implements>
-      <method name="SetValue" cname="gtk_list_store_set_value">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="gint" name="column"/>
-          <parameter type="GValue*" name="value"/>
-        </parameters>
-      </method>
-      <method name="InsertBefore" cname="gtk_list_store_insert_before">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="GtkTreeIter*" name="sibling"/>
-        </parameters>
-      </method>
-      <constructor cname="gtk_list_store_new">
-        <parameters>
-          <parameter type="gint" name="n_columns"/>
-          <parameter type=" " name=""/>
-        </parameters>
-      </constructor>
-      <method name="Prepend" cname="gtk_list_store_prepend">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-        </parameters>
-      </method>
-      <method name="InsertAfter" cname="gtk_list_store_insert_after">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="GtkTreeIter*" name="sibling"/>
-        </parameters>
-      </method>
       <method name="Insert" cname="gtk_list_store_insert">
         <return-type type="void"/>
         <parameters>
@@ -13315,13 +11752,34 @@
           <parameter type="GtkTreeIter*" name="iter"/>
         </parameters>
       </method>
+      <method name="SetValue" cname="gtk_list_store_set_value">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="gint" name="column"/>
+          <parameter type="GValue*" name="value"/>
+        </parameters>
+      </method>
       <method name="Set" cname="gtk_list_store_set">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="G" name=""/>
+          <parameter type="G"/>
         </parameters>
       </method>
+      <method name="InsertBefore" cname="gtk_list_store_insert_before">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreeIter*" name="sibling"/>
+        </parameters>
+      </method>
+      <constructor cname="gtk_list_store_new">
+        <parameters>
+          <parameter type="gint" name="n_columns"/>
+          <parameter type=" "/>
+        </parameters>
+      </constructor>
       <method name="SetValist" cname="gtk_list_store_set_valist">
         <return-type type="void"/>
         <parameters>
@@ -13341,6 +11799,12 @@
           <parameter type="GType*" name="types"/>
         </parameters>
       </constructor>
+      <method name="Prepend" cname="gtk_list_store_prepend">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTreeIter*" name="iter"/>
+        </parameters>
+      </method>
       <method name="SetColumnTypes" cname="gtk_list_store_set_column_types">
         <return-type type="void"/>
         <parameters>
@@ -13348,6 +11812,13 @@
           <parameter type="GType*" name="types"/>
         </parameters>
       </method>
+      <method name="InsertAfter" cname="gtk_list_store_insert_after">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreeIter*" name="sibling"/>
+        </parameters>
+      </method>
       <method name="Clear" cname="gtk_list_store_clear">
         <return-type type="void"/>
       </method>
@@ -13382,6 +11853,13 @@
       <field cname="upper_arrow_prelight" bits="1" type="guint"/>
       <field cname="lower_arrow_prelight" bits="1" type="guint"/>
       <property name="TearoffTitle" cname="tearoff-title" type="gchar*" doc-string=" _(A title that may be displayed by the window manager when this menu is torn-off.)" readable="true" writeable="true"/>
+      <method name="ReorderChild" cname="gtk_menu_reorder_child">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="gint" name="position"/>
+        </parameters>
+      </method>
       <method name="SetAccelPath" cname="gtk_menu_set_accel_path">
         <return-type type="void"/>
         <parameters>
@@ -13400,6 +11878,12 @@
           <parameter type="GtkAccelGroup*" name="accel_group"/>
         </parameters>
       </method>
+      <method name="SetTitle" cname="gtk_menu_set_title">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="const-gchar*" name="title"/>
+        </parameters>
+      </method>
       <method name="SetTearoffState" cname="gtk_menu_set_tearoff_state">
         <return-type type="void"/>
         <parameters>
@@ -13412,9 +11896,23 @@
       <method name="GetAccelGroup" cname="gtk_menu_get_accel_group">
         <return-type type="GtkAccelGroup*"/>
       </method>
+      <method name="Popup" cname="gtk_menu_popup">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="parent_menu_shell"/>
+          <parameter type="GtkWidget*" name="parent_menu_item"/>
+          <parameter type="GtkMenuPositionFunc" name="func"/>
+          <parameter type="gpointer" name="data"/>
+          <parameter type="guint" name="button"/>
+          <parameter type="guint32" name="activate_time"/>
+        </parameters>
+      </method>
       <method name="Reposition" cname="gtk_menu_reposition">
         <return-type type="void"/>
       </method>
+      <method name="Detach" cname="gtk_menu_detach">
+        <return-type type="void"/>
+      </method>
       <method name="SetActive" cname="gtk_menu_set_active">
         <return-type type="void"/>
         <parameters>
@@ -13428,33 +11926,6 @@
       <method name="GetAttachWidget" cname="gtk_menu_get_attach_widget">
         <return-type type="GtkWidget*"/>
       </method>
-      <method name="ReorderChild" cname="gtk_menu_reorder_child">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="gint" name="position"/>
-        </parameters>
-      </method>
-      <method name="SetTitle" cname="gtk_menu_set_title">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-gchar*" name="title"/>
-        </parameters>
-      </method>
-      <method name="Popup" cname="gtk_menu_popup">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="parent_menu_shell"/>
-          <parameter type="GtkWidget*" name="parent_menu_item"/>
-          <parameter type="GtkMenuPositionFunc" name="func"/>
-          <parameter type="gpointer" name="data"/>
-          <parameter type="guint" name="button"/>
-          <parameter type="guint32" name="activate_time"/>
-        </parameters>
-      </method>
-      <method name="Detach" cname="gtk_menu_detach">
-        <return-type type="void"/>
-      </method>
       <method name="AttachToWidget" cname="gtk_menu_attach_to_widget">
         <return-type type="void"/>
         <parameters>
@@ -13504,6 +11975,7 @@
           <parameter type="gint" name="allocation"/>
         </parameters>
       </signal>
+      <constructor cname="gtk_menu_item_new"/>
       <constructor cname="gtk_menu_item_new_with_label">
         <parameters>
           <parameter type="const-gchar*" name="label"/>
@@ -13518,21 +11990,6 @@
       <method name="Activate" cname="gtk_menu_item_activate">
         <return-type type="void"/>
       </method>
-      <method name="ToggleSizeAllocate" cname="gtk_menu_item_toggle_size_allocate">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="allocation"/>
-        </parameters>
-      </method>
-      <constructor cname="gtk_menu_item_new_with_mnemonic" preferred="1">
-        <parameters>
-          <parameter type="const-gchar*" name="label"/>
-        </parameters>
-      </constructor>
-      <method name="Select" cname="gtk_menu_item_select">
-        <return-type type="void"/>
-      </method>
-      <constructor cname="gtk_menu_item_new"/>
       <method name="GetRightJustified" cname="gtk_menu_item_get_right_justified">
         <return-type type="gboolean"/>
       </method>
@@ -13551,12 +12008,26 @@
           <parameter type="gboolean" name="right_justified"/>
         </parameters>
       </method>
+      <method name="ToggleSizeAllocate" cname="gtk_menu_item_toggle_size_allocate">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="allocation"/>
+        </parameters>
+      </method>
       <method name="RemoveSubmenu" cname="gtk_menu_item_remove_submenu">
         <return-type type="void"/>
       </method>
       <method name="GetSubmenu" cname="gtk_menu_item_get_submenu">
         <return-type type="GtkWidget*"/>
       </method>
+      <constructor cname="gtk_menu_item_new_with_mnemonic" preferred="1">
+        <parameters>
+          <parameter type="const-gchar*" name="label"/>
+        </parameters>
+      </constructor>
+      <method name="Select" cname="gtk_menu_item_select">
+        <return-type type="void"/>
+      </method>
       <method name="ToggleSizeRequest" cname="gtk_menu_item_toggle_size_request">
         <return-type type="void"/>
         <parameters>
@@ -13614,6 +12085,9 @@
           <parameter name="p0" type="GtkDirectionType);"/>
         </parameters>
       </signal>
+      <method name="Deselect" cname="gtk_menu_shell_deselect">
+        <return-type type="void"/>
+      </method>
       <method name="Prepend" cname="gtk_menu_shell_prepend">
         <return-type type="void"/>
         <parameters>
@@ -13623,9 +12097,6 @@
       <method name="Deactivate" cname="gtk_menu_shell_deactivate">
         <return-type type="void"/>
       </method>
-      <method name="Deselect" cname="gtk_menu_shell_deselect">
-        <return-type type="void"/>
-      </method>
       <method name="Insert" cname="gtk_menu_shell_insert">
         <return-type type="void"/>
         <parameters>
@@ -13679,13 +12150,6 @@
       <property name="Yalign" cname="yalign" type="gfloat" doc-string=" _(The vertical alignment, from 0 (top) to 1 (bottom))" readable="true" writeable="true"/>
       <property name="Xpad" cname="xpad" type="gint" doc-string=" _(The amount of space to add on the left and right of the widget, in pixels)" readable="true" writeable="true"/>
       <property name="Ypad" cname="ypad" type="gint" doc-string=" _(The amount of space to add on the top and bottom of the widget, in pixels)" readable="true" writeable="true"/>
-      <method name="GetPadding" cname="gtk_misc_get_padding">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint*" name="xpad"/>
-          <parameter type="gint*" name="ypad"/>
-        </parameters>
-      </method>
       <method name="GetAlignment" cname="gtk_misc_get_alignment">
         <return-type type="void"/>
         <parameters>
@@ -13707,6 +12171,13 @@
           <parameter type="gfloat" name="yalign"/>
         </parameters>
       </method>
+      <method name="GetPadding" cname="gtk_misc_get_padding">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint*" name="xpad"/>
+          <parameter type="gint*" name="ypad"/>
+        </parameters>
+      </method>
     </object>
     <object name="Notebook" cname="GtkNotebook" parent="GtkContainer">
       <field cname="cur_page" type="GtkNotebookPage*"/>
@@ -13776,9 +12247,41 @@
           <parameter type="GtkDirectionType" name="direction"/>
         </parameters>
       </signal>
+      <method name="InsertPage" cname="gtk_notebook_insert_page">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="GtkWidget*" name="tab_label"/>
+          <parameter type="gint" name="position"/>
+        </parameters>
+      </method>
+      <method name="QueryTabLabelPacking" cname="gtk_notebook_query_tab_label_packing">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="gboolean*" name="expand"/>
+          <parameter type="gboolean*" name="fill"/>
+          <parameter type="GtkPackType*" name="pack_type"/>
+        </parameters>
+      </method>
+      <method name="PopupEnable" cname="gtk_notebook_popup_enable">
+        <return-type type="void"/>
+      </method>
+      <method name="SetShowBorder" cname="gtk_notebook_set_show_border">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="show_border"/>
+        </parameters>
+      </method>
       <method name="NextPage" cname="gtk_notebook_next_page">
         <return-type type="void"/>
       </method>
+      <method name="SetShowTabs" cname="gtk_notebook_set_show_tabs">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="show_tabs"/>
+        </parameters>
+      </method>
       <method name="GetCurrentPage" cname="gtk_notebook_get_current_page">
         <return-type type="gint"/>
       </method>
@@ -13794,12 +12297,31 @@
           <parameter type="GtkWidget*" name="child"/>
         </parameters>
       </method>
+      <method name="GetTabPos" cname="gtk_notebook_get_tab_pos">
+        <return-type type="GtkPositionType"/>
+      </method>
       <method name="GetTabLabel" cname="gtk_notebook_get_tab_label">
         <return-type type="GtkWidget*"/>
         <parameters>
           <parameter type="GtkWidget*" name="child"/>
         </parameters>
       </method>
+      <method name="PageNum" cname="gtk_notebook_page_num">
+        <return-type type="gint"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="child"/>
+        </parameters>
+      </method>
+      <method name="SetTabLabelText" cname="gtk_notebook_set_tab_label_text">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="const-gchar*" name="tab_text"/>
+        </parameters>
+      </method>
+      <method name="GetShowBorder" cname="gtk_notebook_get_show_border">
+        <return-type type="gboolean"/>
+      </method>
       <method name="PrependPage" cname="gtk_notebook_prepend_page">
         <return-type type="void"/>
         <parameters>
@@ -13838,94 +12360,6 @@
           <parameter type="GtkWidget*" name="child"/>
         </parameters>
       </method>
-      <method name="AppendPageMenu" cname="gtk_notebook_append_page_menu">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="GtkWidget*" name="tab_label"/>
-          <parameter type="GtkWidget*" name="menu_label"/>
-        </parameters>
-      </method>
-      <method name="PrevPage" cname="gtk_notebook_prev_page">
-        <return-type type="void"/>
-      </method>
-      <method name="AppendPage" cname="gtk_notebook_append_page">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="GtkWidget*" name="tab_label"/>
-        </parameters>
-      </method>
-      <method name="SetCurrentPage" cname="gtk_notebook_set_current_page">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="page_num"/>
-        </parameters>
-      </method>
-      <method name="SetScrollable" cname="gtk_notebook_set_scrollable">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="scrollable"/>
-        </parameters>
-      </method>
-      <method name="SetTabLabel" cname="gtk_notebook_set_tab_label">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="GtkWidget*" name="tab_label"/>
-        </parameters>
-      </method>
-      <method name="InsertPage" cname="gtk_notebook_insert_page">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="GtkWidget*" name="tab_label"/>
-          <parameter type="gint" name="position"/>
-        </parameters>
-      </method>
-      <method name="QueryTabLabelPacking" cname="gtk_notebook_query_tab_label_packing">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="gboolean*" name="expand"/>
-          <parameter type="gboolean*" name="fill"/>
-          <parameter type="GtkPackType*" name="pack_type"/>
-        </parameters>
-      </method>
-      <method name="PopupEnable" cname="gtk_notebook_popup_enable">
-        <return-type type="void"/>
-      </method>
-      <method name="SetShowBorder" cname="gtk_notebook_set_show_border">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="show_border"/>
-        </parameters>
-      </method>
-      <method name="SetShowTabs" cname="gtk_notebook_set_show_tabs">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="show_tabs"/>
-        </parameters>
-      </method>
-      <method name="GetTabPos" cname="gtk_notebook_get_tab_pos">
-        <return-type type="GtkPositionType"/>
-      </method>
-      <method name="PageNum" cname="gtk_notebook_page_num">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-        </parameters>
-      </method>
-      <method name="SetTabLabelText" cname="gtk_notebook_set_tab_label_text">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-          <parameter type="const-gchar*" name="tab_text"/>
-        </parameters>
-      </method>
-      <method name="GetShowBorder" cname="gtk_notebook_get_show_border">
-        <return-type type="gboolean"/>
-      </method>
       <method name="ReorderChild" cname="gtk_notebook_reorder_child">
         <return-type type="void"/>
         <parameters>
@@ -13942,6 +12376,14 @@
           <parameter type="GtkPositionType" name="pos"/>
         </parameters>
       </method>
+      <method name="AppendPageMenu" cname="gtk_notebook_append_page_menu">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="GtkWidget*" name="tab_label"/>
+          <parameter type="GtkWidget*" name="menu_label"/>
+        </parameters>
+      </method>
       <method name="InsertPageMenu" cname="gtk_notebook_insert_page_menu">
         <return-type type="void"/>
         <parameters>
@@ -13958,6 +12400,9 @@
           <parameter type="GtkWidget*" name="menu_label"/>
         </parameters>
       </method>
+      <method name="PrevPage" cname="gtk_notebook_prev_page">
+        <return-type type="void"/>
+      </method>
       <method name="SetTabLabelPacking" cname="gtk_notebook_set_tab_label_packing">
         <return-type type="void"/>
         <parameters>
@@ -13967,15 +12412,41 @@
           <parameter type="GtkPackType" name="pack_type"/>
         </parameters>
       </method>
+      <method name="AppendPage" cname="gtk_notebook_append_page">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="GtkWidget*" name="tab_label"/>
+        </parameters>
+      </method>
+      <method name="SetCurrentPage" cname="gtk_notebook_set_current_page">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="page_num"/>
+        </parameters>
+      </method>
       <method name="RemovePage" cname="gtk_notebook_remove_page">
         <return-type type="void"/>
         <parameters>
           <parameter type="gint" name="page_num"/>
         </parameters>
       </method>
+      <method name="SetScrollable" cname="gtk_notebook_set_scrollable">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="scrollable"/>
+        </parameters>
+      </method>
       <method name="PopupDisable" cname="gtk_notebook_popup_disable">
         <return-type type="void"/>
       </method>
+      <method name="SetTabLabel" cname="gtk_notebook_set_tab_label">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="child"/>
+          <parameter type="GtkWidget*" name="tab_label"/>
+        </parameters>
+      </method>
     </object>
     <object name="Object" cname="GtkObject" parent="GObject">
       <field cname="flags" type="guint32"/>
@@ -13986,130 +12457,19 @@
           <parameter type="GtkObject*" name="object"/>
         </parameters>
       </signal>
-      <constructor cname="gtk_object_new">
-        <parameters>
-          <parameter type="GtkType" name="type"/>
-          <parameter type="const-gchar*" name="first_property_name"/>
-          <parameter type="c" name=""/>
-        </parameters>
-      </constructor>
       <method name="Destroy" cname="gtk_object_destroy">
         <return-type type="void"/>
       </method>
       <method name="Sink" cname="gtk_object_sink">
         <return-type type="void"/>
       </method>
-    </object>
-    <object name="OldEditable" cname="GtkOldEditable" parent="GtkWidget">
-      <field cname="current_pos" type="guint"/>
-      <field cname="selection_start_pos" type="guint"/>
-      <field cname="selection_end_pos" type="guint"/>
-      <field cname="has_selection" bits="1" type="guint"/>
-      <field cname="editable" bits="1" type="guint"/>
-      <field cname="visible" bits="1" type="guint"/>
-      <field cname="clipboard_text" type="gchar*"/>
-      <signal name="Activate" cname="activate" when="LAST">
-        <return-type type="void"/>
+      <constructor cname="gtk_object_new">
         <parameters>
-          <parameter type="GtkOldEditable*" name="editable"/>
+          <parameter type="GtkType" name="type"/>
+          <parameter type="const-gchar*" name="first_property_name"/>
+          <parameter type="c"/>
         </parameters>
-      </signal>
-      <signal name="SetEditable" cname="set-editable" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkOldEditable*" name="editable"/>
-          <parameter type="gboolean" name="is_editable"/>
-        </parameters>
-      </signal>
-      <signal name="MoveCursor" cname="move_cursor" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkOldEditable*" name="editable"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-        </parameters>
-      </signal>
-      <signal name="MoveWord" cname="move_word" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkOldEditable*" name="editable"/>
-          <parameter type="gint" name="n"/>
-        </parameters>
-      </signal>
-      <signal name="MovePage" cname="move_page" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkOldEditable*" name="editable"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-        </parameters>
-      </signal>
-      <signal name="MoveToRow" cname="move_to_row" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkOldEditable*" name="editable"/>
-          <parameter type="gint" name="row"/>
-        </parameters>
-      </signal>
-      <signal name="MoveToColumn" cname="move_to_column" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkOldEditable*" name="editable"/>
-          <parameter type="gint" name="row"/>
-        </parameters>
-      </signal>
-      <signal name="KillChar" cname="kill_char" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkOldEditable*" name="editable"/>
-          <parameter type="gint" name="direction"/>
-        </parameters>
-      </signal>
-      <signal name="KillWord" cname="kill_word" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkOldEditable*" name="editable"/>
-          <parameter type="gint" name="direction"/>
-        </parameters>
-      </signal>
-      <signal name="KillLine" cname="kill_line" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkOldEditable*" name="editable"/>
-          <parameter type="gint" name="direction"/>
-        </parameters>
-      </signal>
-      <signal name="ClipboardCut" cname="cut_clipboard" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkOldEditable*" name="editable"/>
-        </parameters>
-      </signal>
-      <signal name="ClipboardCopied" cname="copy_clipboard" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkOldEditable*" name="editable"/>
-        </parameters>
-      </signal>
-      <signal name="ClipboardPasted" cname="paste_clipboard" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkOldEditable*" name="editable"/>
-        </parameters>
-      </signal>
-      <implements>
-        <interface cname="GtkEditable"/>
-      </implements>
-      <method name="Change" cname="gtk_old_editable_changed">
-        <return-type type="void"/>
-      </method>
-      <method name="ClaimSelection" cname="gtk_old_editable_claim_selection">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="claim"/>
-          <parameter type="guint32" name="time"/>
-        </parameters>
-      </method>
+      </constructor>
     </object>
     <object name="OptionMenu" cname="GtkOptionMenu" parent="GtkButton">
       <field cname="menu" type="GtkWidget*"/>
@@ -14129,19 +12489,19 @@
           <parameter type="guint" name="index"/>
         </parameters>
       </method>
-      <method name="GetMenu" cname="gtk_option_menu_get_menu">
-        <return-type type="GtkWidget*"/>
-      </method>
-      <constructor cname="gtk_option_menu_new"/>
       <method name="RemoveMenu" cname="gtk_option_menu_remove_menu">
         <return-type type="void"/>
       </method>
+      <method name="GetMenu" cname="gtk_option_menu_get_menu">
+        <return-type type="GtkWidget*"/>
+      </method>
       <method name="SetMenu" cname="gtk_option_menu_set_menu">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkWidget*" name="menu"/>
         </parameters>
       </method>
+      <constructor cname="gtk_option_menu_new"/>
       <method name="GetHistory" cname="gtk_option_menu_get_history">
         <return-type type="gint"/>
       </method>
@@ -14212,14 +12572,6 @@
           <parameter type="GtkPaned*" name="paned"/>
         </parameters>
       </signal>
-      <method name="ComputePosition" cname="gtk_paned_compute_position">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="allocation"/>
-          <parameter type="gint" name="child1_req"/>
-          <parameter type="gint" name="child2_req"/>
-        </parameters>
-      </method>
       <method name="Add1" cname="gtk_paned_add1">
         <return-type type="void"/>
         <parameters>
@@ -14235,6 +12587,14 @@
       <method name="GetPosition" cname="gtk_paned_get_position">
         <return-type type="gint"/>
       </method>
+      <method name="ComputePosition" cname="gtk_paned_compute_position">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="allocation"/>
+          <parameter type="gint" name="child1_req"/>
+          <parameter type="gint" name="child2_req"/>
+        </parameters>
+      </method>
       <method name="Pack1" cname="gtk_paned_pack1">
         <return-type type="void"/>
         <parameters>
@@ -14258,38 +12618,6 @@
         </parameters>
       </method>
     </object>
-    <object name="Pixmap" cname="GtkPixmap" parent="GtkMisc">
-      <field cname="pixmap" type="GdkPixmap*"/>
-      <field cname="mask" type="GdkBitmap*"/>
-      <field cname="pixmap_insensitive" type="GdkPixmap*"/>
-      <field cname="build_insensitive" bits="1" type="guint"/>
-      <method name="Set" cname="gtk_pixmap_set">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdkPixmap*" name="val"/>
-          <parameter type="GdkBitmap*" name="mask"/>
-        </parameters>
-      </method>
-      <method name="SetBuildInsensitive" cname="gtk_pixmap_set_build_insensitive">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="build"/>
-        </parameters>
-      </method>
-      <constructor cname="gtk_pixmap_new">
-        <parameters>
-          <parameter type="GdkPixmap*" name="pixmap"/>
-          <parameter type="GdkBitmap*" name="mask"/>
-        </parameters>
-      </constructor>
-      <method name="Get" cname="gtk_pixmap_get">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdkPixmap**" name="val"/>
-          <parameter type="GdkBitmap**" name="mask"/>
-        </parameters>
-      </method>
-    </object>
     <object name="Plug" cname="GtkPlug" parent="GtkWindow">
       <field cname="socket_window" type="GdkWindow*"/>
       <field cname="modality_window" type="GtkWidget*"/>
@@ -14317,63 +12645,6 @@
         </parameters>
       </method>
     </object>
-    <object name="Preview" cname="GtkPreview" parent="GtkWidget">
-      <field cname="buffer" type="guchar*"/>
-      <field cname="buffer_width" type="guint16"/>
-      <field cname="buffer_height" type="guint16"/>
-      <field cname="bpp" type="guint16"/>
-      <field cname="rowstride" type="guint16"/>
-      <field cname="dither" type="GdkRgbDither"/>
-      <field cname="type" bits="1" type="guint"/>
-      <field cname="expand" bits="1" type="guint"/>
-      <property name="Expand" cname="expand" type="gboolean" doc-string=" _(Whether the preview widget should take up the entire space it is allocated)" readable="true" writeable="true"/>
-      <method name="DrawRow" cname="gtk_preview_draw_row">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="guchar*" name="data"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint" name="w"/>
-        </parameters>
-      </method>
-      <method name="SetDither" cname="gtk_preview_set_dither">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdkRgbDither" name="dither"/>
-        </parameters>
-      </method>
-      <method name="Put" cname="gtk_preview_put">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdkWindow*" name="window"/>
-          <parameter type="GdkGC*" name="gc"/>
-          <parameter type="gint" name="srcx"/>
-          <parameter type="gint" name="srcy"/>
-          <parameter type="gint" name="destx"/>
-          <parameter type="gint" name="desty"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
-        </parameters>
-      </method>
-      <constructor cname="gtk_preview_new">
-        <parameters>
-          <parameter type="GtkPreviewType" name="type"/>
-        </parameters>
-      </constructor>
-      <method name="SetExpand" cname="gtk_preview_set_expand">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="expand"/>
-        </parameters>
-      </method>
-      <method name="Size" cname="gtk_preview_size">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
-        </parameters>
-      </method>
-    </object>
     <object name="Progress" cname="GtkProgress" parent="GtkWidget">
       <field cname="adjustment" type="GtkAdjustment*"/>
       <field cname="offscreen_pixmap" type="GdkPixmap*"/>
@@ -14407,6 +12678,7 @@
       <property name="Fraction" cname="fraction" type="gdouble" doc-string=" _(The fraction of total work that has been completed)" readable="true" writeable="true"/>
       <property name="PulseStep" cname="pulse_step" type="gdouble" doc-string=" _(The fraction of total progress to move the bouncing block when pulsed)" readable="true" writeable="true"/>
       <property name="Text" cname="text" type="gchar*" doc-string=" _(Text to be displayed in the progress bar)" readable="true" writeable="true"/>
+      <constructor cname="gtk_progress_bar_new"/>
       <method name="GetFraction" cname="gtk_progress_bar_get_fraction">
         <return-type type="gdouble"/>
       </method>
@@ -14419,17 +12691,13 @@
           <parameter type="const-gchar*" name="text"/>
         </parameters>
       </method>
-      <method name="SetFraction" cname="gtk_progress_bar_set_fraction">
+      <method name="SetPulseStep" cname="gtk_progress_bar_set_pulse_step">
         <return-type type="void"/>
         <parameters>
           <parameter type="gdouble" name="fraction"/>
         </parameters>
       </method>
-      <method name="GetText" cname="gtk_progress_bar_get_text">
-        <return-type type="const-gchar*"/>
-      </method>
-      <constructor cname="gtk_progress_bar_new"/>
-      <method name="SetPulseStep" cname="gtk_progress_bar_set_pulse_step">
+      <method name="SetFraction" cname="gtk_progress_bar_set_fraction">
         <return-type type="void"/>
         <parameters>
           <parameter type="gdouble" name="fraction"/>
@@ -14447,6 +12715,9 @@
       <method name="GetOrientation" cname="gtk_progress_bar_get_orientation">
         <return-type type="GtkProgressBarOrientation"/>
       </method>
+      <method name="GetText" cname="gtk_progress_bar_get_text">
+        <return-type type="const-gchar*"/>
+      </method>
     </object>
     <object name="RadioButton" cname="GtkRadioButton" parent="GtkCheckButton">
       <field cname="group" type="GSList*"/>
@@ -14461,6 +12732,15 @@
           <parameter type="GtkRadioButton*" name="group"/>
         </parameters>
       </constructor>
+      <constructor cname="gtk_radio_button_new_with_mnemonic_from_widget">
+        <parameters>
+          <parameter type="GtkRadioButton*" name="group"/>
+          <parameter type="const-gchar*" name="label"/>
+        </parameters>
+      </constructor>
+      <method name="GetGroup" cname="gtk_radio_button_get_group">
+        <return-type type="GSList*"/>
+      </method>
       <constructor cname="gtk_radio_button_new_with_label">
         <parameters>
           <parameter type="GSList*" name="group"/>
@@ -14484,32 +12764,12 @@
           <parameter type="const-gchar*" name="label"/>
         </parameters>
       </constructor>
-      <constructor cname="gtk_radio_button_new_with_mnemonic_from_widget">
-        <parameters>
-          <parameter type="GtkRadioButton*" name="group"/>
-          <parameter type="const-gchar*" name="label"/>
-        </parameters>
-      </constructor>
-      <method name="GetGroup" cname="gtk_radio_button_get_group">
-        <return-type type="GSList*"/>
-      </method>
     </object>
     <object name="RadioMenuItem" cname="GtkRadioMenuItem" parent="GtkCheckMenuItem">
       <field cname="group" type="GSList*"/>
       <method name="GetGroup" cname="gtk_radio_menu_item_get_group">
         <return-type type="GSList*"/>
       </method>
-      <constructor cname="gtk_radio_menu_item_new">
-        <parameters>
-          <parameter type="GSList*" name="group"/>
-        </parameters>
-      </constructor>
-      <method name="SetGroup" cname="gtk_radio_menu_item_set_group">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GSList*" name="group"/>
-        </parameters>
-      </method>
       <constructor cname="gtk_radio_menu_item_new_with_label">
         <parameters>
           <parameter type="GSList*" name="group"/>
@@ -14522,6 +12782,17 @@
           <parameter type="const-gchar*" name="label"/>
         </parameters>
       </constructor>
+      <constructor cname="gtk_radio_menu_item_new">
+        <parameters>
+          <parameter type="GSList*" name="group"/>
+        </parameters>
+      </constructor>
+      <method name="SetGroup" cname="gtk_radio_menu_item_set_group">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GSList*" name="group"/>
+        </parameters>
+      </method>
     </object>
     <object name="Range" cname="GtkRange" parent="GtkWidget">
       <field cname="adjustment" type="GtkAdjustment*"/>
@@ -14571,21 +12842,15 @@
       <property name="UpdatePolicy" cname="update_policy" type="GtkUpdateType" doc-string=" _(How the range should be updated on the screen)" readable="true" writeable="true"/>
       <property name="Adjustment" cname="adjustment" type="GtkAdjustment" doc-string=" _(The GtkAdjustment that contains the current value of this range object)" readable="true" writeable="true" construct-only="true"/>
       <property name="Inverted" cname="inverted" type="gboolean" doc-string=" _(Invert direction slider moves to increase range value)" readable="true" writeable="true"/>
+      <method name="GetAdjustment" cname="gtk_range_get_adjustment">
+        <return-type type="GtkAdjustment*"/>
+      </method>
       <method name="SetAdjustment" cname="gtk_range_set_adjustment">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkAdjustment*" name="adjustment"/>
         </parameters>
       </method>
-      <method name="GetValue" cname="gtk_range_get_value">
-        <return-type type="gdouble"/>
-      </method>
-      <method name="GetInverted" cname="gtk_range_get_inverted">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="GetAdjustment" cname="gtk_range_get_adjustment">
-        <return-type type="GtkAdjustment*"/>
-      </method>
       <method name="SetValue" cname="gtk_range_set_value">
         <return-type type="void"/>
         <parameters>
@@ -14604,6 +12869,9 @@
           <parameter type="GtkUpdateType" name="policy"/>
         </parameters>
       </method>
+      <method name="GetValue" cname="gtk_range_get_value">
+        <return-type type="gdouble"/>
+      </method>
       <method name="SetRange" cname="gtk_range_set_range">
         <return-type type="void"/>
         <parameters>
@@ -14621,6 +12889,9 @@
           <parameter type="gdouble" name="page"/>
         </parameters>
       </method>
+      <method name="GetInverted" cname="gtk_range_get_inverted">
+        <return-type type="gboolean"/>
+      </method>
     </object>
     <object name="RcStyle" cname="GtkRcStyle" parent="GObject">
       <field cname="name" type="gchar*"/>
@@ -14663,21 +12934,6 @@
       <property name="Upper" cname="upper" type="gdouble" doc-string=" _(Upper limit of ruler)" readable="true" writeable="true"/>
       <property name="Position" cname="position" type="gdouble" doc-string=" _(Position of mark on the ruler)" readable="true" writeable="true"/>
       <property name="MaxSize" cname="max_size" type="gdouble" doc-string=" _(Maximum size of the ruler)" readable="true" writeable="true"/>
-      <method name="DrawTicks" cname="gtk_ruler_draw_ticks">
-        <return-type type="void"/>
-      </method>
-      <method name="GetRange" cname="gtk_ruler_get_range">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gdouble*" name="lower"/>
-          <parameter type="gdouble*" name="upper"/>
-          <parameter type="gdouble*" name="position"/>
-          <parameter type="gdouble*" name="max_size"/>
-        </parameters>
-      </method>
-      <method name="GetMetric" cname="gtk_ruler_get_metric">
-        <return-type type="GtkMetricType"/>
-      </method>
       <method name="DrawPos" cname="gtk_ruler_draw_pos">
         <return-type type="void"/>
       </method>
@@ -14696,6 +12952,21 @@
           <parameter type="gdouble" name="max_size"/>
         </parameters>
       </method>
+      <method name="DrawTicks" cname="gtk_ruler_draw_ticks">
+        <return-type type="void"/>
+      </method>
+      <method name="GetRange" cname="gtk_ruler_get_range">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gdouble*" name="lower"/>
+          <parameter type="gdouble*" name="upper"/>
+          <parameter type="gdouble*" name="position"/>
+          <parameter type="gdouble*" name="max_size"/>
+        </parameters>
+      </method>
+      <method name="GetMetric" cname="gtk_ruler_get_metric">
+        <return-type type="GtkMetricType"/>
+      </method>
     </object>
     <object name="Scale" cname="GtkScale" parent="GtkRange">
       <field cname="digits" type="gint"/>
@@ -14711,12 +12982,6 @@
       <property name="Digits" cname="digits" type="gint" doc-string=" _(The number of decimal places that are displayed in the value)" readable="true" writeable="true"/>
       <property name="DrawValue" cname="draw_value" type="gboolean" doc-string=" _(Whether the current value is displayed as a string next to the slider)" readable="true" writeable="true"/>
       <property name="ValuePos" cname="value_pos" type="GtkPositionType" doc-string=" _(The position in which the current value is displayed)" readable="true" writeable="true"/>
-      <method name="GetValuePos" cname="gtk_scale_get_value_pos">
-        <return-type type="GtkPositionType"/>
-      </method>
-      <method name="GetDigits" cname="gtk_scale_get_digits">
-        <return-type type="gint"/>
-      </method>
       <method name="SetDrawValue" cname="gtk_scale_set_draw_value">
         <return-type type="void"/>
         <parameters>
@@ -14735,6 +13000,12 @@
           <parameter type="gint" name="digits"/>
         </parameters>
       </method>
+      <method name="GetValuePos" cname="gtk_scale_get_value_pos">
+        <return-type type="GtkPositionType"/>
+      </method>
+      <method name="GetDigits" cname="gtk_scale_get_digits">
+        <return-type type="gint"/>
+      </method>
       <method name="GetDrawValue" cname="gtk_scale_get_draw_value">
         <return-type type="gboolean"/>
       </method>
@@ -14771,53 +13042,43 @@
           <parameter type="GtkDirectionType" name="direction"/>
         </parameters>
       </signal>
+      <method name="SetPolicy" cname="gtk_scrolled_window_set_policy">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkPolicyType" name="hscrollbar_policy"/>
+          <parameter type="GtkPolicyType" name="vscrollbar_policy"/>
+        </parameters>
+      </method>
       <method name="SetPlacement" cname="gtk_scrolled_window_set_placement">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkCornerType" name="window_placement"/>
         </parameters>
       </method>
+      <method name="SetShadowType" cname="gtk_scrolled_window_set_shadow_type">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkShadowType" name="type"/>
+        </parameters>
+      </method>
       <method name="SetHadjustment" cname="gtk_scrolled_window_set_hadjustment">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkAdjustment*" name="hadjustment"/>
         </parameters>
       </method>
+      <method name="SetVadjustment" cname="gtk_scrolled_window_set_vadjustment">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkAdjustment*" name="hadjustment"/>
+        </parameters>
+      </method>
       <method name="AddWithViewport" cname="gtk_scrolled_window_add_with_viewport">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkWidget*" name="child"/>
         </parameters>
       </method>
-      <method name="GetHadjustment" cname="gtk_scrolled_window_get_hadjustment">
-        <return-type type="GtkAdjustment*"/>
-      </method>
-      <method name="GetPolicy" cname="gtk_scrolled_window_get_policy">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkPolicyType*" name="hscrollbar_policy"/>
-          <parameter type="GtkPolicyType*" name="vscrollbar_policy"/>
-        </parameters>
-      </method>
-      <method name="SetPolicy" cname="gtk_scrolled_window_set_policy">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkPolicyType" name="hscrollbar_policy"/>
-          <parameter type="GtkPolicyType" name="vscrollbar_policy"/>
-        </parameters>
-      </method>
-      <method name="SetShadowType" cname="gtk_scrolled_window_set_shadow_type">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkShadowType" name="type"/>
-        </parameters>
-      </method>
-      <method name="SetVadjustment" cname="gtk_scrolled_window_set_vadjustment">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkAdjustment*" name="hadjustment"/>
-        </parameters>
-      </method>
       <method name="GetShadowType" cname="gtk_scrolled_window_get_shadow_type">
         <return-type type="GtkShadowType"/>
       </method>
@@ -14830,6 +13091,16 @@
           <parameter type="GtkAdjustment*" name="vadjustment"/>
         </parameters>
       </constructor>
+      <method name="GetHadjustment" cname="gtk_scrolled_window_get_hadjustment">
+        <return-type type="GtkAdjustment*"/>
+      </method>
+      <method name="GetPolicy" cname="gtk_scrolled_window_get_policy">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkPolicyType*" name="hscrollbar_policy"/>
+          <parameter type="GtkPolicyType*" name="vscrollbar_policy"/>
+        </parameters>
+      </method>
       <method name="GetVadjustment" cname="gtk_scrolled_window_get_vadjustment">
         <return-type type="GtkAdjustment*"/>
       </method>
@@ -14850,13 +13121,6 @@
           <parameter type="const-gchar*" name="origin"/>
         </parameters>
       </method>
-      <method name="SetPropertyValue" cname="gtk_settings_set_property_value">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-gchar*" name="name"/>
-          <parameter type="const-GtkSettingsValue*" name="svalue"/>
-        </parameters>
-      </method>
       <method name="SetStringProperty" cname="gtk_settings_set_string_property">
         <return-type type="void"/>
         <parameters>
@@ -14873,6 +13137,13 @@
           <parameter type="const-gchar*" name="origin"/>
         </parameters>
       </method>
+      <method name="SetPropertyValue" cname="gtk_settings_set_property_value">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="const-gchar*" name="name"/>
+          <parameter type="const-GtkSettingsValue*" name="svalue"/>
+        </parameters>
+      </method>
     </object>
     <object name="SizeGroup" cname="GtkSizeGroup" parent="GObject">
       <field cname="widgets" type="GSList*"/>
@@ -14884,12 +13155,6 @@
       <method name="GetMode" cname="gtk_size_group_get_mode">
         <return-type type="GtkSizeGroupMode"/>
       </method>
-      <method name="AddWidget" cname="gtk_size_group_add_widget">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-        </parameters>
-      </method>
       <method name="RemoveWidget" cname="gtk_size_group_remove_widget">
         <return-type type="void"/>
         <parameters>
@@ -14902,6 +13167,12 @@
           <parameter type="GtkSizeGroupMode" name="mode"/>
         </parameters>
       </method>
+      <method name="AddWidget" cname="gtk_size_group_add_widget">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="widget"/>
+        </parameters>
+      </method>
       <constructor cname="gtk_size_group_new">
         <parameters>
           <parameter type="GtkSizeGroupMode" name="mode"/>
@@ -15008,18 +13279,63 @@
           <parameter type="gboolean" name="numeric"/>
         </parameters>
       </method>
+      <method name="SetSnapToTicks" cname="gtk_spin_button_set_snap_to_ticks">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="snap_to_ticks"/>
+        </parameters>
+      </method>
+      <method name="GetValueAsInt" cname="gtk_spin_button_get_value_as_int">
+        <return-type type="gint"/>
+      </method>
+      <method name="GetUpdatePolicy" cname="gtk_spin_button_get_update_policy">
+        <return-type type="GtkSpinButtonUpdatePolicy"/>
+      </method>
+      <method name="SetValue" cname="gtk_spin_button_set_value">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gdouble" name="value"/>
+        </parameters>
+      </method>
       <method name="GetAdjustment" cname="gtk_spin_button_get_adjustment">
         <return-type type="GtkAdjustment*"/>
       </method>
+      <method name="SetAdjustment" cname="gtk_spin_button_set_adjustment">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkAdjustment*" name="adjustment"/>
+        </parameters>
+      </method>
       <method name="GetValue" cname="gtk_spin_button_get_value">
         <return-type type="gdouble"/>
       </method>
+      <method name="SetRange" cname="gtk_spin_button_set_range">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gdouble" name="min"/>
+          <parameter type="gdouble" name="max"/>
+        </parameters>
+      </method>
+      <method name="GetWrap" cname="gtk_spin_button_get_wrap">
+        <return-type type="gboolean"/>
+      </method>
+      <method name="GetSnapToTicks" cname="gtk_spin_button_get_snap_to_ticks">
+        <return-type type="gboolean"/>
+      </method>
       <method name="SetDigits" cname="gtk_spin_button_set_digits">
         <return-type type="void"/>
         <parameters>
           <parameter type="guint" name="digits"/>
         </parameters>
       </method>
+      <method name="Configure" cname="gtk_spin_button_configure">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkAdjustment*" name="adjustment"/>
+          <parameter type="gdouble" name="climb_rate"/>
+          <parameter type="guint" name="digits"/>
+        </parameters>
+      </method>
       <method name="GetRange" cname="gtk_spin_button_get_range">
         <return-type type="void"/>
         <parameters>
@@ -15027,12 +13343,25 @@
           <parameter type="gdouble*" name="max"/>
         </parameters>
       </method>
+      <method name="GetNumeric" cname="gtk_spin_button_get_numeric">
+        <return-type type="gboolean"/>
+      </method>
+      <method name="Update" cname="gtk_spin_button_update">
+        <return-type type="void"/>
+      </method>
       <method name="SetUpdatePolicy" cname="gtk_spin_button_set_update_policy">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkSpinButtonUpdatePolicy" name="policy"/>
         </parameters>
       </method>
+      <method name="GetIncrements" cname="gtk_spin_button_get_increments">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gdouble*" name="step"/>
+          <parameter type="gdouble*" name="page"/>
+        </parameters>
+      </method>
       <method name="SetWrap" cname="gtk_spin_button_set_wrap">
         <return-type type="void"/>
         <parameters>
@@ -15067,64 +13396,6 @@
           <parameter type="gdouble" name="page"/>
         </parameters>
       </method>
-      <method name="SetSnapToTicks" cname="gtk_spin_button_set_snap_to_ticks">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="snap_to_ticks"/>
-        </parameters>
-      </method>
-      <method name="GetValueAsInt" cname="gtk_spin_button_get_value_as_int">
-        <return-type type="gint"/>
-      </method>
-      <method name="GetUpdatePolicy" cname="gtk_spin_button_get_update_policy">
-        <return-type type="GtkSpinButtonUpdatePolicy"/>
-      </method>
-      <method name="SetValue" cname="gtk_spin_button_set_value">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gdouble" name="value"/>
-        </parameters>
-      </method>
-      <method name="SetAdjustment" cname="gtk_spin_button_set_adjustment">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment"/>
-        </parameters>
-      </method>
-      <method name="SetRange" cname="gtk_spin_button_set_range">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gdouble" name="min"/>
-          <parameter type="gdouble" name="max"/>
-        </parameters>
-      </method>
-      <method name="GetWrap" cname="gtk_spin_button_get_wrap">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="GetSnapToTicks" cname="gtk_spin_button_get_snap_to_ticks">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="Configure" cname="gtk_spin_button_configure">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment"/>
-          <parameter type="gdouble" name="climb_rate"/>
-          <parameter type="guint" name="digits"/>
-        </parameters>
-      </method>
-      <method name="GetNumeric" cname="gtk_spin_button_get_numeric">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="Update" cname="gtk_spin_button_update">
-        <return-type type="void"/>
-      </method>
-      <method name="GetIncrements" cname="gtk_spin_button_get_increments">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gdouble*" name="step"/>
-          <parameter type="gdouble*" name="page"/>
-        </parameters>
-      </method>
     </object>
     <object name="Statusbar" cname="GtkStatusbar" parent="GtkHBox">
       <field cname="frame" type="GtkWidget*"/>
@@ -15151,13 +13422,6 @@
           <parameter type="const-gchar*" name="text"/>
         </parameters>
       </signal>
-      <constructor cname="gtk_statusbar_new"/>
-      <method name="GetContextId" cname="gtk_statusbar_get_context_id">
-        <return-type type="guint"/>
-        <parameters>
-          <parameter type="const-gchar*" name="context_description"/>
-        </parameters>
-      </method>
       <method name="GetHasResizeGrip" cname="gtk_statusbar_get_has_resize_grip">
         <return-type type="gboolean"/>
       </method>
@@ -15167,6 +13431,7 @@
           <parameter type="gboolean" name="setting"/>
         </parameters>
       </method>
+      <constructor cname="gtk_statusbar_new"/>
       <method name="Push" cname="gtk_statusbar_push">
         <return-type type="guint"/>
         <parameters>
@@ -15180,6 +13445,12 @@
           <parameter type="guint" name="context_id"/>
         </parameters>
       </method>
+      <method name="GetContextId" cname="gtk_statusbar_get_context_id">
+        <return-type type="guint"/>
+        <parameters>
+          <parameter type="const-gchar*" name="context_description"/>
+        </parameters>
+      </method>
       <method name="Remove" cname="gtk_statusbar_remove">
         <return-type type="void"/>
         <parameters>
@@ -15240,6 +13511,9 @@
           <parameter type="GtkStateType" name="state_type"/>
         </parameters>
       </method>
+      <method name="Detach" cname="gtk_style_detach">
+        <return-type type="void"/>
+      </method>
       <method name="LookupIconSet" cname="gtk_style_lookup_icon_set">
         <return-type type="GtkIconSet*"/>
         <parameters>
@@ -15259,13 +13533,10 @@
           <parameter type="gint" name="height"/>
         </parameters>
       </method>
+      <constructor cname="gtk_style_new"/>
       <method name="Copy" cname="gtk_style_copy">
         <return-type type="GtkStyle*"/>
       </method>
-      <constructor cname="gtk_style_new"/>
-      <method name="Detach" cname="gtk_style_detach">
-        <return-type type="void"/>
-      </method>
       <method name="Attach" cname="gtk_style_attach">
         <return-type type="GtkStyle*"/>
         <parameters>
@@ -15287,9 +13558,37 @@
       <property name="RowSpacing" cname="row_spacing" type="guint" doc-string=" _(The amount of space between two consecutive rows)" readable="true" writeable="true"/>
       <property name="ColumnSpacing" cname="column_spacing" type="guint" doc-string=" _(The amount of space between two consecutive columns)" readable="true" writeable="true"/>
       <property name="Homogeneous" cname="homogeneous" type="gboolean" doc-string=" _(If TRUE this means the table cells are all the same width/height)" readable="true" writeable="true"/>
+      <method name="SetHomogeneous" cname="gtk_table_set_homogeneous">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="homogeneous"/>
+        </parameters>
+      </method>
+      <method name="SetRowSpacings" cname="gtk_table_set_row_spacings">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="guint" name="spacing"/>
+        </parameters>
+      </method>
       <method name="GetDefaultColSpacing" cname="gtk_table_get_default_col_spacing">
         <return-type type="guint"/>
       </method>
+      <method name="SetRowSpacing" cname="gtk_table_set_row_spacing">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="guint" name="row"/>
+          <parameter type="guint" name="spacing"/>
+        </parameters>
+      </method>
+      <method name="GetHomogeneous" cname="gtk_table_get_homogeneous">
+        <return-type type="gboolean"/>
+      </method>
+      <method name="GetRowSpacing" cname="gtk_table_get_row_spacing">
+        <return-type type="guint"/>
+        <parameters>
+          <parameter type="guint" name="row"/>
+        </parameters>
+      </method>
       <method name="SetColSpacing" cname="gtk_table_set_col_spacing">
         <return-type type="void"/>
         <parameters>
@@ -15334,43 +13633,15 @@
           <parameter type="guint" name="column"/>
         </parameters>
       </method>
-      <method name="GetDefaultRowSpacing" cname="gtk_table_get_default_row_spacing">
-        <return-type type="guint"/>
-      </method>
-      <method name="SetHomogeneous" cname="gtk_table_set_homogeneous">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="homogeneous"/>
-        </parameters>
-      </method>
-      <method name="SetRowSpacings" cname="gtk_table_set_row_spacings">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="guint" name="spacing"/>
-        </parameters>
-      </method>
-      <method name="SetRowSpacing" cname="gtk_table_set_row_spacing">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="guint" name="row"/>
-          <parameter type="guint" name="spacing"/>
-        </parameters>
-      </method>
-      <method name="GetHomogeneous" cname="gtk_table_get_homogeneous">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="GetRowSpacing" cname="gtk_table_get_row_spacing">
-        <return-type type="guint"/>
-        <parameters>
-          <parameter type="guint" name="row"/>
-        </parameters>
-      </method>
       <method name="SetColSpacings" cname="gtk_table_set_col_spacings">
         <return-type type="void"/>
         <parameters>
           <parameter type="guint" name="spacing"/>
         </parameters>
       </method>
+      <method name="GetDefaultRowSpacing" cname="gtk_table_get_default_row_spacing">
+        <return-type type="guint"/>
+      </method>
       <method name="Resize" cname="gtk_table_resize">
         <return-type type="void"/>
         <parameters>
@@ -15383,138 +13654,6 @@
       <field cname="torn_off" bits="1" type="guint"/>
       <constructor cname="gtk_tearoff_menu_item_new"/>
     </object>
-    <object name="Text" cname="GtkText" parent="GtkOldEditable">
-      <field cname="text_area" type="GdkWindow*"/>
-      <field cname="hadj" type="GtkAdjustment*"/>
-      <field cname="vadj" type="GtkAdjustment*"/>
-      <field cname="gc" type="GdkGC*"/>
-      <field cname="line_wrap_bitmap" type="GdkPixmap*"/>
-      <field cname="line_arrow_bitmap" type="GdkPixmap*"/>
-      <field cname="{ GdkWChar* wc" type="union"/>
-      <field cname="ch" type="guchar*"/>
-      <field cname="text" type="}"/>
-      <field cname="text_len" type="guint"/>
-      <field cname="gap_position" type="guint"/>
-      <field cname="gap_size" type="guint"/>
-      <field cname="text_end" type="guint"/>
-      <field cname="line_start_cache" type="GList*"/>
-      <field cname="first_line_start_index" type="guint"/>
-      <field cname="first_cut_pixels" type="guint"/>
-      <field cname="first_onscreen_hor_pixel" type="guint"/>
-      <field cname="first_onscreen_ver_pixel" type="guint"/>
-      <field cname="line_wrap" bits="1" type="guint"/>
-      <field cname="word_wrap" bits="1" type="guint"/>
-      <field cname="use_wchar" bits="1" type="guint"/>
-      <field cname="freeze_count" type="guint"/>
-      <field cname="text_properties" type="GList*"/>
-      <field cname="text_properties_end" type="GList*"/>
-      <field cname="point" type="GtkPropertyMark"/>
-      <field cname="{ GdkWChar* wc" type="union"/>
-      <field cname="ch" type="guchar*"/>
-      <field cname="scratch_buffer" type="}"/>
-      <field cname="scratch_buffer_len" type="guint"/>
-      <field cname="last_ver_value" type="gint"/>
-      <field cname="cursor_pos_x" type="gint"/>
-      <field cname="cursor_pos_y" type="gint"/>
-      <field cname="cursor_mark" type="GtkPropertyMark"/>
-      <field cname="cursor_char" type="GdkWChar"/>
-      <field cname="cursor_char_offset" type="gchar"/>
-      <field cname="cursor_virtual_x" type="gint"/>
-      <field cname="cursor_drawn_level" type="gint"/>
-      <field cname="current_line" type="GList*"/>
-      <field cname="tab_stops" type="GList*"/>
-      <field cname="default_tab_width" type="gint"/>
-      <field cname="current_font" type="GtkTextFont*"/>
-      <field cname="timer" type="gint"/>
-      <field cname="button" type="guint"/>
-      <field cname="bg_gc" type="GdkGC*"/>
-      <property name="Hadjustment" cname="hadjustment" type="GtkAdjustment" doc-string=" _(Horizontal adjustment for the text widget)" readable="true" writeable="true"/>
-      <property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" doc-string=" _(Vertical adjustment for the text widget)" readable="true" writeable="true"/>
-      <property name="LineWrap" cname="line_wrap" type="gboolean" doc-string=" _(Whether lines are wrapped at widget edges)" readable="true" writeable="true"/>
-      <property name="WordWrap" cname="word_wrap" type="gboolean" doc-string=" _(Whether words are wrapped at widget edges)" readable="true" writeable="true"/>
-      <signal name="SetScrollAdjustments" cname="set_scroll_adjustments" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkText*" name="text"/>
-          <parameter type="GtkAdjustment*" name="hadjustment"/>
-          <parameter type="GtkAdjustment*" name="vadjustment"/>
-        </parameters>
-      </signal>
-      <implements>
-        <interface cname="GtkEditable"/>
-      </implements>
-      <method name="BackwardDelete" cname="gtk_text_backward_delete">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="guint" name="nchars"/>
-        </parameters>
-      </method>
-      <method name="SetPoint" cname="gtk_text_set_point">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="guint" name="index"/>
-        </parameters>
-      </method>
-      <method name="Thaw" cname="gtk_text_thaw">
-        <return-type type="void"/>
-      </method>
-      <method name="Insert" cname="gtk_text_insert">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdkFont*" name="font"/>
-          <parameter type="GdkColor*" name="fore"/>
-          <parameter type="GdkColor*" name="back"/>
-          <parameter type="const-char*" name="chars"/>
-          <parameter type="gint" name="length"/>
-        </parameters>
-      </method>
-      <method name="GetLength" cname="gtk_text_get_length">
-        <return-type type="guint"/>
-      </method>
-      <constructor cname="gtk_text_new">
-        <parameters>
-          <parameter type="GtkAdjustment*" name="hadj"/>
-          <parameter type="GtkAdjustment*" name="vadj"/>
-        </parameters>
-      </constructor>
-      <method name="ForwardDelete" cname="gtk_text_forward_delete">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="guint" name="nchars"/>
-        </parameters>
-      </method>
-      <method name="Freeze" cname="gtk_text_freeze">
-        <return-type type="void"/>
-      </method>
-      <method name="SetWordWrap" cname="gtk_text_set_word_wrap">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="word_wrap"/>
-        </parameters>
-      </method>
-      <method name="SetLineWrap" cname="gtk_text_set_line_wrap">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="line_wrap"/>
-        </parameters>
-      </method>
-      <method name="SetEditable" cname="gtk_text_set_editable">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="editable"/>
-        </parameters>
-      </method>
-      <method name="GetPoint" cname="gtk_text_get_point">
-        <return-type type="guint"/>
-      </method>
-      <method name="SetAdjustments" cname="gtk_text_set_adjustments">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkAdjustment*" name="hadj"/>
-          <parameter type="GtkAdjustment*" name="vadj"/>
-        </parameters>
-      </method>
-    </object>
     <object name="TextBuffer" cname="GtkTextBuffer" parent="GObject">
       <field cname="tag_table" type="GtkTextTagTable*"/>
       <field cname="btree" type="GtkTextBTree*"/>
@@ -15623,9 +13762,23 @@
           <parameter type="const-GtkTextIter*" name="end"/>
         </parameters>
       </method>
+      <method name="GetIterAtLine" cname="gtk_text_buffer_get_iter_at_line">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTextIter*" name="iter" pass_as="out"/>
+          <parameter type="gint" name="line_number"/>
+        </parameters>
+      </method>
       <method name="GetCharCount" cname="gtk_text_buffer_get_char_count">
         <return-type type="gint"/>
       </method>
+      <method name="Delete" cname="gtk_text_buffer_delete">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTextIter*" name="start"/>
+          <parameter type="GtkTextIter*" name="end"/>
+        </parameters>
+      </method>
       <method name="SetText" cname="gtk_text_buffer_set_text">
         <return-type type="void"/>
         <parameters>
@@ -15655,148 +13808,6 @@
           <parameter type="const-GtkTextIter*" name="end"/>
         </parameters>
       </method>
-      <method name="GetModified" cname="gtk_text_buffer_get_modified">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="BeginUserAction" cname="gtk_text_buffer_begin_user_action">
-        <return-type type="void"/>
-      </method>
-      <constructor cname="gtk_text_buffer_new">
-        <parameters>
-          <parameter type="GtkTextTagTable*" name="table"/>
-        </parameters>
-      </constructor>
-      <method name="DeleteInteractive" cname="gtk_text_buffer_delete_interactive">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkTextIter*" name="start_iter"/>
-          <parameter type="GtkTextIter*" name="end_iter"/>
-          <parameter type="gboolean" name="default_editable"/>
-        </parameters>
-      </method>
-      <method name="GetBounds" cname="gtk_text_buffer_get_bounds">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTextIter*" name="start" pass_as="out"/>
-          <parameter type="GtkTextIter*" name="end" pass_as="out"/>
-        </parameters>
-      </method>
-      <method name="DeleteMark" cname="gtk_text_buffer_delete_mark">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTextMark*" name="mark"/>
-        </parameters>
-      </method>
-      <method name="GetSelectionBound" cname="gtk_text_buffer_get_selection_bound">
-        <return-type type="GtkTextMark*"/>
-      </method>
-      <method name="CreateMark" cname="gtk_text_buffer_create_mark">
-        <return-type type="GtkTextMark*"/>
-        <parameters>
-          <parameter type="const-gchar*" name="mark_name"/>
-          <parameter type="const-GtkTextIter*" name="where"/>
-          <parameter type="gboolean" name="left_gravity"/>
-        </parameters>
-      </method>
-      <method name="ApplyTag" cname="gtk_text_buffer_apply_tag">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTextTag*" name="tag"/>
-          <parameter type="const-GtkTextIter*" name="start"/>
-          <parameter type="const-GtkTextIter*" name="end"/>
-        </parameters>
-      </method>
-      <method name="RemoveTagByName" cname="gtk_text_buffer_remove_tag_by_name">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-gchar*" name="name"/>
-          <parameter type="const-GtkTextIter*" name="start"/>
-          <parameter type="const-GtkTextIter*" name="end"/>
-        </parameters>
-      </method>
-      <method name="CopyClipboard" cname="gtk_text_buffer_copy_clipboard">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkClipboard*" name="clipboard"/>
-        </parameters>
-      </method>
-      <method name="RemoveSelectionClipboard" cname="gtk_text_buffer_remove_selection_clipboard">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkClipboard*" name="clipboard"/>
-        </parameters>
-      </method>
-      <method name="RemoveTag" cname="gtk_text_buffer_remove_tag">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTextTag*" name="tag"/>
-          <parameter type="const-GtkTextIter*" name="start"/>
-          <parameter type="const-GtkTextIter*" name="end"/>
-        </parameters>
-      </method>
-      <method name="SetModified" cname="gtk_text_buffer_set_modified">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="setting"/>
-        </parameters>
-      </method>
-      <method name="GetSelectionBounds" cname="gtk_text_buffer_get_selection_bounds">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkTextIter*" name="start" pass_as="out"/>
-          <parameter type="GtkTextIter*" name="end" pass_as="out"/>
-        </parameters>
-      </method>
-      <method name="GetText" cname="gtk_text_buffer_get_text">
-        <return-type type="gchar*"/>
-        <parameters>
-          <parameter type="const-GtkTextIter*" name="start"/>
-          <parameter type="const-GtkTextIter*" name="end"/>
-          <parameter type="gboolean" name="include_hidden_chars"/>
-        </parameters>
-      </method>
-      <method name="GetIterAtMark" cname="gtk_text_buffer_get_iter_at_mark">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTextIter*" name="iter" pass_as="out"/>
-          <parameter type="GtkTextMark*" name="mark"/>
-        </parameters>
-      </method>
-      <method name="PasteClipboard" cname="gtk_text_buffer_paste_clipboard">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkClipboard*" name="clipboard"/>
-          <parameter type="GtkTextIter*" name="override_location"/>
-          <parameter type="gboolean" name="default_editable"/>
-        </parameters>
-      </method>
-      <method name="GetLineCount" cname="gtk_text_buffer_get_line_count">
-        <return-type type="gint"/>
-      </method>
-      <method name="GetTagTable" cname="gtk_text_buffer_get_tag_table">
-        <return-type type="GtkTextTagTable*"/>
-      </method>
-      <method name="GetIterAtOffset" cname="gtk_text_buffer_get_iter_at_offset">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTextIter*" name="iter" pass_as="out"/>
-          <parameter type="gint" name="char_offset"/>
-        </parameters>
-      </method>
-      <method name="GetIterAtLine" cname="gtk_text_buffer_get_iter_at_line">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTextIter*" name="iter" pass_as="out"/>
-          <parameter type="gint" name="line_number"/>
-        </parameters>
-      </method>
-      <method name="Delete" cname="gtk_text_buffer_delete">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTextIter*" name="start"/>
-          <parameter type="GtkTextIter*" name="end"/>
-        </parameters>
-      </method>
       <method name="DeleteSelection" cname="gtk_text_buffer_delete_selection">
         <return-type type="gboolean"/>
         <parameters>
@@ -15813,6 +13824,9 @@
           <parameter type="gboolean" name="default_editable"/>
         </parameters>
       </method>
+      <method name="GetModified" cname="gtk_text_buffer_get_modified">
+        <return-type type="gboolean"/>
+      </method>
       <method name="DeleteMarkByName" cname="gtk_text_buffer_delete_mark_by_name">
         <return-type type="void"/>
         <parameters>
@@ -15825,6 +13839,9 @@
           <parameter type="GtkTextIter*" name="iter" pass_as="out"/>
         </parameters>
       </method>
+      <method name="BeginUserAction" cname="gtk_text_buffer_begin_user_action">
+        <return-type type="void"/>
+      </method>
       <method name="MoveMark" cname="gtk_text_buffer_move_mark">
         <return-type type="void"/>
         <parameters>
@@ -15832,6 +13849,19 @@
           <parameter type="const-GtkTextIter*" name="where"/>
         </parameters>
       </method>
+      <constructor cname="gtk_text_buffer_new">
+        <parameters>
+          <parameter type="GtkTextTagTable*" name="table"/>
+        </parameters>
+      </constructor>
+      <method name="DeleteInteractive" cname="gtk_text_buffer_delete_interactive">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkTextIter*" name="start_iter"/>
+          <parameter type="GtkTextIter*" name="end_iter"/>
+          <parameter type="gboolean" name="default_editable"/>
+        </parameters>
+      </method>
       <method name="Insert" cname="gtk_text_buffer_insert">
         <return-type type="void"/>
         <parameters>
@@ -15840,6 +13870,19 @@
           <parameter type="gint" name="len"/>
         </parameters>
       </method>
+      <method name="GetBounds" cname="gtk_text_buffer_get_bounds">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTextIter*" name="start" pass_as="out"/>
+          <parameter type="GtkTextIter*" name="end" pass_as="out"/>
+        </parameters>
+      </method>
+      <method name="DeleteMark" cname="gtk_text_buffer_delete_mark">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTextMark*" name="mark"/>
+        </parameters>
+      </method>
       <method name="CreateChildAnchor" cname="gtk_text_buffer_create_child_anchor">
         <return-type type="GtkTextChildAnchor*"/>
         <parameters>
@@ -15869,15 +13912,42 @@
           <parameter type="gint" name="byte_index"/>
         </parameters>
       </method>
+      <method name="GetSelectionBound" cname="gtk_text_buffer_get_selection_bound">
+        <return-type type="GtkTextMark*"/>
+      </method>
+      <method name="CreateMark" cname="gtk_text_buffer_create_mark">
+        <return-type type="GtkTextMark*"/>
+        <parameters>
+          <parameter type="const-gchar*" name="mark_name"/>
+          <parameter type="const-GtkTextIter*" name="where"/>
+          <parameter type="gboolean" name="left_gravity"/>
+        </parameters>
+      </method>
       <method name="EndUserAction" cname="gtk_text_buffer_end_user_action">
         <return-type type="void"/>
       </method>
+      <method name="ApplyTag" cname="gtk_text_buffer_apply_tag">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTextTag*" name="tag"/>
+          <parameter type="const-GtkTextIter*" name="start"/>
+          <parameter type="const-GtkTextIter*" name="end"/>
+        </parameters>
+      </method>
       <method name="PlaceCursor" cname="gtk_text_buffer_place_cursor">
         <return-type type="void"/>
         <parameters>
           <parameter type="const-GtkTextIter*" name="where"/>
         </parameters>
       </method>
+      <method name="RemoveTagByName" cname="gtk_text_buffer_remove_tag_by_name">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="const-gchar*" name="name"/>
+          <parameter type="const-GtkTextIter*" name="start"/>
+          <parameter type="const-GtkTextIter*" name="end"/>
+        </parameters>
+      </method>
       <method name="GetEndIter" cname="gtk_text_buffer_get_end_iter">
         <return-type type="void"/>
         <parameters>
@@ -15898,7 +13968,7 @@
           <parameter type="const-gchar*" name="text"/>
           <parameter type="gint" name="len"/>
           <parameter type="GtkTextTag*" name="first_tag"/>
-          <parameter type="G" name=""/>
+          <parameter type="G"/>
         </parameters>
       </method>
       <method name="GetSlice" cname="gtk_text_buffer_get_slice">
@@ -15909,6 +13979,12 @@
           <parameter type="gboolean" name="include_hidden_chars"/>
         </parameters>
       </method>
+      <method name="CopyClipboard" cname="gtk_text_buffer_copy_clipboard">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkClipboard*" name="clipboard"/>
+        </parameters>
+      </method>
       <method name="InsertAtCursor" cname="gtk_text_buffer_insert_at_cursor">
         <return-type type="void"/>
         <parameters>
@@ -15916,12 +13992,47 @@
           <parameter type="gint" name="len"/>
         </parameters>
       </method>
+      <method name="RemoveSelectionClipboard" cname="gtk_text_buffer_remove_selection_clipboard">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkClipboard*" name="clipboard"/>
+        </parameters>
+      </method>
+      <method name="RemoveTag" cname="gtk_text_buffer_remove_tag">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTextTag*" name="tag"/>
+          <parameter type="const-GtkTextIter*" name="start"/>
+          <parameter type="const-GtkTextIter*" name="end"/>
+        </parameters>
+      </method>
+      <method name="SetModified" cname="gtk_text_buffer_set_modified">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="setting"/>
+        </parameters>
+      </method>
+      <method name="GetSelectionBounds" cname="gtk_text_buffer_get_selection_bounds">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkTextIter*" name="start" pass_as="out"/>
+          <parameter type="GtkTextIter*" name="end" pass_as="out"/>
+        </parameters>
+      </method>
       <method name="CreateTag" cname="gtk_text_buffer_create_tag">
         <return-type type="GtkTextTag*"/>
         <parameters>
           <parameter type="const-gchar*" name="tag_name"/>
           <parameter type="const-gchar*" name="first_property_name"/>
-          <parameter type="c" name=""/>
+          <parameter type="c"/>
+        </parameters>
+      </method>
+      <method name="GetText" cname="gtk_text_buffer_get_text">
+        <return-type type="gchar*"/>
+        <parameters>
+          <parameter type="const-GtkTextIter*" name="start"/>
+          <parameter type="const-GtkTextIter*" name="end"/>
+          <parameter type="gboolean" name="include_hidden_chars"/>
         </parameters>
       </method>
       <method name="MoveMarkByName" cname="gtk_text_buffer_move_mark_by_name">
@@ -15931,12 +14042,27 @@
           <parameter type="const-GtkTextIter*" name="where"/>
         </parameters>
       </method>
+      <method name="GetIterAtMark" cname="gtk_text_buffer_get_iter_at_mark">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTextIter*" name="iter" pass_as="out"/>
+          <parameter type="GtkTextMark*" name="mark"/>
+        </parameters>
+      </method>
       <method name="GetMark" cname="gtk_text_buffer_get_mark">
         <return-type type="GtkTextMark*"/>
         <parameters>
           <parameter type="const-gchar*" name="name"/>
         </parameters>
       </method>
+      <method name="PasteClipboard" cname="gtk_text_buffer_paste_clipboard">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkClipboard*" name="clipboard"/>
+          <parameter type="GtkTextIter*" name="override_location"/>
+          <parameter type="gboolean" name="default_editable"/>
+        </parameters>
+      </method>
       <method name="InsertPixbuf" cname="gtk_text_buffer_insert_pixbuf">
         <return-type type="void"/>
         <parameters>
@@ -15960,7 +14086,20 @@
           <parameter type="const-gchar*" name="text"/>
           <parameter type="gint" name="len"/>
           <parameter type="const-gchar*" name="first_tag_name"/>
-          <parameter type="c" name=""/>
+          <parameter type="c"/>
+        </parameters>
+      </method>
+      <method name="GetLineCount" cname="gtk_text_buffer_get_line_count">
+        <return-type type="gint"/>
+      </method>
+      <method name="GetTagTable" cname="gtk_text_buffer_get_tag_table">
+        <return-type type="GtkTextTagTable*"/>
+      </method>
+      <method name="GetIterAtOffset" cname="gtk_text_buffer_get_iter_at_offset">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTextIter*" name="iter" pass_as="out"/>
+          <parameter type="gint" name="char_offset"/>
         </parameters>
       </method>
       <method name="InsertInteractiveAtCursor" cname="gtk_text_buffer_insert_interactive_at_cursor">
@@ -15991,21 +14130,21 @@
     </object>
     <object name="TextMark" cname="GtkTextMark" parent="GObject">
       <field cname="segment" type="gpointer"/>
+      <method name="GetBuffer" cname="gtk_text_mark_get_buffer">
+        <return-type type="GtkTextBuffer*"/>
+      </method>
       <method name="GetName" cname="gtk_text_mark_get_name">
         <return-type type="const-gchar*"/>
       </method>
+      <method name="GetVisible" cname="gtk_text_mark_get_visible">
+        <return-type type="gboolean"/>
+      </method>
       <method name="GetLeftGravity" cname="gtk_text_mark_get_left_gravity">
         <return-type type="gboolean"/>
       </method>
       <method name="GetDeleted" cname="gtk_text_mark_get_deleted">
         <return-type type="gboolean"/>
       </method>
-      <method name="GetBuffer" cname="gtk_text_mark_get_buffer">
-        <return-type type="GtkTextBuffer*"/>
-      </method>
-      <method name="GetVisible" cname="gtk_text_mark_get_visible">
-        <return-type type="gboolean"/>
-      </method>
       <method name="SetVisible" cname="gtk_text_mark_set_visible">
         <return-type type="void"/>
         <parameters>
@@ -16090,6 +14229,12 @@
           <parameter type="const-gchar*" name="name"/>
         </parameters>
       </constructor>
+      <method name="SetPriority" cname="gtk_text_tag_set_priority">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="priority"/>
+        </parameters>
+      </method>
       <method name="GetPriority" cname="gtk_text_tag_get_priority">
         <return-type type="gint"/>
       </method>
@@ -16101,12 +14246,6 @@
           <parameter type="const-GtkTextIter*" name="iter"/>
         </parameters>
       </method>
-      <method name="SetPriority" cname="gtk_text_tag_set_priority">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="priority"/>
-        </parameters>
-      </method>
     </object>
     <object name="TextTagTable" cname="GtkTextTagTable" parent="GObject">
       <field cname="hash" type="GHashTable*"/>
@@ -16135,7 +14274,6 @@
           <parameter type="GtkTextTag*" name="tag"/>
         </parameters>
       </signal>
-      <constructor cname="gtk_text_tag_table_new"/>
       <method name="Foreach" cname="gtk_text_tag_table_foreach">
         <return-type type="void"/>
         <parameters>
@@ -16164,6 +14302,7 @@
           <parameter type="GtkTextTag*" name="tag"/>
         </parameters>
       </method>
+      <constructor cname="gtk_text_tag_table_new"/>
     </object>
     <object name="TextView" cname="GtkTextView" parent="GtkContainer">
       <field cname="_GtkTextLayout* layout" type="struct"/>
@@ -16308,6 +14447,24 @@
           <parameter type="GtkMenu*" name="menu"/>
         </parameters>
       </signal>
+      <method name="SetPixelsInsideWrap" cname="gtk_text_view_set_pixels_inside_wrap">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="pixels_inside_wrap"/>
+        </parameters>
+      </method>
+      <method name="SetPixelsAboveLines" cname="gtk_text_view_set_pixels_above_lines">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="pixels_above_lines"/>
+        </parameters>
+      </method>
+      <method name="SetWrapMode" cname="gtk_text_view_set_wrap_mode">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWrapMode" name="wrap_mode"/>
+        </parameters>
+      </method>
       <method name="SetLeftMargin" cname="gtk_text_view_set_left_margin">
         <return-type type="void"/>
         <parameters>
@@ -16330,12 +14487,27 @@
           <parameter type="GtkTextWindowType" name="type"/>
         </parameters>
       </method>
+      <method name="GetWindowType" cname="gtk_text_view_get_window_type">
+        <return-type type="GtkTextWindowType"/>
+        <parameters>
+          <parameter type="GdkWindow*" name="window"/>
+        </parameters>
+      </method>
+      <method name="GetWindow" cname="gtk_text_view_get_window">
+        <return-type type="GdkWindow*"/>
+        <parameters>
+          <parameter type="GtkTextWindowType" name="win"/>
+        </parameters>
+      </method>
       <method name="ScrollMarkOnscreen" cname="gtk_text_view_scroll_mark_onscreen">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkTextMark*" name="mark"/>
         </parameters>
       </method>
+      <method name="GetIndent" cname="gtk_text_view_get_indent">
+        <return-type type="gint"/>
+      </method>
       <method name="BufferToWindowCoords" cname="gtk_text_view_buffer_to_window_coords">
         <return-type type="void"/>
         <parameters>
@@ -16349,6 +14521,9 @@
       <method name="GetBuffer" cname="gtk_text_view_get_buffer">
         <return-type type="GtkTextBuffer*"/>
       </method>
+      <method name="GetPixelsBelowLines" cname="gtk_text_view_get_pixels_below_lines">
+        <return-type type="gint"/>
+      </method>
       <constructor cname="gtk_text_view_new_with_buffer">
         <parameters>
           <parameter type="GtkTextBuffer*" name="buffer"/>
@@ -16377,111 +14552,6 @@
           <parameter type="gint" name="ypos"/>
         </parameters>
       </method>
-      <method name="ForwardDisplayLine" cname="gtk_text_view_forward_display_line">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkTextIter*" name="iter"/>
-        </parameters>
-      </method>
-      <method name="SetRightMargin" cname="gtk_text_view_set_right_margin">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="right_margin"/>
-        </parameters>
-      </method>
-      <method name="GetIterLocation" cname="gtk_text_view_get_iter_location">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-GtkTextIter*" name="iter"/>
-          <parameter type="GdkRectangle*" name="location"/>
-        </parameters>
-      </method>
-      <constructor cname="gtk_text_view_new"/>
-      <method name="GetCursorVisible" cname="gtk_text_view_get_cursor_visible">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="SetPixelsBelowLines" cname="gtk_text_view_set_pixels_below_lines">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="pixels_below_lines"/>
-        </parameters>
-      </method>
-      <method name="StartsDisplayLine" cname="gtk_text_view_starts_display_line">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="const-GtkTextIter*" name="iter"/>
-        </parameters>
-      </method>
-      <method name="SetBuffer" cname="gtk_text_view_set_buffer">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTextBuffer*" name="buffer"/>
-        </parameters>
-      </method>
-      <method name="GetIterAtLocation" cname="gtk_text_view_get_iter_at_location">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTextIter*" name="iter" pass_as="out"/>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-        </parameters>
-      </method>
-      <method name="SetEditable" cname="gtk_text_view_set_editable">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="setting"/>
-        </parameters>
-      </method>
-      <method name="GetLineAtY" cname="gtk_text_view_get_line_at_y">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTextIter*" name="target_iter" pass_as="out"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint*" name="line_top"/>
-        </parameters>
-      </method>
-      <method name="SetTabs" cname="gtk_text_view_set_tabs">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="PangoTabArray*" name="tabs"/>
-        </parameters>
-      </method>
-      <method name="SetPixelsInsideWrap" cname="gtk_text_view_set_pixels_inside_wrap">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="pixels_inside_wrap"/>
-        </parameters>
-      </method>
-      <method name="SetPixelsAboveLines" cname="gtk_text_view_set_pixels_above_lines">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="pixels_above_lines"/>
-        </parameters>
-      </method>
-      <method name="SetWrapMode" cname="gtk_text_view_set_wrap_mode">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWrapMode" name="wrap_mode"/>
-        </parameters>
-      </method>
-      <method name="GetWindowType" cname="gtk_text_view_get_window_type">
-        <return-type type="GtkTextWindowType"/>
-        <parameters>
-          <parameter type="GdkWindow*" name="window"/>
-        </parameters>
-      </method>
-      <method name="GetWindow" cname="gtk_text_view_get_window">
-        <return-type type="GdkWindow*"/>
-        <parameters>
-          <parameter type="GtkTextWindowType" name="win"/>
-        </parameters>
-      </method>
-      <method name="GetIndent" cname="gtk_text_view_get_indent">
-        <return-type type="gint"/>
-      </method>
-      <method name="GetPixelsBelowLines" cname="gtk_text_view_get_pixels_below_lines">
-        <return-type type="gint"/>
-      </method>
       <method name="ScrollToIter" cname="gtk_text_view_scroll_to_iter">
         <return-type type="gboolean"/>
         <parameters>
@@ -16499,18 +14569,37 @@
           <parameter type="gint" name="count"/>
         </parameters>
       </method>
+      <method name="ForwardDisplayLine" cname="gtk_text_view_forward_display_line">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkTextIter*" name="iter"/>
+        </parameters>
+      </method>
       <method name="BackwardDisplayLine" cname="gtk_text_view_backward_display_line">
         <return-type type="gboolean"/>
         <parameters>
           <parameter type="GtkTextIter*" name="iter"/>
         </parameters>
       </method>
+      <method name="SetRightMargin" cname="gtk_text_view_set_right_margin">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="right_margin"/>
+        </parameters>
+      </method>
       <method name="SetCursorVisible" cname="gtk_text_view_set_cursor_visible">
         <return-type type="void"/>
         <parameters>
           <parameter type="gboolean" name="setting"/>
         </parameters>
       </method>
+      <method name="GetIterLocation" cname="gtk_text_view_get_iter_location">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="const-GtkTextIter*" name="iter"/>
+          <parameter type="GdkRectangle*" name="location"/>
+        </parameters>
+      </method>
       <method name="GetVisibleRect" cname="gtk_text_view_get_visible_rect">
         <return-type type="void"/>
         <parameters>
@@ -16549,6 +14638,10 @@
       <method name="GetTabs" cname="gtk_text_view_get_tabs">
         <return-type type="PangoTabArray*"/>
       </method>
+      <constructor cname="gtk_text_view_new"/>
+      <method name="GetCursorVisible" cname="gtk_text_view_get_cursor_visible">
+        <return-type type="gboolean"/>
+      </method>
       <method name="AddChildAtAnchor" cname="gtk_text_view_add_child_at_anchor">
         <return-type type="void"/>
         <parameters>
@@ -16556,6 +14649,18 @@
           <parameter type="GtkTextChildAnchor*" name="anchor"/>
         </parameters>
       </method>
+      <method name="SetPixelsBelowLines" cname="gtk_text_view_set_pixels_below_lines">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="pixels_below_lines"/>
+        </parameters>
+      </method>
+      <method name="StartsDisplayLine" cname="gtk_text_view_starts_display_line">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="const-GtkTextIter*" name="iter"/>
+        </parameters>
+      </method>
       <method name="SetIndent" cname="gtk_text_view_set_indent">
         <return-type type="void"/>
         <parameters>
@@ -16568,6 +14673,12 @@
           <parameter type="GtkTextIter*" name="iter"/>
         </parameters>
       </method>
+      <method name="SetBuffer" cname="gtk_text_view_set_buffer">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTextBuffer*" name="buffer"/>
+        </parameters>
+      </method>
       <method name="GetLineYrange" cname="gtk_text_view_get_line_yrange">
         <return-type type="void"/>
         <parameters>
@@ -16576,6 +14687,20 @@
           <parameter type="gint*" name="height"/>
         </parameters>
       </method>
+      <method name="GetIterAtLocation" cname="gtk_text_view_get_iter_at_location">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTextIter*" name="iter" pass_as="out"/>
+          <parameter type="gint" name="x"/>
+          <parameter type="gint" name="y"/>
+        </parameters>
+      </method>
+      <method name="SetEditable" cname="gtk_text_view_set_editable">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="setting"/>
+        </parameters>
+      </method>
       <method name="AddChildInWindow" cname="gtk_text_view_add_child_in_window">
         <return-type type="void"/>
         <parameters>
@@ -16588,6 +14713,14 @@
       <method name="GetRightMargin" cname="gtk_text_view_get_right_margin">
         <return-type type="gint"/>
       </method>
+      <method name="GetLineAtY" cname="gtk_text_view_get_line_at_y">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTextIter*" name="target_iter" pass_as="out"/>
+          <parameter type="gint" name="y"/>
+          <parameter type="gint*" name="line_top"/>
+        </parameters>
+      </method>
       <method name="PlaceCursorOnscreen" cname="gtk_text_view_place_cursor_onscreen">
         <return-type type="gboolean"/>
       </method>
@@ -16603,72 +14736,18 @@
           <parameter type="GtkJustification" name="justification"/>
         </parameters>
       </method>
+      <method name="SetTabs" cname="gtk_text_view_set_tabs">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="PangoTabArray*" name="tabs"/>
+        </parameters>
+      </method>
     </object>
     <object name="ThemeEngine" cname="GtkThemeEngine" parent="GTypeModule">
       <method name="CreateRcStyle" cname="gtk_theme_engine_create_rc_style">
         <return-type type="GtkRcStyle*"/>
       </method>
     </object>
-    <object name="TipsQuery" cname="GtkTipsQuery" parent="GtkLabel">
-      <field cname="emit_always" bits="1" type="guint"/>
-      <field cname="in_query" bits="1" type="guint"/>
-      <field cname="label_inactive" type="gchar*"/>
-      <field cname="label_no_tip" type="gchar*"/>
-      <field cname="caller" type="GtkWidget*"/>
-      <field cname="last_crossed" type="GtkWidget*"/>
-      <field cname="query_cursor" type="GdkCursor*"/>
-      <signal name="QueryStarted" cname="start_query" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTipsQuery*" name="tips_query"/>
-        </parameters>
-      </signal>
-      <signal name="QueryStopped" cname="stop_query" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTipsQuery*" name="tips_query"/>
-        </parameters>
-      </signal>
-      <signal name="WidgetEntered" cname="widget_entered" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTipsQuery*" name="tips_query"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="tip_text"/>
-          <parameter type="const-gchar*" name="tip_private"/>
-        </parameters>
-      </signal>
-      <signal name="WidgetSelected" cname="widget_selected" when="LAST">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="GtkTipsQuery*" name="tips_query"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-gchar*" name="tip_text"/>
-          <parameter type="const-gchar*" name="tip_private"/>
-          <parameter type="GdkEventButton*" name="event"/>
-        </parameters>
-      </signal>
-      <method name="StartQuery" cname="gtk_tips_query_start_query">
-        <return-type type="void"/>
-      </method>
-      <method name="SetLabels" cname="gtk_tips_query_set_labels">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-gchar*" name="label_inactive"/>
-          <parameter type="const-gchar*" name="label_no_tip"/>
-        </parameters>
-      </method>
-      <method name="SetCaller" cname="gtk_tips_query_set_caller">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="caller"/>
-        </parameters>
-      </method>
-      <method name="StopQuery" cname="gtk_tips_query_stop_query">
-        <return-type type="void"/>
-      </method>
-      <constructor cname="gtk_tips_query_new"/>
-    </object>
     <object name="ToggleButton" cname="GtkToggleButton" parent="GtkButton">
       <field cname="active" bits="1" type="guint"/>
       <field cname="draw_indicator" bits="1" type="guint"/>
@@ -16682,12 +14761,6 @@
           <parameter type="GtkToggleButton*" name="toggle_button"/>
         </parameters>
       </signal>
-      <constructor cname="gtk_toggle_button_new_with_label">
-        <parameters>
-          <parameter type="const-gchar*" name="label"/>
-        </parameters>
-      </constructor>
-      <constructor cname="gtk_toggle_button_new"/>
       <constructor cname="gtk_toggle_button_new_with_mnemonic" preferred="1">
         <parameters>
           <parameter type="const-gchar*" name="label"/>
@@ -16696,6 +14769,11 @@
       <method name="GetInconsistent" cname="gtk_toggle_button_get_inconsistent">
         <return-type type="gboolean"/>
       </method>
+      <constructor cname="gtk_toggle_button_new_with_label">
+        <parameters>
+          <parameter type="const-gchar*" name="label"/>
+        </parameters>
+      </constructor>
       <method name="SetMode" cname="gtk_toggle_button_set_mode">
         <return-type type="void"/>
         <parameters>
@@ -16711,6 +14789,7 @@
           <parameter type="gboolean" name="setting"/>
         </parameters>
       </method>
+      <constructor cname="gtk_toggle_button_new"/>
       <method name="GetMode" cname="gtk_toggle_button_get_mode">
         <return-type type="gboolean"/>
       </method>
@@ -16753,6 +14832,9 @@
       </signal>
       <property name="Orientation" cname="orientation" type="GtkOrientation" doc-string=" _(The orientation of the toolbar)" readable="true" writeable="true"/>
       <property name="ToolbarStyle" cname="toolbar_style" type="GtkToolbarStyle" doc-string=" _(How to draw the toolbar)" readable="true" writeable="true"/>
+      <method name="GetTooltips" cname="gtk_toolbar_get_tooltips">
+        <return-type type="gboolean"/>
+      </method>
       <method name="GetStyle" cname="gtk_toolbar_get_style">
         <return-type type="GtkToolbarStyle"/>
       </method>
@@ -16773,75 +14855,6 @@
       <method name="PrependSpace" cname="gtk_toolbar_prepend_space">
         <return-type type="void"/>
       </method>
-      <method name="PrependElement" cname="gtk_toolbar_prepend_element">
-        <return-type type="GtkWidget*"/>
-        <parameters>
-          <parameter type="GtkToolbarChildType" name="type"/>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-char*" name="text"/>
-          <parameter type="const-char*" name="tooltip_text"/>
-          <parameter type="const-char*" name="tooltip_private_text"/>
-          <parameter type="GtkWidget*" name="icon"/>
-          <parameter type="GtkSignalFunc" name="callback"/>
-          <parameter type="gpointer" name="user_data"/>
-        </parameters>
-      </method>
-      <method name="InsertItem" cname="gtk_toolbar_insert_item">
-        <return-type type="GtkWidget*"/>
-        <parameters>
-          <parameter type="const-char*" name="text"/>
-          <parameter type="const-char*" name="tooltip_text"/>
-          <parameter type="const-char*" name="tooltip_private_text"/>
-          <parameter type="GtkWidget*" name="icon"/>
-          <parameter type="GtkSignalFunc" name="callback"/>
-          <parameter type="gpointer" name="user_data"/>
-          <parameter type="gint" name="position"/>
-        </parameters>
-      </method>
-      <method name="RemoveSpace" cname="gtk_toolbar_remove_space">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="position"/>
-        </parameters>
-      </method>
-      <method name="PrependWidget" cname="gtk_toolbar_prepend_widget">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-char*" name="tooltip_text"/>
-          <parameter type="const-char*" name="tooltip_private_text"/>
-        </parameters>
-      </method>
-      <method name="UnsetStyle" cname="gtk_toolbar_unset_style">
-        <return-type type="void"/>
-      </method>
-      <method name="SetIconSize" cname="gtk_toolbar_set_icon_size">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkIconSize" name="icon_size"/>
-        </parameters>
-      </method>
-      <method name="SetStyle" cname="gtk_toolbar_set_style">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkToolbarStyle" name="style"/>
-        </parameters>
-      </method>
-      <method name="AppendSpace" cname="gtk_toolbar_append_space">
-        <return-type type="void"/>
-      </method>
-      <method name="InsertWidget" cname="gtk_toolbar_insert_widget">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="widget"/>
-          <parameter type="const-char*" name="tooltip_text"/>
-          <parameter type="const-char*" name="tooltip_private_text"/>
-          <parameter type="gint" name="position"/>
-        </parameters>
-      </method>
-      <method name="GetTooltips" cname="gtk_toolbar_get_tooltips">
-        <return-type type="gboolean"/>
-      </method>
       <method name="InsertElement" cname="gtk_toolbar_insert_element">
         <return-type type="GtkWidget*"/>
         <parameters>
@@ -16869,9 +14882,40 @@
           <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
+      <method name="PrependElement" cname="gtk_toolbar_prepend_element">
+        <return-type type="GtkWidget*"/>
+        <parameters>
+          <parameter type="GtkToolbarChildType" name="type"/>
+          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="const-char*" name="text"/>
+          <parameter type="const-char*" name="tooltip_text"/>
+          <parameter type="const-char*" name="tooltip_private_text"/>
+          <parameter type="GtkWidget*" name="icon"/>
+          <parameter type="GtkSignalFunc" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </method>
       <method name="UnsetIconSize" cname="gtk_toolbar_unset_icon_size">
         <return-type type="void"/>
       </method>
+      <method name="InsertItem" cname="gtk_toolbar_insert_item">
+        <return-type type="GtkWidget*"/>
+        <parameters>
+          <parameter type="const-char*" name="text"/>
+          <parameter type="const-char*" name="tooltip_text"/>
+          <parameter type="const-char*" name="tooltip_private_text"/>
+          <parameter type="GtkWidget*" name="icon"/>
+          <parameter type="GtkSignalFunc" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+          <parameter type="gint" name="position"/>
+        </parameters>
+      </method>
+      <method name="RemoveSpace" cname="gtk_toolbar_remove_space">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="position"/>
+        </parameters>
+      </method>
       <method name="SetTooltips" cname="gtk_toolbar_set_tooltips">
         <return-type type="void"/>
         <parameters>
@@ -16884,6 +14928,17 @@
           <parameter type="GtkOrientation" name="orientation"/>
         </parameters>
       </method>
+      <method name="PrependWidget" cname="gtk_toolbar_prepend_widget">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="const-char*" name="tooltip_text"/>
+          <parameter type="const-char*" name="tooltip_private_text"/>
+        </parameters>
+      </method>
+      <method name="UnsetStyle" cname="gtk_toolbar_unset_style">
+        <return-type type="void"/>
+      </method>
       <method name="InsertSpace" cname="gtk_toolbar_insert_space">
         <return-type type="void"/>
         <parameters>
@@ -16924,6 +14979,30 @@
         </parameters>
       </method>
       <constructor cname="gtk_toolbar_new"/>
+      <method name="SetIconSize" cname="gtk_toolbar_set_icon_size">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkIconSize" name="icon_size"/>
+        </parameters>
+      </method>
+      <method name="SetStyle" cname="gtk_toolbar_set_style">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkToolbarStyle" name="style"/>
+        </parameters>
+      </method>
+      <method name="AppendSpace" cname="gtk_toolbar_append_space">
+        <return-type type="void"/>
+      </method>
+      <method name="InsertWidget" cname="gtk_toolbar_insert_widget">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="widget"/>
+          <parameter type="const-char*" name="tooltip_text"/>
+          <parameter type="const-char*" name="tooltip_private_text"/>
+          <parameter type="gint" name="position"/>
+        </parameters>
+      </method>
     </object>
     <object name="Tooltips" cname="GtkTooltips" parent="GtkObject">
       <field cname="tip_window" type="GtkWidget*"/>
@@ -16936,15 +15015,15 @@
       <field cname="use_sticky_delay" bits="1" type="guint"/>
       <field cname="timer_tag" type="gint"/>
       <field cname="last_popdown" type="GTimeVal"/>
+      <method name="Enable" cname="gtk_tooltips_enable">
+        <return-type type="void"/>
+      </method>
       <method name="Disable" cname="gtk_tooltips_disable">
         <return-type type="void"/>
       </method>
       <method name="ForceWindow" cname="gtk_tooltips_force_window">
         <return-type type="void"/>
       </method>
-      <method name="Enable" cname="gtk_tooltips_enable">
-        <return-type type="void"/>
-      </method>
       <constructor cname="gtk_tooltips_new"/>
       <method name="SetTip" cname="gtk_tooltips_set_tip">
         <return-type type="void"/>
@@ -16955,172 +15034,6 @@
         </parameters>
       </method>
     </object>
-    <object name="Tree" cname="GtkTree" parent="GtkContainer">
-      <field cname="children" type="GList*"/>
-      <field cname="root_tree" type="GtkTree*"/>
-      <field cname="tree_owner" type="GtkWidget*"/>
-      <field cname="selection" type="GList*"/>
-      <field cname="level" type="guint"/>
-      <field cname="indent_value" type="guint"/>
-      <field cname="current_indent" type="guint"/>
-      <field cname="selection_mode" bits="2" type="guint"/>
-      <field cname="view_mode" bits="1" type="guint"/>
-      <field cname="view_line" bits="1" type="guint"/>
-      <signal name="SelectionChanged" cname="selection_changed" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTree*" name="tree"/>
-        </parameters>
-      </signal>
-      <signal name="ChildSelected" cname="select_child" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTree*" name="tree"/>
-          <parameter type="GtkWidget*" name="child"/>
-        </parameters>
-      </signal>
-      <signal name="ChildUnselected" cname="unselect_child" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTree*" name="tree"/>
-          <parameter type="GtkWidget*" name="child"/>
-        </parameters>
-      </signal>
-      <method name="Insert" cname="gtk_tree_insert">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="tree_item"/>
-          <parameter type="gint" name="position"/>
-        </parameters>
-      </method>
-      <method name="Append" cname="gtk_tree_append">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="tree_item"/>
-        </parameters>
-      </method>
-      <method name="ChildPosition" cname="gtk_tree_child_position">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-        </parameters>
-      </method>
-      <method name="SetViewLines" cname="gtk_tree_set_view_lines">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="flag"/>
-        </parameters>
-      </method>
-      <method name="SelectItem" cname="gtk_tree_select_item">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="item"/>
-        </parameters>
-      </method>
-      <method name="SetViewMode" cname="gtk_tree_set_view_mode">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTreeViewMode" name="mode"/>
-        </parameters>
-      </method>
-      <constructor cname="gtk_tree_new"/>
-      <method name="ClearItems" cname="gtk_tree_clear_items">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="start"/>
-          <parameter type="gint" name="end"/>
-        </parameters>
-      </method>
-      <method name="Prepend" cname="gtk_tree_prepend">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="tree_item"/>
-        </parameters>
-      </method>
-      <method name="SelectChild" cname="gtk_tree_select_child">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="tree_item"/>
-        </parameters>
-      </method>
-      <method name="RemoveItems" cname="gtk_tree_remove_items">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GList*" name="items"/>
-        </parameters>
-      </method>
-      <method name="SetSelectionMode" cname="gtk_tree_set_selection_mode">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkSelectionMode" name="mode"/>
-        </parameters>
-      </method>
-      <method name="RemoveItem" cname="gtk_tree_remove_item">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="child"/>
-        </parameters>
-      </method>
-      <method name="UnselectChild" cname="gtk_tree_unselect_child">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="tree_item"/>
-        </parameters>
-      </method>
-      <method name="UnselectItem" cname="gtk_tree_unselect_item">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="item"/>
-        </parameters>
-      </method>
-    </object>
-    <object name="TreeItem" cname="GtkTreeItem" parent="GtkItem">
-      <field cname="subtree" type="GtkWidget*"/>
-      <field cname="pixmaps_box" type="GtkWidget*"/>
-      <field cname="plus_pix_widget" type="GtkWidget*"/>
-      <field cname="* minus_pix_widget" type="GtkWidget*"/>
-      <field cname="pixmaps" type="GList*"/>
-      <field cname="expanded" bits="1" type="guint"/>
-      <signal name="Expanded" cname="expand" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTreeItem*" name="tree_item"/>
-        </parameters>
-      </signal>
-      <signal name="Collapsed" cname="collapse" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTreeItem*" name="tree_item"/>
-        </parameters>
-      </signal>
-      <method name="Collapse" cname="gtk_tree_item_collapse">
-        <return-type type="void"/>
-      </method>
-      <constructor cname="gtk_tree_item_new_with_label">
-        <parameters>
-          <parameter type="const-gchar*" name="label"/>
-        </parameters>
-      </constructor>
-      <constructor cname="gtk_tree_item_new"/>
-      <method name="Select" cname="gtk_tree_item_select">
-        <return-type type="void"/>
-      </method>
-      <method name="Deselect" cname="gtk_tree_item_deselect">
-        <return-type type="void"/>
-      </method>
-      <method name="RemoveSubtree" cname="gtk_tree_item_remove_subtree">
-        <return-type type="void"/>
-      </method>
-      <method name="SetSubtree" cname="gtk_tree_item_set_subtree">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="subtree"/>
-        </parameters>
-      </method>
-      <method name="Expand" cname="gtk_tree_item_expand">
-        <return-type type="void"/>
-      </method>
-    </object>
     <object name="TreeModelSort" cname="GtkTreeModelSort" parent="GObject">
       <field cname="root" type="gpointer"/>
       <field cname="stamp" type="gint"/>
@@ -17197,6 +15110,15 @@
           <parameter type="GtkTreeIter*" name="iter"/>
         </parameters>
       </method>
+      <method name="UnselectAll" cname="gtk_tree_selection_unselect_all">
+        <return-type type="void"/>
+      </method>
+      <method name="PathIsSelected" cname="gtk_tree_selection_path_is_selected">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkTreePath*" name="path"/>
+        </parameters>
+      </method>
       <method name="GetSelected" cname="gtk_tree_selection_get_selected">
         <return-type type="gboolean"/>
         <parameters>
@@ -17207,6 +15129,16 @@
       <method name="GetTreeView" cname="gtk_tree_selection_get_tree_view">
         <return-type type="GtkTreeView*"/>
       </method>
+      <method name="SelectRange" cname="gtk_tree_selection_select_range">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTreePath*" name="start_path"/>
+          <parameter type="GtkTreePath*" name="end_path"/>
+        </parameters>
+      </method>
+      <method name="SelectAll" cname="gtk_tree_selection_select_all">
+        <return-type type="void"/>
+      </method>
       <method name="GetUserData" cname="gtk_tree_selection_get_user_data">
         <return-type type="gpointer"/>
       </method>
@@ -17239,25 +15171,6 @@
           <parameter type="GtkDestroyNotify" name="destroy"/>
         </parameters>
       </method>
-      <method name="UnselectAll" cname="gtk_tree_selection_unselect_all">
-        <return-type type="void"/>
-      </method>
-      <method name="PathIsSelected" cname="gtk_tree_selection_path_is_selected">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
-        </parameters>
-      </method>
-      <method name="SelectRange" cname="gtk_tree_selection_select_range">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTreePath*" name="start_path"/>
-          <parameter type="GtkTreePath*" name="end_path"/>
-        </parameters>
-      </method>
-      <method name="SelectAll" cname="gtk_tree_selection_select_all">
-        <return-type type="void"/>
-      </method>
       <method name="SetMode" cname="gtk_tree_selection_set_mode">
         <return-type type="void"/>
         <parameters>
@@ -17304,28 +15217,7 @@
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="G" name=""/>
-        </parameters>
-      </method>
-      <method name="Remove" cname="gtk_tree_store_remove">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-        </parameters>
-      </method>
-      <method name="SetValist" cname="gtk_tree_store_set_valist">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="va_list" name="var_args"/>
-        </parameters>
-      </method>
-      <method name="InsertAfter" cname="gtk_tree_store_insert_after">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="GtkTreeIter*" name="parent"/>
-          <parameter type="GtkTreeIter*" name="sibling"/>
+          <parameter type="G"/>
         </parameters>
       </method>
       <method name="SetColumnTypes" cname="gtk_tree_store_set_column_types">
@@ -17358,9 +15250,15 @@
       <constructor cname="gtk_tree_store_new">
         <parameters>
           <parameter type="gint" name="n_columns"/>
-          <parameter type=" " name=""/>
+          <parameter type=" "/>
         </parameters>
       </constructor>
+      <method name="Remove" cname="gtk_tree_store_remove">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTreeIter*" name="iter"/>
+        </parameters>
+      </method>
       <method name="InsertBefore" cname="gtk_tree_store_insert_before">
         <return-type type="void"/>
         <parameters>
@@ -17369,6 +15267,21 @@
           <parameter type="GtkTreeIter*" name="sibling"/>
         </parameters>
       </method>
+      <method name="SetValist" cname="gtk_tree_store_set_valist">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="va_list" name="var_args"/>
+        </parameters>
+      </method>
+      <method name="InsertAfter" cname="gtk_tree_store_insert_after">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="GtkTreeIter*" name="parent"/>
+          <parameter type="GtkTreeIter*" name="sibling"/>
+        </parameters>
+      </method>
       <method name="Insert" cname="gtk_tree_store_insert">
         <return-type type="void"/>
         <parameters>
@@ -17525,6 +15438,16 @@
           <parameter type="GtkTreeView*" name="tree_view"/>
         </parameters>
       </signal>
+      <method name="GetSearchColumn" cname="gtk_tree_view_get_search_column">
+        <return-type type="gint"/>
+      </method>
+      <method name="GetDragDestRow" cname="gtk_tree_view_get_drag_dest_row">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTreePath**" name="path"/>
+          <parameter type="GtkTreeViewDropPosition*" name="pos"/>
+        </parameters>
+      </method>
       <method name="SetHeadersClickable" cname="gtk_tree_view_set_headers_clickable">
         <return-type type="void"/>
         <parameters>
@@ -17539,6 +15462,12 @@
           <parameter type="GtkDestroyNotify" name="search_destroy"/>
         </parameters>
       </method>
+      <method name="SetModel" cname="gtk_tree_view_set_model">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTreeModel*" name="model"/>
+        </parameters>
+      </method>
       <method name="GetPathAtPos" cname="gtk_tree_view_get_path_at_pos">
         <return-type type="gboolean"/>
         <parameters>
@@ -17550,6 +15479,13 @@
           <parameter type="gint*" name="cell_y"/>
         </parameters>
       </method>
+      <method name="InsertColumn" cname="gtk_tree_view_insert_column">
+        <return-type type="gint"/>
+        <parameters>
+          <parameter type="GtkTreeViewColumn*" name="column"/>
+          <parameter type="gint" name="position"/>
+        </parameters>
+      </method>
       <method name="EnableModelDragSource" cname="gtk_tree_view_enable_model_drag_source">
         <return-type type="void"/>
         <parameters>
@@ -17562,6 +15498,9 @@
       <method name="GetHeadersVisible" cname="gtk_tree_view_get_headers_visible">
         <return-type type="gboolean"/>
       </method>
+      <method name="ExpandAll" cname="gtk_tree_view_expand_all">
+        <return-type type="void"/>
+      </method>
       <method name="SetDestroyCountFunc" cname="gtk_tree_view_set_destroy_count_func">
         <return-type type="void"/>
         <parameters>
@@ -17570,6 +15509,13 @@
           <parameter type="GtkDestroyNotify" name="destroy"/>
         </parameters>
       </method>
+      <method name="MoveColumnAfter" cname="gtk_tree_view_move_column_after">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTreeViewColumn*" name="column"/>
+          <parameter type="GtkTreeViewColumn*" name="base_column"/>
+        </parameters>
+      </method>
       <method name="GetDestRowAtPos" cname="gtk_tree_view_get_dest_row_at_pos">
         <return-type type="gboolean"/>
         <parameters>
@@ -17579,9 +15525,30 @@
           <parameter type="GtkTreeViewDropPosition*" name="pos"/>
         </parameters>
       </method>
+      <method name="SetCursor" cname="gtk_tree_view_set_cursor">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTreePath*" name="path"/>
+          <parameter type="GtkTreeViewColumn*" name="focus_column"/>
+          <parameter type="gboolean" name="start_editing"/>
+        </parameters>
+      </method>
+      <method name="SetReorderable" cname="gtk_tree_view_set_reorderable">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="reorderable"/>
+        </parameters>
+      </method>
       <method name="GetModel" cname="gtk_tree_view_get_model">
         <return-type type="GtkTreeModel*"/>
       </method>
+      <method name="MapExpandedRows" cname="gtk_tree_view_map_expanded_rows">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTreeViewMappingFunc" name="func"/>
+          <parameter type="gpointer" name="data"/>
+        </parameters>
+      </method>
       <method name="GetColumn" cname="gtk_tree_view_get_column">
         <return-type type="GtkTreeViewColumn*"/>
         <parameters>
@@ -17608,6 +15575,15 @@
           <parameter type="GtkTreeViewColumn*" name="column"/>
         </parameters>
       </method>
+      <method name="GetExpanderColumn" cname="gtk_tree_view_get_expander_column">
+        <return-type type="GtkTreeViewColumn*"/>
+      </method>
+      <method name="GetReorderable" cname="gtk_tree_view_get_reorderable">
+        <return-type type="gboolean"/>
+      </method>
+      <method name="GetRulesHint" cname="gtk_tree_view_get_rules_hint">
+        <return-type type="gboolean"/>
+      </method>
       <method name="ActivateRow" cname="gtk_tree_view_row_activated">
         <return-type type="void"/>
         <parameters>
@@ -17615,6 +15591,15 @@
           <parameter type="GtkTreeViewColumn*" name="column"/>
         </parameters>
       </method>
+      <method name="WidgetToTreeCoords" cname="gtk_tree_view_widget_to_tree_coords">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="wx"/>
+          <parameter type="gint" name="wy"/>
+          <parameter type="gint*" name="tx"/>
+          <parameter type="gint*" name="ty"/>
+        </parameters>
+      </method>
       <method name="GetSearchEqualFunc" cname="gtk_tree_view_get_search_equal_func">
         <return-type type="GtkTreeViewSearchEqualFunc"/>
       </method>
@@ -17652,7 +15637,7 @@
           <parameter type="gint" name="position"/>
           <parameter type="const-gchar*" name="title"/>
           <parameter type="GtkCellRenderer*" name="cell"/>
-          <parameter type="G" name=""/>
+          <parameter type="G"/>
         </parameters>
       </method>
       <method name="SetEnableSearch" cname="gtk_tree_view_set_enable_search">
@@ -17667,6 +15652,14 @@
           <parameter type="gint" name="column"/>
         </parameters>
       </method>
+      <method name="CollapseAll" cname="gtk_tree_view_collapse_all">
+        <return-type type="void"/>
+      </method>
+      <constructor cname="gtk_tree_view_new_with_model">
+        <parameters>
+          <parameter type="GtkTreeModel*" name="model"/>
+        </parameters>
+      </constructor>
       <method name="SetDragDestRow" cname="gtk_tree_view_set_drag_dest_row">
         <return-type type="void"/>
         <parameters>
@@ -17674,6 +15667,12 @@
           <parameter type="GtkTreeViewDropPosition" name="pos"/>
         </parameters>
       </method>
+      <method name="RowExpand" cname="gtk_tree_view_row_expanded">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkTreePath*" name="path"/>
+        </parameters>
+      </method>
       <method name="SetHadjustment" cname="gtk_tree_view_set_hadjustment">
         <return-type type="void"/>
         <parameters>
@@ -17686,6 +15685,9 @@
           <parameter type="gboolean" name="setting"/>
         </parameters>
       </method>
+      <method name="GetBinWindow" cname="gtk_tree_view_get_bin_window">
+        <return-type type="GdkWindow*"/>
+      </method>
       <method name="SetColumnDragFunction" cname="gtk_tree_view_set_column_drag_function">
         <return-type type="void"/>
         <parameters>
@@ -17697,6 +15699,13 @@
       <method name="ColumnsAutosize" cname="gtk_tree_view_columns_autosize">
         <return-type type="void"/>
       </method>
+      <method name="SetExpanderColumn" cname="gtk_tree_view_set_expander_column">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTreeViewColumn*" name="column"/>
+        </parameters>
+      </method>
+      <constructor cname="gtk_tree_view_new"/>
       <method name="UnsetRowsDragDest" cname="gtk_tree_view_unset_rows_drag_dest">
         <return-type type="void"/>
       </method>
@@ -17718,6 +15727,15 @@
           <parameter type="GdkDragAction" name="actions"/>
         </parameters>
       </method>
+      <method name="GetColumns" cname="gtk_tree_view_get_columns">
+        <return-type type="GList*"/>
+      </method>
+      <method name="SetVadjustment" cname="gtk_tree_view_set_vadjustment">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkAdjustment*" name="adjustment"/>
+        </parameters>
+      </method>
       <method name="ScrollToPoint" cname="gtk_tree_view_scroll_to_point">
         <return-type type="void"/>
         <parameters>
@@ -17746,126 +15764,6 @@
           <parameter type="GDestroyNotify" name="dnotify"/>
         </parameters>
       </method>
-      <method name="GetEnableSearch" cname="gtk_tree_view_get_enable_search">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="UnsetRowsDragSource" cname="gtk_tree_view_unset_rows_drag_source">
-        <return-type type="void"/>
-      </method>
-      <method name="CollapseRow" cname="gtk_tree_view_collapse_row">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
-        </parameters>
-      </method>
-      <method name="GetSelection" cname="gtk_tree_view_get_selection">
-        <return-type type="GtkTreeSelection*"/>
-      </method>
-      <method name="GetSearchColumn" cname="gtk_tree_view_get_search_column">
-        <return-type type="gint"/>
-      </method>
-      <method name="GetDragDestRow" cname="gtk_tree_view_get_drag_dest_row">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTreePath**" name="path"/>
-          <parameter type="GtkTreeViewDropPosition*" name="pos"/>
-        </parameters>
-      </method>
-      <method name="SetModel" cname="gtk_tree_view_set_model">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTreeModel*" name="model"/>
-        </parameters>
-      </method>
-      <method name="InsertColumn" cname="gtk_tree_view_insert_column">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="GtkTreeViewColumn*" name="column"/>
-          <parameter type="gint" name="position"/>
-        </parameters>
-      </method>
-      <method name="ExpandAll" cname="gtk_tree_view_expand_all">
-        <return-type type="void"/>
-      </method>
-      <method name="MoveColumnAfter" cname="gtk_tree_view_move_column_after">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTreeViewColumn*" name="column"/>
-          <parameter type="GtkTreeViewColumn*" name="base_column"/>
-        </parameters>
-      </method>
-      <method name="SetCursor" cname="gtk_tree_view_set_cursor">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
-          <parameter type="GtkTreeViewColumn*" name="focus_column"/>
-          <parameter type="gboolean" name="start_editing"/>
-        </parameters>
-      </method>
-      <method name="SetReorderable" cname="gtk_tree_view_set_reorderable">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="reorderable"/>
-        </parameters>
-      </method>
-      <method name="MapExpandedRows" cname="gtk_tree_view_map_expanded_rows">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTreeViewMappingFunc" name="func"/>
-          <parameter type="gpointer" name="data"/>
-        </parameters>
-      </method>
-      <method name="GetExpanderColumn" cname="gtk_tree_view_get_expander_column">
-        <return-type type="GtkTreeViewColumn*"/>
-      </method>
-      <method name="GetReorderable" cname="gtk_tree_view_get_reorderable">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="GetRulesHint" cname="gtk_tree_view_get_rules_hint">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="WidgetToTreeCoords" cname="gtk_tree_view_widget_to_tree_coords">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="wx"/>
-          <parameter type="gint" name="wy"/>
-          <parameter type="gint*" name="tx"/>
-          <parameter type="gint*" name="ty"/>
-        </parameters>
-      </method>
-      <method name="CollapseAll" cname="gtk_tree_view_collapse_all">
-        <return-type type="void"/>
-      </method>
-      <constructor cname="gtk_tree_view_new_with_model">
-        <parameters>
-          <parameter type="GtkTreeModel*" name="model"/>
-        </parameters>
-      </constructor>
-      <method name="RowExpand" cname="gtk_tree_view_row_expanded">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkTreePath*" name="path"/>
-        </parameters>
-      </method>
-      <method name="GetBinWindow" cname="gtk_tree_view_get_bin_window">
-        <return-type type="GdkWindow*"/>
-      </method>
-      <method name="SetExpanderColumn" cname="gtk_tree_view_set_expander_column">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTreeViewColumn*" name="column"/>
-        </parameters>
-      </method>
-      <constructor cname="gtk_tree_view_new"/>
-      <method name="GetColumns" cname="gtk_tree_view_get_columns">
-        <return-type type="GList*"/>
-      </method>
-      <method name="SetVadjustment" cname="gtk_tree_view_set_vadjustment">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment"/>
-        </parameters>
-      </method>
       <method name="GetCellArea" cname="gtk_tree_view_get_cell_area">
         <return-type type="void"/>
         <parameters>
@@ -17883,6 +15781,21 @@
           <parameter type="GtkTreeViewColumn*" name="column"/>
         </parameters>
       </method>
+      <method name="GetEnableSearch" cname="gtk_tree_view_get_enable_search">
+        <return-type type="gboolean"/>
+      </method>
+      <method name="UnsetRowsDragSource" cname="gtk_tree_view_unset_rows_drag_source">
+        <return-type type="void"/>
+      </method>
+      <method name="CollapseRow" cname="gtk_tree_view_collapse_row">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkTreePath*" name="path"/>
+        </parameters>
+      </method>
+      <method name="GetSelection" cname="gtk_tree_view_get_selection">
+        <return-type type="GtkTreeSelection*"/>
+      </method>
     </object>
     <object name="TreeViewColumn" cname="GtkTreeViewColumn" parent="GtkObject">
       <field cname="tree_view" type="GtkWidget*"/>
@@ -17939,18 +15852,33 @@
       <property name="Reorderable" cname="reorderable" type="gboolean" doc-string=" _(Whether the column can be reordered around the headers)" readable="true" writeable="true"/>
       <property name="SortIndicator" cname="sort_indicator" type="gboolean" doc-string=" _(Whether to show a sort indicator)" readable="true" writeable="true"/>
       <property name="SortOrder" cname="sort_order" type="GtkSortType" doc-string=" _(Sort direction the sort indicator should indicate)" readable="true" writeable="true"/>
+      <method name="GetSizing" cname="gtk_tree_view_column_get_sizing">
+        <return-type type="GtkTreeViewColumnSizing"/>
+      </method>
       <method name="SetSortOrder" cname="gtk_tree_view_column_set_sort_order">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkSortType" name="order"/>
         </parameters>
       </method>
+      <method name="SetSpacing" cname="gtk_tree_view_column_set_spacing">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="spacing"/>
+        </parameters>
+      </method>
       <method name="GetVisible" cname="gtk_tree_view_column_get_visible">
         <return-type type="gboolean"/>
       </method>
       <method name="CellIsVisible" cname="gtk_tree_view_column_cell_is_visible">
         <return-type type="gboolean"/>
       </method>
+      <method name="SetSortColumnId" cname="gtk_tree_view_column_set_sort_column_id">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="sort_column_id"/>
+        </parameters>
+      </method>
       <method name="GetMinWidth" cname="gtk_tree_view_column_get_min_width">
         <return-type type="gint"/>
       </method>
@@ -17960,118 +15888,6 @@
           <parameter type="gboolean" name="reorderable"/>
         </parameters>
       </method>
-      <method name="GetResizable" cname="gtk_tree_view_column_get_resizable">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="SetCellDataFunc" cname="gtk_tree_view_column_set_cell_data_func">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkCellRenderer*" name="cell_renderer"/>
-          <parameter type="GtkTreeCellDataFunc" name="func"/>
-          <parameter type="gpointer" name="func_data"/>
-          <parameter type="GtkDestroyNotify" name="destroy"/>
-        </parameters>
-      </method>
-      <method name="GetSortColumnId" cname="gtk_tree_view_column_get_sort_column_id">
-        <return-type type="gint"/>
-      </method>
-      <method name="SetFixedWidth" cname="gtk_tree_view_column_set_fixed_width">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="fixed_width"/>
-        </parameters>
-      </method>
-      <method name="GetCellRenderers" cname="gtk_tree_view_column_get_cell_renderers">
-        <return-type type="GList*"/>
-      </method>
-      <method name="GetReorderable" cname="gtk_tree_view_column_get_reorderable">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="SetClickable" cname="gtk_tree_view_column_set_clickable">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="clickable"/>
-        </parameters>
-      </method>
-      <method name="SetVisible" cname="gtk_tree_view_column_set_visible">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="visible"/>
-        </parameters>
-      </method>
-      <method name="SetAlignment" cname="gtk_tree_view_column_set_alignment">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gfloat" name="xalign"/>
-        </parameters>
-      </method>
-      <method name="Clear" cname="gtk_tree_view_column_clear">
-        <return-type type="void"/>
-      </method>
-      <method name="GetFixedWidth" cname="gtk_tree_view_column_get_fixed_width">
-        <return-type type="gint"/>
-      </method>
-      <method name="GetSortIndicator" cname="gtk_tree_view_column_get_sort_indicator">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="GetTitle" cname="gtk_tree_view_column_get_title">
-        <return-type type="const-gchar*"/>
-      </method>
-      <constructor cname="gtk_tree_view_column_new_with_attributes">
-        <parameters>
-          <parameter type="const-gchar*" name="title"/>
-          <parameter type="GtkCellRenderer*" name="cell"/>
-          <parameter type="G" name=""/>
-        </parameters>
-      </constructor>
-      <method name="GetWidget" cname="gtk_tree_view_column_get_widget">
-        <return-type type="GtkWidget*"/>
-      </method>
-      <method name="GetSpacing" cname="gtk_tree_view_column_get_spacing">
-        <return-type type="gint"/>
-      </method>
-      <method name="SetMinWidth" cname="gtk_tree_view_column_set_min_width">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="min_width"/>
-        </parameters>
-      </method>
-      <method name="GetSortOrder" cname="gtk_tree_view_column_get_sort_order">
-        <return-type type="GtkSortType"/>
-      </method>
-      <method name="SetResizable" cname="gtk_tree_view_column_set_resizable">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="resizable"/>
-        </parameters>
-      </method>
-      <method name="GetMaxWidth" cname="gtk_tree_view_column_get_max_width">
-        <return-type type="gint"/>
-      </method>
-      <method name="CellSetCellData" cname="gtk_tree_view_column_cell_set_cell_data">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTreeModel*" name="tree_model"/>
-          <parameter type="GtkTreeIter*" name="iter"/>
-          <parameter type="gboolean" name="is_expander"/>
-          <parameter type="gboolean" name="is_expanded"/>
-        </parameters>
-      </method>
-      <method name="GetSizing" cname="gtk_tree_view_column_get_sizing">
-        <return-type type="GtkTreeViewColumnSizing"/>
-      </method>
-      <method name="SetSpacing" cname="gtk_tree_view_column_set_spacing">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="spacing"/>
-        </parameters>
-      </method>
-      <method name="SetSortColumnId" cname="gtk_tree_view_column_set_sort_column_id">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="sort_column_id"/>
-        </parameters>
-      </method>
       <method name="SetWidget" cname="gtk_tree_view_column_set_widget">
         <return-type type="void"/>
         <parameters>
@@ -18098,12 +15914,45 @@
       <method name="Click" cname="gtk_tree_view_column_clicked">
         <return-type type="void"/>
       </method>
+      <method name="GetResizable" cname="gtk_tree_view_column_get_resizable">
+        <return-type type="gboolean"/>
+      </method>
+      <method name="SetCellDataFunc" cname="gtk_tree_view_column_set_cell_data_func">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkCellRenderer*" name="cell_renderer"/>
+          <parameter type="GtkTreeCellDataFunc" name="func"/>
+          <parameter type="gpointer" name="func_data"/>
+          <parameter type="GtkDestroyNotify" name="destroy"/>
+        </parameters>
+      </method>
+      <method name="GetSortColumnId" cname="gtk_tree_view_column_get_sort_column_id">
+        <return-type type="gint"/>
+      </method>
+      <method name="SetFixedWidth" cname="gtk_tree_view_column_set_fixed_width">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="fixed_width"/>
+        </parameters>
+      </method>
+      <method name="GetCellRenderers" cname="gtk_tree_view_column_get_cell_renderers">
+        <return-type type="GList*"/>
+      </method>
       <method name="SetSortIndicator" cname="gtk_tree_view_column_set_sort_indicator">
         <return-type type="void"/>
         <parameters>
           <parameter type="gboolean" name="setting"/>
         </parameters>
       </method>
+      <method name="GetReorderable" cname="gtk_tree_view_column_get_reorderable">
+        <return-type type="gboolean"/>
+      </method>
+      <method name="SetClickable" cname="gtk_tree_view_column_set_clickable">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="clickable"/>
+        </parameters>
+      </method>
       <method name="SetTitle" cname="gtk_tree_view_column_set_title">
         <return-type type="void"/>
         <parameters>
@@ -18113,18 +15962,39 @@
       <method name="GetWidth" cname="gtk_tree_view_column_get_width">
         <return-type type="gint"/>
       </method>
+      <method name="SetVisible" cname="gtk_tree_view_column_set_visible">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="visible"/>
+        </parameters>
+      </method>
+      <method name="SetAlignment" cname="gtk_tree_view_column_set_alignment">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gfloat" name="xalign"/>
+        </parameters>
+      </method>
       <method name="ClearAttributes" cname="gtk_tree_view_column_clear_attributes">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkCellRenderer*" name="cell_renderer"/>
         </parameters>
       </method>
+      <method name="Clear" cname="gtk_tree_view_column_clear">
+        <return-type type="void"/>
+      </method>
       <method name="SetSizing" cname="gtk_tree_view_column_set_sizing">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkTreeViewColumnSizing" name="type"/>
         </parameters>
       </method>
+      <method name="GetFixedWidth" cname="gtk_tree_view_column_get_fixed_width">
+        <return-type type="gint"/>
+      </method>
+      <method name="GetSortIndicator" cname="gtk_tree_view_column_get_sort_indicator">
+        <return-type type="gboolean"/>
+      </method>
       <method name="PackStart" cname="gtk_tree_view_column_pack_start">
         <return-type type="void"/>
         <parameters>
@@ -18132,12 +16002,28 @@
           <parameter type="gboolean" name="expand"/>
         </parameters>
       </method>
+      <method name="GetTitle" cname="gtk_tree_view_column_get_title">
+        <return-type type="const-gchar*"/>
+      </method>
+      <constructor cname="gtk_tree_view_column_new_with_attributes">
+        <parameters>
+          <parameter type="const-gchar*" name="title"/>
+          <parameter type="GtkCellRenderer*" name="cell"/>
+          <parameter type="G"/>
+        </parameters>
+      </constructor>
       <method name="SetMaxWidth" cname="gtk_tree_view_column_set_max_width">
         <return-type type="void"/>
         <parameters>
           <parameter type="gint" name="max_width"/>
         </parameters>
       </method>
+      <method name="GetWidget" cname="gtk_tree_view_column_get_widget">
+        <return-type type="GtkWidget*"/>
+      </method>
+      <method name="GetSpacing" cname="gtk_tree_view_column_get_spacing">
+        <return-type type="gint"/>
+      </method>
       <method name="GetClickable" cname="gtk_tree_view_column_get_clickable">
         <return-type type="gboolean"/>
       </method>
@@ -18145,12 +16031,18 @@
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkCellRenderer*" name="cell_renderer"/>
-          <parameter type="G" name=""/>
+          <parameter type="G"/>
         </parameters>
       </method>
       <method name="GetAlignment" cname="gtk_tree_view_column_get_alignment">
         <return-type type="gfloat"/>
       </method>
+      <method name="SetMinWidth" cname="gtk_tree_view_column_set_min_width">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="min_width"/>
+        </parameters>
+      </method>
       <constructor cname="gtk_tree_view_column_new"/>
       <method name="AddAttribute" cname="gtk_tree_view_column_add_attribute">
         <return-type type="void"/>
@@ -18160,6 +16052,27 @@
           <parameter type="gint" name="column"/>
         </parameters>
       </method>
+      <method name="GetSortOrder" cname="gtk_tree_view_column_get_sort_order">
+        <return-type type="GtkSortType"/>
+      </method>
+      <method name="SetResizable" cname="gtk_tree_view_column_set_resizable">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="resizable"/>
+        </parameters>
+      </method>
+      <method name="GetMaxWidth" cname="gtk_tree_view_column_get_max_width">
+        <return-type type="gint"/>
+      </method>
+      <method name="CellSetCellData" cname="gtk_tree_view_column_cell_set_cell_data">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTreeModel*" name="tree_model"/>
+          <parameter type="GtkTreeIter*" name="iter"/>
+          <parameter type="gboolean" name="is_expander"/>
+          <parameter type="gboolean" name="is_expanded"/>
+        </parameters>
+      </method>
     </object>
     <object name="VBox" cname="GtkVBox" parent="GtkBox">
       <constructor cname="gtk_vbox_new">
@@ -18189,21 +16102,18 @@
           <parameter type="GtkAdjustment*" name="vadjustment"/>
         </parameters>
       </signal>
-      <method name="SetHadjustment" cname="gtk_viewport_set_hadjustment">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment"/>
-        </parameters>
-      </method>
-      <method name="GetHadjustment" cname="gtk_viewport_get_hadjustment">
-        <return-type type="GtkAdjustment*"/>
-      </method>
       <method name="SetShadowType" cname="gtk_viewport_set_shadow_type">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkShadowType" name="type"/>
         </parameters>
       </method>
+      <method name="SetHadjustment" cname="gtk_viewport_set_hadjustment">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkAdjustment*" name="adjustment"/>
+        </parameters>
+      </method>
       <constructor cname="gtk_viewport_new">
         <parameters>
           <parameter type="GtkAdjustment*" name="hadjustment"/>
@@ -18219,6 +16129,9 @@
       <method name="GetShadowType" cname="gtk_viewport_get_shadow_type">
         <return-type type="GtkShadowType"/>
       </method>
+      <method name="GetHadjustment" cname="gtk_viewport_get_hadjustment">
+        <return-type type="GtkAdjustment*"/>
+      </method>
       <method name="GetVadjustment" cname="gtk_viewport_get_vadjustment">
         <return-type type="GtkAdjustment*"/>
       </method>
@@ -18230,6 +16143,11 @@
       <constructor cname="gtk_vruler_new"/>
     </object>
     <object name="VScale" cname="GtkVScale" parent="GtkScale">
+      <constructor cname="gtk_vscale_new">
+        <parameters>
+          <parameter type="GtkAdjustment*" name="adjustment"/>
+        </parameters>
+      </constructor>
       <constructor cname="gtk_vscale_new_with_range">
         <parameters>
           <parameter type="gdouble" name="min"/>
@@ -18237,11 +16155,6 @@
           <parameter type="gdouble" name="step"/>
         </parameters>
       </constructor>
-      <constructor cname="gtk_vscale_new">
-        <parameters>
-          <parameter type="GtkAdjustment*" name="adjustment"/>
-        </parameters>
-      </constructor>
     </object>
     <object name="VScrollbar" cname="GtkVScrollbar" parent="GtkScrollbar">
       <constructor cname="gtk_vscrollbar_new">
@@ -18695,11 +16608,14 @@
         </parameters>
       </signal>
       <signal name="AccelClosuresChanged" cname="accel_closures_changed">
-        <return-type type=""/>
+        <return-type/>
       </signal>
       <implements>
         <interface cname="AtkImplementor"/>
       </implements>
+      <method name="GetPangoContext" cname="gtk_widget_get_pango_context">
+        <return-type type="PangoContext*"/>
+      </method>
       <method name="Show" cname="gtk_widget_show">
         <return-type type="void"/>
       </method>
@@ -18716,6 +16632,17 @@
           <parameter type="GtkAccelFlags" name="accel_flags"/>
         </parameters>
       </method>
+      <method name="RemoveAccelerator" cname="gtk_widget_remove_accelerator">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkAccelGroup*" name="accel_group"/>
+          <parameter type="guint" name="accel_key"/>
+          <parameter type="GdkModifierType" name="accel_mods"/>
+        </parameters>
+      </method>
+      <method name="QueueDraw" cname="gtk_widget_queue_draw">
+        <return-type type="void"/>
+      </method>
       <method name="GetChildVisible" cname="gtk_widget_get_child_visible">
         <return-type type="gboolean"/>
       </method>
@@ -18730,6 +16657,18 @@
       <method name="FreezeChildNotify" cname="gtk_widget_freeze_child_notify">
         <return-type type="void"/>
       </method>
+      <method name="ModifyFont" cname="gtk_widget_modify_font">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="PangoFontDescription*" name="font_desc"/>
+        </parameters>
+      </method>
+      <method name="SetParent" cname="gtk_widget_set_parent">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="parent"/>
+        </parameters>
+      </method>
       <method name="SendExpose" cname="gtk_widget_send_expose">
         <return-type type="gint"/>
         <parameters>
@@ -18739,6 +16678,13 @@
       <method name="GetDirection" cname="gtk_widget_get_direction">
         <return-type type="GtkTextDirection"/>
       </method>
+      <method name="ModifyBase" cname="gtk_widget_modify_base">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkStateType" name="state"/>
+          <parameter type="GdkColor*" name="color"/>
+        </parameters>
+      </method>
       <method name="GetEvents" cname="gtk_widget_get_events">
         <return-type type="gint"/>
       </method>
@@ -18748,12 +16694,31 @@
           <parameter type="GtkRequisition*" name="requisition"/>
         </parameters>
       </method>
+      <method name="ModifyText" cname="gtk_widget_modify_text">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkStateType" name="state"/>
+          <parameter type="GdkColor*" name="color"/>
+        </parameters>
+      </method>
       <method name="SetExtensionEvents" cname="gtk_widget_set_extension_events">
         <return-type type="void"/>
         <parameters>
           <parameter type="GdkExtensionMode" name="mode"/>
         </parameters>
       </method>
+      <method name="SetCompositeName" cname="gtk_widget_set_composite_name">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="const-gchar*" name="name"/>
+        </parameters>
+      </method>
+      <method name="RegionIntersect" cname="gtk_widget_region_intersect">
+        <return-type type="GdkRegion*"/>
+        <parameters>
+          <parameter type="GdkRegion*" name="region"/>
+        </parameters>
+      </method>
       <method name="Destroy" cname="gtk_widget_destroy">
         <return-type type="void"/>
       </method>
@@ -18761,7 +16726,7 @@
         <return-type type="void"/>
         <parameters>
           <parameter type="const-gchar*" name="first_property_name"/>
-          <parameter type="c" name=""/>
+          <parameter type="c"/>
         </parameters>
       </method>
       <method name="Ref" cname="gtk_widget_ref">
@@ -18777,6 +16742,18 @@
           <parameter type="gint*" name="dest_y"/>
         </parameters>
       </method>
+      <method name="Unparent" cname="gtk_widget_unparent">
+        <return-type type="void"/>
+      </method>
+      <method name="Unref" cname="gtk_widget_unref">
+        <return-type type="void"/>
+      </method>
+      <method name="ChildNotify" cname="gtk_widget_child_notify">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="const-gchar*" name="child_property"/>
+        </parameters>
+      </method>
       <method name="GetSettings" cname="gtk_widget_get_settings">
         <return-type type="GtkSettings*"/>
       </method>
@@ -18789,24 +16766,58 @@
           <parameter type="gint" name="events"/>
         </parameters>
       </method>
+      <method name="GetParentWindow" cname="gtk_widget_get_parent_window">
+        <return-type type="GdkWindow*"/>
+      </method>
       <method name="MnemonicActivate" cname="gtk_widget_mnemonic_activate">
         <return-type type="gboolean"/>
         <parameters>
           <parameter type="gboolean" name="group_cycling"/>
         </parameters>
       </method>
+      <method name="Hide" cname="gtk_widget_hide">
+        <return-type type="void"/>
+      </method>
       <method name="ModifyStyle" cname="gtk_widget_modify_style">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkRcStyle*" name="style"/>
         </parameters>
       </method>
+      <method name="ChildFocus" cname="gtk_widget_child_focus">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkDirectionType" name="direction"/>
+        </parameters>
+      </method>
+      <method name="SetAppPaintable" cname="gtk_widget_set_app_paintable">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="app_paintable"/>
+        </parameters>
+      </method>
       <method name="ThawChildNotify" cname="gtk_widget_thaw_child_notify">
         <return-type type="void"/>
       </method>
       <method name="GetCompositeName" cname="gtk_widget_get_composite_name">
         <return-type type="gchar*"/>
       </method>
+      <method name="Reparent" cname="gtk_widget_reparent">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="new_parent"/>
+        </parameters>
+      </method>
+      <method name="Map" cname="gtk_widget_map">
+        <return-type type="void"/>
+      </method>
+      <method name="GetPointer" cname="gtk_widget_get_pointer">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint*" name="x"/>
+          <parameter type="gint*" name="y"/>
+        </parameters>
+      </method>
       <method name="Unmap" cname="gtk_widget_unmap">
         <return-type type="void"/>
       </method>
@@ -18819,6 +16830,12 @@
           <parameter type="GtkWidget**" name="widget_pointer"/>
         </parameters>
       </method>
+      <method name="Realize" cname="gtk_widget_realize">
+        <return-type type="void"/>
+      </method>
+      <method name="GetAccessible" cname="gtk_widget_get_accessible">
+        <return-type type="AtkObject*"/>
+      </method>
       <method name="SetColormap" cname="gtk_widget_set_colormap">
         <return-type type="void"/>
         <parameters>
@@ -18837,15 +16854,46 @@
           <parameter type="GtkStateType" name="state"/>
         </parameters>
       </method>
+      <method name="QueueDrawArea" cname="gtk_widget_queue_draw_area">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="x"/>
+          <parameter type="gint" name="y"/>
+          <parameter type="gint" name="width"/>
+          <parameter type="gint" name="height"/>
+        </parameters>
+      </method>
       <method name="IsAncestor" cname="gtk_widget_is_ancestor">
         <return-type type="gboolean"/>
         <parameters>
           <parameter type="GtkWidget*" name="ancestor"/>
         </parameters>
       </method>
+      <method name="StyleGetValist" cname="gtk_widget_style_get_valist">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="const-gchar*" name="first_property_name"/>
+          <parameter type="va_list" name="var_args"/>
+        </parameters>
+      </method>
+      <method name="SetStyle" cname="gtk_widget_set_style">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkStyle*" name="style"/>
+        </parameters>
+      </method>
       <method name="ShowAll" cname="gtk_widget_show_all">
         <return-type type="void"/>
       </method>
+      <method name="GetChildRequisition" cname="gtk_widget_get_child_requisition">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkRequisition*" name="requisition"/>
+        </parameters>
+      </method>
+      <method name="IsFocus" cname="gtk_widget_is_focus">
+        <return-type type="gboolean"/>
+      </method>
       <method name="RenderIcon" cname="gtk_widget_render_icon">
         <return-type type="GdkPixbuf*"/>
         <parameters>
@@ -18864,6 +16912,9 @@
       <method name="GetName" cname="gtk_widget_get_name">
         <return-type type="const-gchar*"/>
       </method>
+      <method name="GrabFocus" cname="gtk_widget_grab_focus">
+        <return-type type="void"/>
+      </method>
       <method name="ModifyBg" cname="gtk_widget_modify_bg">
         <return-type type="void"/>
         <parameters>
@@ -18893,12 +16944,36 @@
           <parameter type="GdkColor*" name="color"/>
         </parameters>
       </method>
+      <method name="CreatePangoContext" cname="gtk_widget_create_pango_context">
+        <return-type type="PangoContext*"/>
+      </method>
+      <method name="SizeAllocate" cname="gtk_widget_size_allocate">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkAllocation*" name="allocation"/>
+        </parameters>
+      </method>
+      <method name="SetChildVisible" cname="gtk_widget_set_child_visible">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="is_visible"/>
+        </parameters>
+      </method>
+      <method name="ShowNow" cname="gtk_widget_show_now">
+        <return-type type="void"/>
+      </method>
       <method name="Activate" cname="gtk_widget_activate">
         <return-type type="gboolean"/>
       </method>
       <method name="GetStyle" cname="gtk_widget_get_style">
         <return-type type="GtkStyle*"/>
       </method>
+      <method name="GetAncestor" cname="gtk_widget_get_ancestor">
+        <return-type type="GtkWidget*"/>
+        <parameters>
+          <parameter type="GtkType" name="widget_type"/>
+        </parameters>
+      </method>
       <method name="GetToplevel" cname="gtk_widget_get_toplevel">
         <return-type type="GtkWidget*"/>
       </method>
@@ -18909,6 +16984,15 @@
           <parameter type="GtkAdjustment*" name="vadjustment"/>
         </parameters>
       </method>
+      <method name="SetDoubleBuffered" cname="gtk_widget_set_double_buffered">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="double_buffered"/>
+        </parameters>
+      </method>
+      <method name="GetModifierStyle" cname="gtk_widget_get_modifier_style">
+        <return-type type="GtkRcStyle*"/>
+      </method>
       <method name="EnsureStyle" cname="gtk_widget_ensure_style">
         <return-type type="void"/>
       </method>
@@ -18920,12 +17004,37 @@
           <parameter type="gint" name="offset_y"/>
         </parameters>
       </method>
+      <method name="QueueResize" cname="gtk_widget_queue_resize">
+        <return-type type="void"/>
+      </method>
+      <method name="StyleGetProperty" cname="gtk_widget_style_get_property">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="const-gchar*" name="property_name"/>
+          <parameter type="GValue*" name="value"/>
+        </parameters>
+      </method>
+      <method name="ListAccelClosures" cname="gtk_widget_list_accel_closures">
+        <return-type type="GList*"/>
+      </method>
       <method name="SetDirection" cname="gtk_widget_set_direction">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkTextDirection" name="dir"/>
         </parameters>
       </method>
+      <method name="SetRedrawOnAllocate" cname="gtk_widget_set_redraw_on_allocate">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="redraw_on_allocate"/>
+        </parameters>
+      </method>
+      <method name="SetName" cname="gtk_widget_set_name">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="const-gchar*" name="name"/>
+        </parameters>
+      </method>
       <method name="SetParentWindow" cname="gtk_widget_set_parent_window">
         <return-type type="void"/>
         <parameters>
@@ -18948,208 +17057,6 @@
       <method name="GrabDefault" cname="gtk_widget_grab_default">
         <return-type type="void"/>
       </method>
-      <method name="CreatePangoLayout" cname="gtk_widget_create_pango_layout">
-        <return-type type="PangoLayout*"/>
-        <parameters>
-          <parameter type="const-gchar*" name="text"/>
-        </parameters>
-      </method>
-      <method name="GetPangoContext" cname="gtk_widget_get_pango_context">
-        <return-type type="PangoContext*"/>
-      </method>
-      <method name="RemoveAccelerator" cname="gtk_widget_remove_accelerator">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkAccelGroup*" name="accel_group"/>
-          <parameter type="guint" name="accel_key"/>
-          <parameter type="GdkModifierType" name="accel_mods"/>
-        </parameters>
-      </method>
-      <method name="QueueDraw" cname="gtk_widget_queue_draw">
-        <return-type type="void"/>
-      </method>
-      <method name="ModifyFont" cname="gtk_widget_modify_font">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="PangoFontDescription*" name="font_desc"/>
-        </parameters>
-      </method>
-      <method name="SetParent" cname="gtk_widget_set_parent">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="parent"/>
-        </parameters>
-      </method>
-      <method name="ModifyBase" cname="gtk_widget_modify_base">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkStateType" name="state"/>
-          <parameter type="GdkColor*" name="color"/>
-        </parameters>
-      </method>
-      <method name="ModifyText" cname="gtk_widget_modify_text">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkStateType" name="state"/>
-          <parameter type="GdkColor*" name="color"/>
-        </parameters>
-      </method>
-      <method name="SetCompositeName" cname="gtk_widget_set_composite_name">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-gchar*" name="name"/>
-        </parameters>
-      </method>
-      <method name="RegionIntersect" cname="gtk_widget_region_intersect">
-        <return-type type="GdkRegion*"/>
-        <parameters>
-          <parameter type="GdkRegion*" name="region"/>
-        </parameters>
-      </method>
-      <method name="Unparent" cname="gtk_widget_unparent">
-        <return-type type="void"/>
-      </method>
-      <method name="Unref" cname="gtk_widget_unref">
-        <return-type type="void"/>
-      </method>
-      <method name="ChildNotify" cname="gtk_widget_child_notify">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-gchar*" name="child_property"/>
-        </parameters>
-      </method>
-      <method name="GetParentWindow" cname="gtk_widget_get_parent_window">
-        <return-type type="GdkWindow*"/>
-      </method>
-      <method name="Hide" cname="gtk_widget_hide">
-        <return-type type="void"/>
-      </method>
-      <method name="ChildFocus" cname="gtk_widget_child_focus">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkDirectionType" name="direction"/>
-        </parameters>
-      </method>
-      <method name="SetAppPaintable" cname="gtk_widget_set_app_paintable">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="app_paintable"/>
-        </parameters>
-      </method>
-      <method name="Reparent" cname="gtk_widget_reparent">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="new_parent"/>
-        </parameters>
-      </method>
-      <method name="Map" cname="gtk_widget_map">
-        <return-type type="void"/>
-      </method>
-      <method name="GetPointer" cname="gtk_widget_get_pointer">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint*" name="x"/>
-          <parameter type="gint*" name="y"/>
-        </parameters>
-      </method>
-      <method name="Realize" cname="gtk_widget_realize">
-        <return-type type="void"/>
-      </method>
-      <method name="GetAccessible" cname="gtk_widget_get_accessible">
-        <return-type type="AtkObject*"/>
-      </method>
-      <method name="QueueDrawArea" cname="gtk_widget_queue_draw_area">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
-        </parameters>
-      </method>
-      <method name="SetStyle" cname="gtk_widget_set_style">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkStyle*" name="style"/>
-        </parameters>
-      </method>
-      <method name="StyleGetValist" cname="gtk_widget_style_get_valist">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-gchar*" name="first_property_name"/>
-          <parameter type="va_list" name="var_args"/>
-        </parameters>
-      </method>
-      <method name="GetChildRequisition" cname="gtk_widget_get_child_requisition">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkRequisition*" name="requisition"/>
-        </parameters>
-      </method>
-      <method name="IsFocus" cname="gtk_widget_is_focus">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="GrabFocus" cname="gtk_widget_grab_focus">
-        <return-type type="void"/>
-      </method>
-      <method name="CreatePangoContext" cname="gtk_widget_create_pango_context">
-        <return-type type="PangoContext*"/>
-      </method>
-      <method name="SizeAllocate" cname="gtk_widget_size_allocate">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkAllocation*" name="allocation"/>
-        </parameters>
-      </method>
-      <method name="SetChildVisible" cname="gtk_widget_set_child_visible">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="is_visible"/>
-        </parameters>
-      </method>
-      <method name="ShowNow" cname="gtk_widget_show_now">
-        <return-type type="void"/>
-      </method>
-      <method name="GetAncestor" cname="gtk_widget_get_ancestor">
-        <return-type type="GtkWidget*"/>
-        <parameters>
-          <parameter type="GtkType" name="widget_type"/>
-        </parameters>
-      </method>
-      <method name="SetDoubleBuffered" cname="gtk_widget_set_double_buffered">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="double_buffered"/>
-        </parameters>
-      </method>
-      <method name="GetModifierStyle" cname="gtk_widget_get_modifier_style">
-        <return-type type="GtkRcStyle*"/>
-      </method>
-      <method name="QueueResize" cname="gtk_widget_queue_resize">
-        <return-type type="void"/>
-      </method>
-      <method name="StyleGetProperty" cname="gtk_widget_style_get_property">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-gchar*" name="property_name"/>
-          <parameter type="GValue*" name="value"/>
-        </parameters>
-      </method>
-      <method name="ListAccelClosures" cname="gtk_widget_list_accel_closures">
-        <return-type type="GList*"/>
-      </method>
-      <method name="SetRedrawOnAllocate" cname="gtk_widget_set_redraw_on_allocate">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="redraw_on_allocate"/>
-        </parameters>
-      </method>
-      <method name="SetName" cname="gtk_widget_set_name">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-gchar*" name="name"/>
-        </parameters>
-      </method>
       <method name="ResetShapes" cname="gtk_widget_reset_shapes">
         <return-type type="void"/>
       </method>
@@ -19160,6 +17067,12 @@
           <parameter type="gint*" name="height"/>
         </parameters>
       </method>
+      <method name="CreatePangoLayout" cname="gtk_widget_create_pango_layout">
+        <return-type type="PangoLayout*"/>
+        <parameters>
+          <parameter type="const-gchar*" name="text"/>
+        </parameters>
+      </method>
       <method name="GetVisual" cname="gtk_widget_get_visual">
         <return-type type="GdkVisual*"/>
       </method>
@@ -19185,7 +17098,7 @@
         <parameters>
           <parameter type="GtkType" name="type"/>
           <parameter type="const-gchar*" name="first_property_name"/>
-          <parameter type="c" name=""/>
+          <parameter type="c"/>
         </parameters>
       </constructor>
     </object>
@@ -19279,6 +17192,13 @@
       <method name="GetDestroyWithParent" cname="gtk_window_get_destroy_with_parent">
         <return-type type="gboolean"/>
       </method>
+      <method name="GetDefaultSize" cname="gtk_window_get_default_size">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint*" name="width"/>
+          <parameter type="gint*" name="height"/>
+        </parameters>
+      </method>
       <method name="GetFrameDimensions" cname="gtk_window_get_frame_dimensions">
         <return-type type="void"/>
         <parameters>
@@ -19307,6 +17227,13 @@
       <method name="GetIcon" cname="gtk_window_get_icon">
         <return-type type="GdkPixbuf*"/>
       </method>
+      <method name="SetWmclass" cname="gtk_window_set_wmclass">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="const-gchar*" name="wmclass_name"/>
+          <parameter type="const-gchar*" name="wmclass_class"/>
+        </parameters>
+      </method>
       <method name="SetFocus" cname="gtk_window_set_focus">
         <return-type type="void"/>
         <parameters>
@@ -19338,126 +17265,6 @@
           <parameter type="const-gchar*" name="geometry"/>
         </parameters>
       </method>
-      <method name="ActivateFocus" cname="gtk_window_activate_focus">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="SetTransientFor" cname="gtk_window_set_transient_for">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWindow*" name="parent"/>
-        </parameters>
-      </method>
-      <method name="SetModal" cname="gtk_window_set_modal">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="modal"/>
-        </parameters>
-      </method>
-      <method name="BeginMoveDrag" cname="gtk_window_begin_move_drag">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="button"/>
-          <parameter type="gint" name="root_x"/>
-          <parameter type="gint" name="root_y"/>
-          <parameter type="guint32" name="timestamp"/>
-        </parameters>
-      </method>
-      <method name="GetDecorated" cname="gtk_window_get_decorated">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="GetSize" cname="gtk_window_get_size">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint*" name="width"/>
-          <parameter type="gint*" name="height"/>
-        </parameters>
-      </method>
-      <method name="SetPosition" cname="gtk_window_set_position">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWindowPosition" name="position"/>
-        </parameters>
-      </method>
-      <method name="SetResizable" cname="gtk_window_set_resizable">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="resizable"/>
-        </parameters>
-      </method>
-      <method name="SetGeometryHints" cname="gtk_window_set_geometry_hints">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkWidget*" name="geometry_widget"/>
-          <parameter type="GdkGeometry*" name="geometry"/>
-          <parameter type="GdkWindowHints" name="geom_mask"/>
-        </parameters>
-      </method>
-      <method name="GetTypeHint" cname="gtk_window_get_type_hint">
-        <return-type type="GdkWindowTypeHint"/>
-      </method>
-      <method name="SetHasFrame" cname="gtk_window_set_has_frame">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="setting"/>
-        </parameters>
-      </method>
-      <constructor cname="gtk_window_new">
-        <parameters>
-          <parameter type="GtkWindowType" name="type"/>
-        </parameters>
-      </constructor>
-      <method name="Move" cname="gtk_window_move">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="x"/>
-          <parameter type="gint" name="y"/>
-        </parameters>
-      </method>
-      <method name="SetRole" cname="gtk_window_set_role">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-gchar*" name="role"/>
-        </parameters>
-      </method>
-      <method name="Present" cname="gtk_window_present">
-        <return-type type="void"/>
-      </method>
-      <method name="RemoveEmbeddedXid" cname="gtk_window_remove_embedded_xid">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="guint" name="xid"/>
-        </parameters>
-      </method>
-      <method name="GetTransientFor" cname="gtk_window_get_transient_for">
-        <return-type type="GtkWindow*"/>
-      </method>
-      <method name="MnemonicActivate" cname="gtk_window_mnemonic_activate">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="guint" name="keyval"/>
-          <parameter type="GdkModifierType" name="modifier"/>
-        </parameters>
-      </method>
-      <method name="SetTitle" cname="gtk_window_set_title">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-gchar*" name="title"/>
-        </parameters>
-      </method>
-      <method name="GetDefaultSize" cname="gtk_window_get_default_size">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint*" name="width"/>
-          <parameter type="gint*" name="height"/>
-        </parameters>
-      </method>
-      <method name="SetWmclass" cname="gtk_window_set_wmclass">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-gchar*" name="wmclass_name"/>
-          <parameter type="const-gchar*" name="wmclass_class"/>
-        </parameters>
-      </method>
       <method name="AddEmbeddedXid" cname="gtk_window_add_embedded_xid">
         <return-type type="void"/>
         <parameters>
@@ -19476,6 +17283,9 @@
       <method name="Unstick" cname="gtk_window_unstick">
         <return-type type="void"/>
       </method>
+      <method name="ActivateFocus" cname="gtk_window_activate_focus">
+        <return-type type="gboolean"/>
+      </method>
       <method name="SetTypeHint" cname="gtk_window_set_type_hint">
         <return-type type="void"/>
         <parameters>
@@ -19501,6 +17311,18 @@
           <parameter type="GdkModifierType" name="modifier"/>
         </parameters>
       </method>
+      <method name="SetTransientFor" cname="gtk_window_set_transient_for">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWindow*" name="parent"/>
+        </parameters>
+      </method>
+      <method name="SetModal" cname="gtk_window_set_modal">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="modal"/>
+        </parameters>
+      </method>
       <method name="GetIconList" cname="gtk_window_get_icon_list">
         <return-type type="GList*"/>
       </method>
@@ -19533,6 +17355,37 @@
           <parameter type="GtkAccelGroup*" name="accel_group"/>
         </parameters>
       </method>
+      <method name="BeginMoveDrag" cname="gtk_window_begin_move_drag">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="button"/>
+          <parameter type="gint" name="root_x"/>
+          <parameter type="gint" name="root_y"/>
+          <parameter type="guint32" name="timestamp"/>
+        </parameters>
+      </method>
+      <method name="GetDecorated" cname="gtk_window_get_decorated">
+        <return-type type="gboolean"/>
+      </method>
+      <method name="GetSize" cname="gtk_window_get_size">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint*" name="width"/>
+          <parameter type="gint*" name="height"/>
+        </parameters>
+      </method>
+      <method name="SetPosition" cname="gtk_window_set_position">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWindowPosition" name="position"/>
+        </parameters>
+      </method>
+      <method name="SetResizable" cname="gtk_window_set_resizable">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="resizable"/>
+        </parameters>
+      </method>
       <method name="SetDestroyWithParent" cname="gtk_window_set_destroy_with_parent">
         <return-type type="void"/>
         <parameters>
@@ -19542,6 +17395,14 @@
       <method name="Iconify" cname="gtk_window_iconify">
         <return-type type="void"/>
       </method>
+      <method name="SetGeometryHints" cname="gtk_window_set_geometry_hints">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkWidget*" name="geometry_widget"/>
+          <parameter type="GdkGeometry*" name="geometry"/>
+          <parameter type="GdkWindowHints" name="geom_mask"/>
+        </parameters>
+      </method>
       <method name="SetDefaultSize" cname="gtk_window_set_default_size">
         <return-type type="void"/>
         <parameters>
@@ -19549,18 +17410,39 @@
           <parameter type="gint" name="height"/>
         </parameters>
       </method>
+      <method name="GetTypeHint" cname="gtk_window_get_type_hint">
+        <return-type type="GdkWindowTypeHint"/>
+      </method>
       <method name="GetModal" cname="gtk_window_get_modal">
         <return-type type="gboolean"/>
       </method>
       <method name="GetGravity" cname="gtk_window_get_gravity">
         <return-type type="GdkGravity"/>
       </method>
+      <method name="SetHasFrame" cname="gtk_window_set_has_frame">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="setting"/>
+        </parameters>
+      </method>
       <method name="SetDefault" cname="gtk_window_set_default">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkWidget*" name="default_widget"/>
         </parameters>
       </method>
+      <constructor cname="gtk_window_new">
+        <parameters>
+          <parameter type="GtkWindowType" name="type"/>
+        </parameters>
+      </constructor>
+      <method name="Move" cname="gtk_window_move">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="x"/>
+          <parameter type="gint" name="y"/>
+        </parameters>
+      </method>
       <method name="Stick" cname="gtk_window_stick">
         <return-type type="void"/>
       </method>
@@ -19573,21 +17455,52 @@
           <parameter type="gint" name="bottom"/>
         </parameters>
       </method>
+      <method name="SetRole" cname="gtk_window_set_role">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="const-gchar*" name="role"/>
+        </parameters>
+      </method>
       <method name="Deiconify" cname="gtk_window_deiconify">
         <return-type type="void"/>
       </method>
+      <method name="Present" cname="gtk_window_present">
+        <return-type type="void"/>
+      </method>
+      <method name="RemoveEmbeddedXid" cname="gtk_window_remove_embedded_xid">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="guint" name="xid"/>
+        </parameters>
+      </method>
       <method name="Maximize" cname="gtk_window_maximize">
         <return-type type="void"/>
       </method>
       <method name="Unmaximize" cname="gtk_window_unmaximize">
         <return-type type="void"/>
       </method>
+      <method name="GetTransientFor" cname="gtk_window_get_transient_for">
+        <return-type type="GtkWindow*"/>
+      </method>
       <method name="GetResizable" cname="gtk_window_get_resizable">
         <return-type type="gboolean"/>
       </method>
       <method name="ActivateDefault" cname="gtk_window_activate_default">
         <return-type type="gboolean"/>
       </method>
+      <method name="MnemonicActivate" cname="gtk_window_mnemonic_activate">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="guint" name="keyval"/>
+          <parameter type="GdkModifierType" name="modifier"/>
+        </parameters>
+      </method>
+      <method name="SetTitle" cname="gtk_window_set_title">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="const-gchar*" name="title"/>
+        </parameters>
+      </method>
       <method name="GetMnemonicModifier" cname="gtk_window_get_mnemonic_modifier">
         <return-type type="GdkModifierType"/>
       </method>
@@ -19603,13 +17516,13 @@
           <parameter type="GtkWindow*" name="window"/>
         </parameters>
       </method>
-      <constructor cname="gtk_window_group_new"/>
       <method name="AddWindow" cname="gtk_window_group_add_window">
         <return-type type="void"/>
         <parameters>
           <parameter type="GtkWindow*" name="window"/>
         </parameters>
       </method>
+      <constructor cname="gtk_window_group_new"/>
     </object>
     <struct name="AccelGroupEntry" cname="GtkAccelGroupEntry">
       <field cname="key" type="GtkAccelKey"/>
@@ -19656,6 +17569,11 @@
           <parameter type="GtkPathPriorityType" name="priority"/>
         </parameters>
       </method>
+      <constructor cname="gtk_binding_set_new">
+        <parameters>
+          <parameter type="const-gchar*" name="set_name"/>
+        </parameters>
+      </constructor>
       <method name="Activate" cname="gtk_binding_set_activate">
         <return-type type="gboolean"/>
         <parameters>
@@ -19664,11 +17582,6 @@
           <parameter type="GtkObject*" name="object"/>
         </parameters>
       </method>
-      <constructor cname="gtk_binding_set_new">
-        <parameters>
-          <parameter type="const-gchar*" name="set_name"/>
-        </parameters>
-      </constructor>
     </struct>
     <struct name="BindingSignal" cname="GtkBindingSignal">
       <field cname="next" type="GtkBindingSignal*"/>
@@ -19696,106 +17609,6 @@
       <field cname="pack" bits="1" type="guint"/>
       <field cname="is_secondary" bits="1" type="guint"/>
     </struct>
-    <struct name="CListCellInfo" cname="GtkCListCellInfo">
-      <field cname="row" type="gint"/>
-      <field cname="column" type="gint"/>
-    </struct>
-    <struct name="CListColumn" cname="GtkCListColumn">
-      <field cname="title" type="gchar*"/>
-      <field cname="area" type="GdkRectangle"/>
-      <field cname="button" type="GtkWidget*"/>
-      <field cname="window" type="GdkWindow*"/>
-      <field cname="width" type="gint"/>
-      <field cname="min_width" type="gint"/>
-      <field cname="max_width" type="gint"/>
-      <field cname="justification" type="GtkJustification"/>
-      <field cname="visible" bits="1" type="guint"/>
-      <field cname="width_set" bits="1" type="guint"/>
-      <field cname="resizeable" bits="1" type="guint"/>
-      <field cname="auto_resize" bits="1" type="guint"/>
-      <field cname="button_passive" bits="1" type="guint"/>
-    </struct>
-    <struct name="CListDestInfo" cname="GtkCListDestInfo">
-      <field cname="cell" type="GtkCListCellInfo"/>
-      <field cname="insert_pos" type="GtkCListDragPos"/>
-    </struct>
-    <struct name="CListRow" cname="GtkCListRow">
-      <field cname="cell" type="GtkCell*"/>
-      <field cname="state" type="GtkStateType"/>
-      <field cname="foreground" type="GdkColor"/>
-      <field cname="background" type="GdkColor"/>
-      <field cname="style" type="GtkStyle*"/>
-      <field cname="data" type="gpointer"/>
-      <field cname="destroy" type="GtkDestroyNotify"/>
-      <field cname="fg_set" bits="1" type="guint"/>
-      <field cname="bg_set" bits="1" type="guint"/>
-      <field cname="selectable" bits="1" type="guint"/>
-    </struct>
-    <struct name="CTreeNode" cname="GtkCTreeNode">
-      <field cname="list" type="GList"/>
-    </struct>
-    <struct name="CTreeRow" cname="GtkCTreeRow">
-      <field cname="row" type="GtkCListRow"/>
-      <field cname="parent" type="GtkCTreeNode*"/>
-      <field cname="sibling" type="GtkCTreeNode*"/>
-      <field cname="children" type="GtkCTreeNode*"/>
-      <field cname="pixmap_closed" type="GdkPixmap*"/>
-      <field cname="mask_closed" type="GdkBitmap*"/>
-      <field cname="pixmap_opened" type="GdkPixmap*"/>
-      <field cname="mask_opened" type="GdkBitmap*"/>
-      <field cname="level" type="guint16"/>
-      <field cname="is_leaf" bits="1" type="guint"/>
-      <field cname="expanded" bits="1" type="guint"/>
-    </struct>
-    <struct name="Cell" cname="GtkCell">
-      <field cname="type" type="GtkCellType"/>
-      <field cname="vertical" type="gint16"/>
-      <field cname="horizontal" type="gint16"/>
-      <field cname="style" type="GtkStyle*"/>
-      <field cname="{gchar* text" type="union"/>
-      <field cname="{GdkPixmap* pixmap" type="struct"/>
-      <field cname="mask" type="GdkBitmap*"/>
-      <field cname="pm" type="}"/>
-      <field cname="{gchar* text" type="struct"/>
-      <field cname="spacing" type="guint8"/>
-      <field cname="pixmap" type="GdkPixmap*"/>
-      <field cname="mask" type="GdkBitmap*"/>
-      <field cname="pt" type="}"/>
-      <field cname="widget" type="GtkWidget*"/>
-      <field cname="u" type="}"/>
-    </struct>
-    <struct name="CellPixText" cname="GtkCellPixText">
-      <field cname="type" type="GtkCellType"/>
-      <field cname="vertical" type="gint16"/>
-      <field cname="horizontal" type="gint16"/>
-      <field cname="style" type="GtkStyle*"/>
-      <field cname="text" type="gchar*"/>
-      <field cname="spacing" type="guint8"/>
-      <field cname="pixmap" type="GdkPixmap*"/>
-      <field cname="mask" type="GdkBitmap*"/>
-    </struct>
-    <struct name="CellPixmap" cname="GtkCellPixmap">
-      <field cname="type" type="GtkCellType"/>
-      <field cname="vertical" type="gint16"/>
-      <field cname="horizontal" type="gint16"/>
-      <field cname="style" type="GtkStyle*"/>
-      <field cname="pixmap" type="GdkPixmap*"/>
-      <field cname="mask" type="GdkBitmap*"/>
-    </struct>
-    <struct name="CellText" cname="GtkCellText">
-      <field cname="type" type="GtkCellType"/>
-      <field cname="vertical" type="gint16"/>
-      <field cname="horizontal" type="gint16"/>
-      <field cname="style" type="GtkStyle*"/>
-      <field cname="text" type="gchar*"/>
-    </struct>
-    <struct name="CellWidget" cname="GtkCellWidget">
-      <field cname="type" type="GtkCellType"/>
-      <field cname="vertical" type="gint16"/>
-      <field cname="horizontal" type="gint16"/>
-      <field cname="style" type="GtkStyle*"/>
-      <field cname="widget" type="GtkWidget*"/>
-    </struct>
     <struct name="Clipboard" cname="GtkClipboard">
       <field cname="selection" type="GdkAtom"/>
       <field cname="get_func" type="GtkClipboardGetFunc"/>
@@ -19804,6 +17617,19 @@
       <field cname="have_owner" type="gboolean"/>
       <field cname="timestamp" type="guint32"/>
       <field cname="have_selection" type="gboolean"/>
+      <method name="SetWithOwner" cname="gtk_clipboard_set_with_owner">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="const-GtkTargetEntry*" name="targets"/>
+          <parameter type="guint" name="n_targets"/>
+          <parameter type="GtkClipboardGetFunc" name="get_func"/>
+          <parameter type="GtkClipboardClearFunc" name="clear_func"/>
+          <parameter type="GObject*" name="owner"/>
+        </parameters>
+      </method>
+      <method name="WaitIsTextAvailable" cname="gtk_clipboard_wait_is_text_available">
+        <return-type type="gboolean"/>
+      </method>
       <method name="SetWithData" cname="gtk_clipboard_set_with_data">
         <return-type type="gboolean"/>
         <parameters>
@@ -19823,33 +17649,6 @@
           <parameter type="GdkAtom" name="target"/>
         </parameters>
       </method>
-      <method name="RequestContents" cname="gtk_clipboard_request_contents">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdkAtom" name="target"/>
-          <parameter type="GtkClipboardReceivedFunc" name="callback"/>
-          <parameter type="gpointer" name="user_data"/>
-        </parameters>
-      </method>
-      <method name="GetOwner" cname="gtk_clipboard_get_owner">
-        <return-type type="GObject*"/>
-      </method>
-      <method name="WaitForText" cname="gtk_clipboard_wait_for_text">
-        <return-type type="gchar*"/>
-      </method>
-      <method name="SetWithOwner" cname="gtk_clipboard_set_with_owner">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="const-GtkTargetEntry*" name="targets"/>
-          <parameter type="guint" name="n_targets"/>
-          <parameter type="GtkClipboardGetFunc" name="get_func"/>
-          <parameter type="GtkClipboardClearFunc" name="clear_func"/>
-          <parameter type="GObject*" name="owner"/>
-        </parameters>
-      </method>
-      <method name="WaitIsTextAvailable" cname="gtk_clipboard_wait_is_text_available">
-        <return-type type="gboolean"/>
-      </method>
       <method name="SetText" cname="gtk_clipboard_set_text">
         <return-type type="void"/>
         <parameters>
@@ -19864,6 +17663,20 @@
           <parameter type="gpointer" name="user_data"/>
         </parameters>
       </method>
+      <method name="RequestContents" cname="gtk_clipboard_request_contents">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdkAtom" name="target"/>
+          <parameter type="GtkClipboardReceivedFunc" name="callback"/>
+          <parameter type="gpointer" name="user_data"/>
+        </parameters>
+      </method>
+      <method name="GetOwner" cname="gtk_clipboard_get_owner">
+        <return-type type="GObject*"/>
+      </method>
+      <method name="WaitForText" cname="gtk_clipboard_wait_for_text">
+        <return-type type="gchar*"/>
+      </method>
     </struct>
     <struct name="FixedChild" cname="GtkFixedChild">
       <field cname="widget" type="GtkWidget*"/>
@@ -19883,6 +17696,20 @@
       <field cname="cache" type="GSList*"/>
       <field cname="cache_size" type="guint"/>
       <field cname="cache_serial" type="guint"/>
+      <method name="Unref" cname="gtk_icon_set_unref">
+        <return-type type="void"/>
+      </method>
+      <method name="AddSource" cname="gtk_icon_set_add_source">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="const-GtkIconSource*" name="source"/>
+        </parameters>
+      </method>
+      <constructor cname="gtk_icon_set_new_from_pixbuf">
+        <parameters>
+          <parameter type="GdkPixbuf*" name="pixbuf"/>
+        </parameters>
+      </constructor>
       <constructor cname="gtk_icon_set_new"/>
       <method name="Ref" cname="gtk_icon_set_ref">
         <return-type type="GtkIconSet*"/>
@@ -19898,20 +17725,6 @@
           <parameter type="const-char*" name="detail"/>
         </parameters>
       </method>
-      <method name="Unref" cname="gtk_icon_set_unref">
-        <return-type type="void"/>
-      </method>
-      <method name="AddSource" cname="gtk_icon_set_add_source">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-GtkIconSource*" name="source"/>
-        </parameters>
-      </method>
-      <constructor cname="gtk_icon_set_new_from_pixbuf">
-        <parameters>
-          <parameter type="GdkPixbuf*" name="pixbuf"/>
-        </parameters>
-      </constructor>
       <method name="Copy" cname="gtk_icon_set_copy">
         <return-type type="GtkIconSet*"/>
       </method>
@@ -19940,6 +17753,12 @@
           <parameter type="gboolean" name="setting"/>
         </parameters>
       </method>
+      <method name="SetStateWildcarded" cname="gtk_icon_source_set_state_wildcarded">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gboolean" name="setting"/>
+        </parameters>
+      </method>
       <method name="GetDirectionWildcarded" cname="gtk_icon_source_get_direction_wildcarded">
         <return-type type="gboolean"/>
       </method>
@@ -19965,12 +17784,27 @@
           <parameter type="GdkPixbuf*" name="pixbuf"/>
         </parameters>
       </method>
+      <method name="GetStateWildcarded" cname="gtk_icon_source_get_state_wildcarded">
+        <return-type type="gboolean"/>
+      </method>
       <method name="GetFilename" cname="gtk_icon_source_get_filename">
         <return-type type="const-gchar*"/>
       </method>
+      <method name="GetState" cname="gtk_icon_source_get_state">
+        <return-type type="GtkStateType"/>
+      </method>
+      <method name="SetSize" cname="gtk_icon_source_set_size">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkIconSize" name="size"/>
+        </parameters>
+      </method>
       <method name="GetSizeWildcarded" cname="gtk_icon_source_get_size_wildcarded">
         <return-type type="gboolean"/>
       </method>
+      <method name="GetPixbuf" cname="gtk_icon_source_get_pixbuf">
+        <return-type type="GdkPixbuf*"/>
+      </method>
       <method name="SetDirection" cname="gtk_icon_source_set_direction">
         <return-type type="void"/>
         <parameters>
@@ -19989,27 +17823,6 @@
           <parameter type="gboolean" name="setting"/>
         </parameters>
       </method>
-      <method name="SetStateWildcarded" cname="gtk_icon_source_set_state_wildcarded">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gboolean" name="setting"/>
-        </parameters>
-      </method>
-      <method name="GetStateWildcarded" cname="gtk_icon_source_get_state_wildcarded">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="GetState" cname="gtk_icon_source_get_state">
-        <return-type type="GtkStateType"/>
-      </method>
-      <method name="SetSize" cname="gtk_icon_source_set_size">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkIconSize" name="size"/>
-        </parameters>
-      </method>
-      <method name="GetPixbuf" cname="gtk_icon_source_get_pixbuf">
-        <return-type type="GdkPixbuf*"/>
-      </method>
       <method name="Free" cname="gtk_icon_source_free">
         <return-type type="void"/>
       </method>
@@ -20072,15 +17885,6 @@
       <field cname="allocation" type="GtkAllocation"/>
       <field cname="mnemonic_activate_signal" type="guint"/>
     </struct>
-    <struct name="PreviewInfo" cname="GtkPreviewInfo">
-      <field cname="lookup" type="guchar*"/>
-      <field cname="gamma" type="gdouble"/>
-    </struct>
-    <struct name="PropertyMark" cname="GtkPropertyMark">
-      <field cname="property" type="GList*"/>
-      <field cname="offset" type="guint"/>
-      <field cname="index" type="guint"/>
-    </struct>
     <struct name="RBNode" cname="GtkRBNode">
       <field cname="flags" bits="14" type="guint"/>
       <field cname="parity" bits="1" type="guint"/>
@@ -20158,6 +17962,9 @@
       <field cname="format" type="gint"/>
       <field cname="data" type="guchar*"/>
       <field cname="length" type="gint"/>
+      <method name="GetText" cname="gtk_selection_data_get_text">
+        <return-type type="guchar*"/>
+      </method>
       <method name="Free" cname="gtk_selection_data_free">
         <return-type type="void"/>
       </method>
@@ -20178,9 +17985,6 @@
       <method name="Copy" cname="gtk_selection_data_copy">
         <return-type type="GtkSelectionData*"/>
       </method>
-      <method name="GetText" cname="gtk_selection_data_get_text">
-        <return-type type="guchar*"/>
-      </method>
       <method name="Set" cname="gtk_selection_data_set">
         <return-type type="void"/>
         <parameters>
@@ -20341,13 +18145,13 @@
           <parameter type="GtkTextAttributes*" name="dest"/>
         </parameters>
       </method>
+      <method name="Copy" cname="gtk_text_attributes_copy">
+        <return-type type="GtkTextAttributes*"/>
+      </method>
       <constructor cname="gtk_text_attributes_new"/>
       <method name="Ref" cname="gtk_text_attributes_ref">
         <return-type type="void"/>
       </method>
-      <method name="Copy" cname="gtk_text_attributes_copy">
-        <return-type type="GtkTextAttributes*"/>
-      </method>
     </boxed>
     <struct name="TextBTree" cname="GtkTextBTree">
       <field cname="root_node" type="GtkTextBTreeNode*"/>
@@ -20373,11 +18177,6 @@
       <field cname="end_iter_segment_stamp" type="guint"/>
       <field cname="child_anchor_table" type="GHashTable*"/>
     </struct>
-    <struct name="TextFont" cname="GtkTextFont">
-      <field cname="gdk_font" type="GdkFont*"/>
-      <field cname="ref_count" type="guint"/>
-      <field cname="char_widths" array_len="256" type="gint16"/>
-    </struct>
     <boxed name="TextIter" cname="GtkTextIter">
       <field cname="dummy1" type="gpointer"/>
       <field cname="dummy2" type="gpointer"/>
@@ -20399,6 +18198,29 @@
       <method name="GetChildAnchor" cname="gtk_text_iter_get_child_anchor">
         <return-type type="GtkTextChildAnchor*"/>
       </method>
+      <method name="StartsLine" cname="gtk_text_iter_starts_line">
+        <return-type type="gboolean"/>
+      </method>
+      <method name="ForwardChars" cname="gtk_text_iter_forward_chars">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="gint" name="count"/>
+        </parameters>
+      </method>
+      <method name="GetVisibleText" cname="gtk_text_iter_get_visible_text">
+        <return-type type="gchar*"/>
+        <parameters>
+          <parameter type="const-GtkTextIter*" name="end"/>
+        </parameters>
+      </method>
+      <method name="ForwardFindChar" cname="gtk_text_iter_forward_find_char">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkTextCharPredicate" name="pred"/>
+          <parameter type="gpointer" name="user_data"/>
+          <parameter type="const-GtkTextIter*" name="limit"/>
+        </parameters>
+      </method>
       <method name="SetLineOffset" cname="gtk_text_iter_set_line_offset">
         <return-type type="void"/>
         <parameters>
@@ -20411,6 +18233,27 @@
           <parameter type="gint" name="char_on_line"/>
         </parameters>
       </method>
+      <method name="GetPixbuf" cname="gtk_text_iter_get_pixbuf">
+        <return-type type="GdkPixbuf*"/>
+      </method>
+      <method name="InsideWord" cname="gtk_text_iter_inside_word">
+        <return-type type="gboolean"/>
+      </method>
+      <method name="TogglesTag" cname="gtk_text_iter_toggles_tag">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkTextTag*" name="tag"/>
+        </parameters>
+      </method>
+      <method name="IsEnd" cname="gtk_text_iter_is_end">
+        <return-type type="gboolean"/>
+      </method>
+      <method name="GetText" cname="gtk_text_iter_get_text">
+        <return-type type="gchar*"/>
+        <parameters>
+          <parameter type="const-GtkTextIter*" name="end"/>
+        </parameters>
+      </method>
       <method name="ForwardToEnd" cname="gtk_text_iter_forward_to_end">
         <return-type type="void"/>
       </method>
@@ -20420,12 +18263,41 @@
           <parameter type="GtkTextAttributes*" name="values"/>
         </parameters>
       </method>
+      <method name="BackwardSentenceStart" cname="gtk_text_iter_backward_sentence_start">
+        <return-type type="gboolean"/>
+      </method>
+      <method name="SetOffset" cname="gtk_text_iter_set_offset">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="char_offset"/>
+        </parameters>
+      </method>
       <method name="ForwardWordEnds" cname="gtk_text_iter_forward_word_ends">
         <return-type type="gboolean"/>
         <parameters>
           <parameter type="gint" name="count"/>
         </parameters>
       </method>
+      <method name="Equal" cname="gtk_text_iter_equal">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="const-GtkTextIter*" name="rhs"/>
+        </parameters>
+      </method>
+      <method name="BackwardFindChar" cname="gtk_text_iter_backward_find_char">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkTextCharPredicate" name="pred"/>
+          <parameter type="gpointer" name="user_data"/>
+          <parameter type="const-GtkTextIter*" name="limit"/>
+        </parameters>
+      </method>
+      <method name="BackwardCursorPosition" cname="gtk_text_iter_backward_cursor_position">
+        <return-type type="gboolean"/>
+      </method>
+      <method name="GetLanguage" cname="gtk_text_iter_get_language">
+        <return-type type="PangoLanguage*"/>
+      </method>
       <method name="GetSlice" cname="gtk_text_iter_get_slice">
         <return-type type="gchar*"/>
         <parameters>
@@ -20438,18 +18310,37 @@
       <method name="GetLineOffset" cname="gtk_text_iter_get_line_offset">
         <return-type type="gint"/>
       </method>
+      <method name="GetVisibleSlice" cname="gtk_text_iter_get_visible_slice">
+        <return-type type="gchar*"/>
+        <parameters>
+          <parameter type="const-GtkTextIter*" name="end"/>
+        </parameters>
+      </method>
       <method name="SetVisibleLineIndex" cname="gtk_text_iter_set_visible_line_index">
         <return-type type="void"/>
         <parameters>
           <parameter type="gint" name="byte_on_line"/>
         </parameters>
       </method>
+      <method name="GetMarks" cname="gtk_text_iter_get_marks">
+        <return-type type="GSList*"/>
+      </method>
       <method name="ForwardLine" cname="gtk_text_iter_forward_line">
         <return-type type="gboolean"/>
       </method>
       <method name="ForwardCursorPosition" cname="gtk_text_iter_forward_cursor_position">
         <return-type type="gboolean"/>
       </method>
+      <method name="BackwardSearch" cname="gtk_text_iter_backward_search">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="const-gchar*" name="str"/>
+          <parameter type="GtkTextSearchFlags" name="flags"/>
+          <parameter type="GtkTextIter*" name="match_start"/>
+          <parameter type="GtkTextIter*" name="match_end"/>
+          <parameter type="const-GtkTextIter*" name="limit"/>
+        </parameters>
+      </method>
       <method name="InRange" cname="gtk_text_iter_in_range">
         <return-type type="gboolean"/>
         <parameters>
@@ -20466,15 +18357,46 @@
       <method name="GetLine" cname="gtk_text_iter_get_line">
         <return-type type="gint"/>
       </method>
+      <method name="StartsWord" cname="gtk_text_iter_starts_word">
+        <return-type type="gboolean"/>
+      </method>
       <method name="GetToggledTags" cname="gtk_text_iter_get_toggled_tags">
         <return-type type="GSList*"/>
         <parameters>
           <parameter type="gboolean" name="toggled_on"/>
         </parameters>
       </method>
+      <method name="Compare" cname="gtk_text_iter_compare">
+        <return-type type="gint"/>
+        <parameters>
+          <parameter type="const-GtkTextIter*" name="rhs"/>
+        </parameters>
+      </method>
       <method name="Free" cname="gtk_text_iter_free">
         <return-type type="void"/>
       </method>
+      <method name="ForwardSentenceEnds" cname="gtk_text_iter_forward_sentence_ends">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="gint" name="count"/>
+        </parameters>
+      </method>
+      <method name="ForwardToTagToggle" cname="gtk_text_iter_forward_to_tag_toggle">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkTextTag*" name="tag"/>
+        </parameters>
+      </method>
+      <method name="ForwardSearch" cname="gtk_text_iter_forward_search">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="const-gchar*" name="str"/>
+          <parameter type="GtkTextSearchFlags" name="flags"/>
+          <parameter type="GtkTextIter*" name="match_start"/>
+          <parameter type="GtkTextIter*" name="match_end"/>
+          <parameter type="const-GtkTextIter*" name="limit"/>
+        </parameters>
+      </method>
       <method name="ForwardLines" cname="gtk_text_iter_forward_lines">
         <return-type type="gboolean"/>
         <parameters>
@@ -20505,12 +18427,33 @@
       <method name="GetVisibleLineOffset" cname="gtk_text_iter_get_visible_line_offset">
         <return-type type="gint"/>
       </method>
+      <method name="GetLineIndex" cname="gtk_text_iter_get_line_index">
+        <return-type type="gint"/>
+      </method>
+      <method name="EndsLine" cname="gtk_text_iter_ends_line">
+        <return-type type="gboolean"/>
+      </method>
+      <method name="IsStart" cname="gtk_text_iter_is_start">
+        <return-type type="gboolean"/>
+      </method>
       <method name="CanInsert" cname="gtk_text_iter_can_insert">
         <return-type type="gboolean"/>
         <parameters>
           <parameter type="gboolean" name="default_editability"/>
         </parameters>
       </method>
+      <method name="GetCharsInLine" cname="gtk_text_iter_get_chars_in_line">
+        <return-type type="gint"/>
+      </method>
+      <method name="InsideSentence" cname="gtk_text_iter_inside_sentence">
+        <return-type type="gboolean"/>
+      </method>
+      <method name="Order" cname="gtk_text_iter_order">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GtkTextIter*" name="second"/>
+        </parameters>
+      </method>
       <method name="ForwardSentenceEnd" cname="gtk_text_iter_forward_sentence_end">
         <return-type type="gboolean"/>
       </method>
@@ -20529,6 +18472,12 @@
       <method name="Copy" cname="gtk_text_iter_copy">
         <return-type type="GtkTextIter*"/>
       </method>
+      <method name="SetLine" cname="gtk_text_iter_set_line">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="line_number"/>
+        </parameters>
+      </method>
       <method name="StartsSentence" cname="gtk_text_iter_starts_sentence">
         <return-type type="gboolean"/>
       </method>
@@ -20544,6 +18493,15 @@
           <parameter type="GtkTextTag*" name="tag"/>
         </parameters>
       </method>
+      <method name="GetBytesInLine" cname="gtk_text_iter_get_bytes_in_line">
+        <return-type type="gint"/>
+      </method>
+      <method name="BackwardWordStarts" cname="gtk_text_iter_backward_word_starts">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="gint" name="count"/>
+        </parameters>
+      </method>
       <method name="GetChar" cname="gtk_text_iter_get_char">
         <return-type type="gunichar"/>
       </method>
@@ -20568,6 +18526,9 @@
       <method name="ForwardWordEnd" cname="gtk_text_iter_forward_word_end">
         <return-type type="gboolean"/>
       </method>
+      <method name="GetBuffer" cname="gtk_text_iter_get_buffer">
+        <return-type type="GtkTextBuffer*"/>
+      </method>
       <method name="BackwardChar" cname="gtk_text_iter_backward_char">
         <return-type type="gboolean"/>
       </method>
@@ -20580,168 +18541,6 @@
           <parameter type="gint" name="count"/>
         </parameters>
       </method>
-      <method name="StartsLine" cname="gtk_text_iter_starts_line">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="ForwardChars" cname="gtk_text_iter_forward_chars">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="gint" name="count"/>
-        </parameters>
-      </method>
-      <method name="GetVisibleText" cname="gtk_text_iter_get_visible_text">
-        <return-type type="gchar*"/>
-        <parameters>
-          <parameter type="const-GtkTextIter*" name="end"/>
-        </parameters>
-      </method>
-      <method name="ForwardFindChar" cname="gtk_text_iter_forward_find_char">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkTextCharPredicate" name="pred"/>
-          <parameter type="gpointer" name="user_data"/>
-          <parameter type="const-GtkTextIter*" name="limit"/>
-        </parameters>
-      </method>
-      <method name="GetPixbuf" cname="gtk_text_iter_get_pixbuf">
-        <return-type type="GdkPixbuf*"/>
-      </method>
-      <method name="InsideWord" cname="gtk_text_iter_inside_word">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="TogglesTag" cname="gtk_text_iter_toggles_tag">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkTextTag*" name="tag"/>
-        </parameters>
-      </method>
-      <method name="IsEnd" cname="gtk_text_iter_is_end">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="GetText" cname="gtk_text_iter_get_text">
-        <return-type type="gchar*"/>
-        <parameters>
-          <parameter type="const-GtkTextIter*" name="end"/>
-        </parameters>
-      </method>
-      <method name="BackwardSentenceStart" cname="gtk_text_iter_backward_sentence_start">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="SetOffset" cname="gtk_text_iter_set_offset">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="char_offset"/>
-        </parameters>
-      </method>
-      <method name="Equal" cname="gtk_text_iter_equal">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="const-GtkTextIter*" name="rhs"/>
-        </parameters>
-      </method>
-      <method name="BackwardFindChar" cname="gtk_text_iter_backward_find_char">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkTextCharPredicate" name="pred"/>
-          <parameter type="gpointer" name="user_data"/>
-          <parameter type="const-GtkTextIter*" name="limit"/>
-        </parameters>
-      </method>
-      <method name="BackwardCursorPosition" cname="gtk_text_iter_backward_cursor_position">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="GetLanguage" cname="gtk_text_iter_get_language">
-        <return-type type="PangoLanguage*"/>
-      </method>
-      <method name="GetVisibleSlice" cname="gtk_text_iter_get_visible_slice">
-        <return-type type="gchar*"/>
-        <parameters>
-          <parameter type="const-GtkTextIter*" name="end"/>
-        </parameters>
-      </method>
-      <method name="GetMarks" cname="gtk_text_iter_get_marks">
-        <return-type type="GSList*"/>
-      </method>
-      <method name="BackwardSearch" cname="gtk_text_iter_backward_search">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="const-gchar*" name="str"/>
-          <parameter type="GtkTextSearchFlags" name="flags"/>
-          <parameter type="GtkTextIter*" name="match_start"/>
-          <parameter type="GtkTextIter*" name="match_end"/>
-          <parameter type="const-GtkTextIter*" name="limit"/>
-        </parameters>
-      </method>
-      <method name="StartsWord" cname="gtk_text_iter_starts_word">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="Compare" cname="gtk_text_iter_compare">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="const-GtkTextIter*" name="rhs"/>
-        </parameters>
-      </method>
-      <method name="ForwardSentenceEnds" cname="gtk_text_iter_forward_sentence_ends">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="gint" name="count"/>
-        </parameters>
-      </method>
-      <method name="ForwardToTagToggle" cname="gtk_text_iter_forward_to_tag_toggle">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkTextTag*" name="tag"/>
-        </parameters>
-      </method>
-      <method name="ForwardSearch" cname="gtk_text_iter_forward_search">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="const-gchar*" name="str"/>
-          <parameter type="GtkTextSearchFlags" name="flags"/>
-          <parameter type="GtkTextIter*" name="match_start"/>
-          <parameter type="GtkTextIter*" name="match_end"/>
-          <parameter type="const-GtkTextIter*" name="limit"/>
-        </parameters>
-      </method>
-      <method name="GetLineIndex" cname="gtk_text_iter_get_line_index">
-        <return-type type="gint"/>
-      </method>
-      <method name="EndsLine" cname="gtk_text_iter_ends_line">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="IsStart" cname="gtk_text_iter_is_start">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="GetCharsInLine" cname="gtk_text_iter_get_chars_in_line">
-        <return-type type="gint"/>
-      </method>
-      <method name="InsideSentence" cname="gtk_text_iter_inside_sentence">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="Order" cname="gtk_text_iter_order">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkTextIter*" name="second"/>
-        </parameters>
-      </method>
-      <method name="SetLine" cname="gtk_text_iter_set_line">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="line_number"/>
-        </parameters>
-      </method>
-      <method name="GetBytesInLine" cname="gtk_text_iter_get_bytes_in_line">
-        <return-type type="gint"/>
-      </method>
-      <method name="BackwardWordStarts" cname="gtk_text_iter_backward_word_starts">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="gint" name="count"/>
-        </parameters>
-      </method>
-      <method name="GetBuffer" cname="gtk_text_iter_get_buffer">
-        <return-type type="GtkTextBuffer*"/>
-      </method>
       <method name="BackwardLines" cname="gtk_text_iter_backward_lines">
         <return-type type="gboolean"/>
         <parameters>
@@ -20850,6 +18649,12 @@
     <boxed name="TreePath" cname="GtkTreePath">
       <field cname="depth" type="gint"/>
       <field cname="indices" type="gint*"/>
+      <method name="PrependIndex" cname="gtk_tree_path_prepend_index">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="index"/>
+        </parameters>
+      </method>
       <method name="Copy" cname="gtk_tree_path_copy">
         <return-type type="GtkTreePath*"/>
       </method>
@@ -20868,13 +18673,31 @@
       <method name="GetDepth" cname="gtk_tree_path_get_depth">
         <return-type type="gint"/>
       </method>
+      <constructor cname="gtk_tree_path_new_from_string">
+        <parameters>
+          <parameter type="const-gchar*" name="path"/>
+        </parameters>
+      </constructor>
       <constructor cname="gtk_tree_path_new"/>
       <method name="Up" cname="gtk_tree_path_up">
         <return-type type="gboolean"/>
       </method>
+      <constructor cname="gtk_tree_path_new_first"/>
+      <method name="IsAncestor" cname="gtk_tree_path_is_ancestor">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter type="GtkTreePath*" name="descendant"/>
+        </parameters>
+      </method>
+      <method name="Next" cname="gtk_tree_path_next">
+        <return-type type="void"/>
+      </method>
       <method name="Prev" cname="gtk_tree_path_prev">
         <return-type type="gboolean"/>
       </method>
+      <method name="Free" cname="gtk_tree_path_free">
+        <return-type type="void"/>
+      </method>
       <method name="IsDescendant" cname="gtk_tree_path_is_descendant">
         <return-type type="gboolean"/>
         <parameters>
@@ -20887,30 +18710,6 @@
           <parameter type="const-GtkTreePath*" name="b"/>
         </parameters>
       </method>
-      <method name="PrependIndex" cname="gtk_tree_path_prepend_index">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="index"/>
-        </parameters>
-      </method>
-      <constructor cname="gtk_tree_path_new_from_string">
-        <parameters>
-          <parameter type="const-gchar*" name="path"/>
-        </parameters>
-      </constructor>
-      <constructor cname="gtk_tree_path_new_first"/>
-      <method name="IsAncestor" cname="gtk_tree_path_is_ancestor">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter type="GtkTreePath*" name="descendant"/>
-        </parameters>
-      </method>
-      <method name="Next" cname="gtk_tree_path_next">
-        <return-type type="void"/>
-      </method>
-      <method name="Free" cname="gtk_tree_path_free">
-        <return-type type="void"/>
-      </method>
       <method name="GetIndices" cname="gtk_tree_path_get_indices">
         <return-type type="gint*"/>
       </method>
@@ -20926,15 +18725,15 @@
           <parameter type="GtkTreePath*" name="path"/>
         </parameters>
       </constructor>
+      <method name="Valid" cname="gtk_tree_row_reference_valid">
+        <return-type type="gboolean"/>
+      </method>
       <constructor cname="gtk_tree_row_reference_new">
         <parameters>
           <parameter type="GtkTreeModel*" name="model"/>
           <parameter type="GtkTreePath*" name="path"/>
         </parameters>
       </constructor>
-      <method name="Valid" cname="gtk_tree_row_reference_valid">
-        <return-type type="gboolean"/>
-      </method>
       <method name="Free" cname="gtk_tree_row_reference_free">
         <return-type type="void"/>
       </method>
diff --git a/glue/Makefile.am b/glue/Makefile.am
index d3d801ba6..dfd1858ac 100644
--- a/glue/Makefile.am
+++ b/glue/Makefile.am
@@ -1,22 +1,21 @@
 lib_LTLIBRARIES = libgtksharpglue.la
 
-BASE_SOURCES = \
+BASESOURCES = \
 	value.c			\
 	textiter.c		\
 	fileselection.c		\
 	error.c			\
 	event.c			\
-	slist.c			\
-	#
+	slist.c	
 
 if ENABLE_GNOME
 libgtksharpglue_la_SOURCES = 	\
-	$(BASE_SOURCES) \
+	$(BASESOURCES) \
 	program.c \
 	#
 else
 libgtksharpglue_la_SOURCES = 	\
-	$(BASE_SOURCES) 
+	$(BASESOURCES) 
 endif
 
 INCLUDES = @BASE_DEPENDENCIES_CFLAGS@ -I$(top_srcdir)
diff --git a/parser/gapi_pp.pl b/parser/gapi_pp.pl
index 96864e4f6..dad4ea5c1 100755
--- a/parser/gapi_pp.pl
+++ b/parser/gapi_pp.pl
@@ -51,7 +51,15 @@ foreach $fname (@hdrs) {
 		} elsif ($line =~ /^#ifndef\s+\w+_H_*\b/) {
 			while ($line !~ /#define/) {$line = <INFILE>;}
 		} elsif ($line =~ /$eatit_regex/) {
-			while ($line !~ /#else|#endif/) {$line = <INFILE>;}
+			$nested = 0;
+			while ($line = <INFILE>) {
+				last if (!$nested && ($line =~ /#else|#endif/));
+				if ($line =~ /#if/) {
+					$nested++;
+				} elsif ($line =~ /#endif/) {
+					$nested--
+				}
+			}
 		} elsif ($line =~ /^#\s*ifn?\s*\!?def/) {
 			#warn "Ignored #if:\n$line";
 		} elsif ($line =~ /typedef\s+struct\s+\w*\s*\{/) {
diff --git a/parser/makefile b/parser/makefile
index 2511c3dde..525fca3e5 100644
--- a/parser/makefile
+++ b/parser/makefile
@@ -6,5 +6,5 @@ generated-stamp: formatXml gtkapi.xml
 formatXml: formatXml.c
 	cc -o formatXml formatXml.c `pkg-config --cflags --libs libxml-2.0 glib-2.0`
 
-gtkapi.xml: build.pl
+gtkapi.xml: build.pl gapi_pp.pl gapi2xml.pl
 	./build.pl