[vala] gtk+-3.0: Update to 2.91.0



commit ac67e10291cd71ea090f461bfd9a107bc88a63ca
Author: Jürg Billeter <j bitron ch>
Date:   Sun Oct 3 23:20:30 2010 +0200

    gtk+-3.0: Update to 2.91.0

 vapi/gtk+-3.0.vapi                          |  866 ++++++-------
 vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala |    2 +-
 vapi/packages/gtk+-3.0/gtk+-3.0.gi          | 1847 +++++++++++++--------------
 vapi/packages/gtk+-3.0/gtk+-3.0.metadata    |    3 +-
 4 files changed, 1257 insertions(+), 1461 deletions(-)
---
diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 68c2401..db1d860 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -224,7 +224,7 @@ namespace Gtk {
 		public static bool lookup (string stock_id, out Gtk.StockItem item);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class AboutDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class AboutDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public AboutDialog ();
 		public unowned string get_artists ();
@@ -233,6 +233,7 @@ namespace Gtk {
 		public unowned string get_copyright ();
 		public unowned string get_documenters ();
 		public unowned string get_license ();
+		public Gtk.License get_license_type ();
 		public unowned Gdk.Pixbuf get_logo ();
 		public unowned string get_logo_icon_name ();
 		public unowned string get_program_name ();
@@ -246,13 +247,12 @@ namespace Gtk {
 		public void set_comments (string comments);
 		public void set_copyright (string copyright);
 		public void set_documenters ([CCode (array_length = false)] string[] documenters);
-		public static void set_email_hook (owned Gtk.AboutDialogActivateLinkFunc func);
 		public void set_license (string license);
+		public void set_license_type (Gtk.License license_type);
 		public void set_logo (Gdk.Pixbuf logo);
 		public void set_logo_icon_name (string icon_name);
 		public void set_program_name (string name);
 		public void set_translator_credits (string translator_credits);
-		public static void set_url_hook (owned Gtk.AboutDialogActivateLinkFunc func);
 		public void set_version (string version);
 		public void set_website (string website);
 		public void set_website_label (string website_label);
@@ -266,6 +266,7 @@ namespace Gtk {
 		[CCode (array_length = false, array_null_terminated = true)]
 		public string[] documenters { get; set; }
 		public string license { get; set; }
+		public Gtk.License license_type { get; set; }
 		public Gdk.Pixbuf logo { get; set; }
 		public string logo_icon_name { get; set; }
 		public string program_name { get; set; }
@@ -274,6 +275,7 @@ namespace Gtk {
 		public string website { get; set; }
 		public string website_label { get; set; }
 		public bool wrap_license { get; set; }
+		public virtual signal bool activate_link (string uri);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class AccelGroup : GLib.Object {
@@ -304,7 +306,7 @@ namespace Gtk {
 		public Gtk.AccelKey key;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class AccelLabel : Gtk.Label, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class AccelLabel : Gtk.Label, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public AccelLabel (string str);
 		public unowned Gtk.Widget get_accel_widget ();
@@ -346,6 +348,7 @@ namespace Gtk {
 		protected Accessible ();
 		public virtual void connect_widget_destroyed ();
 		public unowned Gtk.Widget get_widget ();
+		public void set_widget (Gtk.Widget widget);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Action : GLib.Object, Gtk.Buildable {
@@ -447,8 +450,8 @@ namespace Gtk {
 		public virtual signal void pre_activate (Gtk.Action p0);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Adjustment : Gtk.Object {
-		[CCode (type = "GtkObject*", has_construct_function = false)]
+	public class Adjustment : GLib.InitiallyUnowned {
+		[CCode (has_construct_function = false)]
 		public Adjustment (double value, double lower, double upper, double step_increment, double page_increment, double page_size);
 		public void clamp_page (double lower, double upper);
 		public void configure (double value, double lower, double upper, double step_increment, double page_increment, double page_size);
@@ -476,7 +479,7 @@ namespace Gtk {
 		public virtual signal void value_changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Alignment : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Alignment : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Alignment (float xalign, float yalign, float xscale, float yscale);
 		public void get_padding (out uint padding_top, out uint padding_bottom, out uint padding_left, out uint padding_right);
@@ -506,6 +509,7 @@ namespace Gtk {
 		public void add_window (Gtk.Window window);
 		public virtual unowned Gtk.Window create_window ();
 		public unowned Gtk.Window get_window ();
+		public unowned GLib.SList get_windows ();
 		public void run ();
 		public void set_action_group (Gtk.ActionGroup group);
 		public virtual signal void action (string action_name);
@@ -520,7 +524,7 @@ namespace Gtk {
 		public GLib.Type type;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Arrow : Gtk.Misc, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Arrow : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Arrow (Gtk.ArrowType arrow_type, Gtk.ShadowType shadow_type);
 		public void @set (Gtk.ArrowType arrow_type, Gtk.ShadowType shadow_type);
@@ -530,7 +534,7 @@ namespace Gtk {
 		public Gtk.ShadowType shadow_type { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class AspectFrame : Gtk.Frame, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class AspectFrame : Gtk.Frame, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public AspectFrame (string label, float xalign, float yalign, float ratio, bool obey_child);
 		public void @set (float xalign, float yalign, float ratio, bool obey_child);
@@ -544,7 +548,7 @@ namespace Gtk {
 		public float yalign { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Assistant : Gtk.Window, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Assistant : Gtk.Window, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Assistant ();
 		public void add_action_widget (Gtk.Widget child);
@@ -575,7 +579,7 @@ namespace Gtk {
 		public virtual signal void prepare (Gtk.Widget page);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Bin : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Bin : Gtk.Container, Atk.Implementor, Gtk.Buildable {
 		[CCode (has_construct_function = false)]
 		protected Bin ();
 		public unowned Gtk.Widget get_child ();
@@ -612,7 +616,7 @@ namespace Gtk {
 		public weak string set_name;
 		[CCode (has_construct_function = false)]
 		public BindingSet (string set_name);
-		public bool activate (uint keyval, Gdk.ModifierType modifiers, Gtk.Object object);
+		public bool activate (uint keyval, Gdk.ModifierType modifiers, GLib.Object object);
 		public void add_path (Gtk.PathType path_type, string path_pattern, Gtk.PathPriorityType priority);
 		public static unowned Gtk.BindingSet by_class (void* object_class);
 		public static unowned Gtk.BindingSet find (string set_name);
@@ -628,16 +632,16 @@ namespace Gtk {
 	[Compact]
 	[CCode (copy_function = "gtk_border_copy", type_id = "GTK_TYPE_BORDER", cheader_filename = "gtk/gtk.h")]
 	public class Border {
-		public int bottom;
-		public int left;
-		public int right;
-		public int top;
+		public int16 bottom;
+		public int16 left;
+		public int16 right;
+		public int16 top;
 		[CCode (has_construct_function = false)]
 		public Border ();
 		public Gtk.Border copy ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Box : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class Box : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Box (Gtk.Orientation orientation, bool homogeneous, int spacing);
 		public bool get_homogeneous ();
@@ -652,16 +656,6 @@ namespace Gtk {
 		public bool homogeneous { get; set; }
 		public int spacing { get; set; }
 	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class BoxChild {
-		public uint expand;
-		public uint fill;
-		public uint is_secondary;
-		public uint pack;
-		public uint16 padding;
-		public weak Gtk.Widget widget;
-	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Builder : GLib.Object {
 		[CCode (has_construct_function = false)]
@@ -683,12 +677,13 @@ namespace Gtk {
 		public string translation_domain { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Button : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
+	public class Button : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Button ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Button.from_stock (string stock_id);
 		public void get_alignment (out float xalign, out float yalign);
+		public unowned Gdk.Window get_event_window ();
 		public bool get_focus_on_click ();
 		public unowned Gtk.Widget get_image ();
 		public Gtk.PositionType get_image_position ();
@@ -732,7 +727,7 @@ namespace Gtk {
 		public virtual signal void released ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ButtonBox : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class ButtonBox : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ButtonBox (Gtk.Orientation orientation);
 		public bool get_child_secondary (Gtk.Widget child);
@@ -743,11 +738,12 @@ namespace Gtk {
 		public Gtk.ButtonBoxStyle layout_style { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Calendar : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Calendar : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Calendar ();
 		public void clear_marks ();
 		public void get_date (out uint year, out uint month, out uint day);
+		public bool get_day_is_marked (uint day);
 		public int get_detail_height_rows ();
 		public int get_detail_width_chars ();
 		public Gtk.CalendarDisplayOptions get_display_options ();
@@ -786,17 +782,24 @@ namespace Gtk {
 		public virtual signal void prev_year ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public abstract class CellRenderer : Gtk.Object {
+	public abstract class CellRenderer : GLib.InitiallyUnowned {
 		[CCode (has_construct_function = false)]
 		protected CellRenderer ();
 		public virtual bool activate (Gdk.Event event, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
 		public void get_alignment (float xalign, float yalign);
 		public void get_fixed_size (int width, int height);
 		public void get_padding (int xpad, int ypad);
+		public virtual void get_preferred_height (Gtk.Widget widget, int minimum_size, int natural_size);
+		public virtual void get_preferred_height_for_width (Gtk.Widget widget, int width, int minimum_height, int natural_height);
+		public void get_preferred_size (Gtk.Widget widget, Gtk.Requisition minimum_size, Gtk.Requisition natural_size);
+		public virtual void get_preferred_width (Gtk.Widget widget, int minimum_size, int natural_size);
+		public virtual void get_preferred_width_for_height (Gtk.Widget widget, int height, int minimum_width, int natural_width);
+		public virtual Gtk.SizeRequestMode get_request_mode ();
 		public bool get_sensitive ();
+		[NoWrapper]
 		public abstract void get_size (Gtk.Widget widget, Gdk.Rectangle? cell_area, out int x_offset, out int y_offset, out int width, out int height);
 		public bool get_visible ();
-		public abstract void render (Gdk.Window window, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags);
+		public abstract void render (Cairo.Context cr, Gtk.Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
 		public void set_alignment (float xalign, float yalign);
 		public void set_fixed_size (int width, int height);
 		public void set_padding (int xpad, int ypad);
@@ -887,11 +890,11 @@ namespace Gtk {
 		public uint stock_size { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class CellRendererProgress : Gtk.CellRenderer {
+	public class CellRendererProgress : Gtk.CellRenderer, Gtk.Orientable {
 		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
 		public CellRendererProgress ();
 		[NoAccessorMethod]
-		public Gtk.ProgressBarOrientation orientation { get; set; }
+		public bool inverted { get; set; }
 		[NoAccessorMethod]
 		public int pulse { get; set; }
 		[NoAccessorMethod]
@@ -971,6 +974,8 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public string markup { set; }
 		[NoAccessorMethod]
+		public int max_width_chars { get; set; }
+		[NoAccessorMethod]
 		public int rise { get; set; }
 		[NoAccessorMethod]
 		public bool rise_set { get; set; }
@@ -1040,12 +1045,13 @@ namespace Gtk {
 		public virtual signal void toggled (string path);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class CellView : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.CellLayout {
+	public class CellView : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public CellView ();
+		public void get_desired_height_for_width_of_row (Gtk.TreePath path, int avail_size, int minimum_size, int natural_size);
+		public void get_desired_width_of_row (Gtk.TreePath path, int minimum_size, int natural_size);
 		public unowned Gtk.TreePath get_displayed_row ();
 		public unowned Gtk.TreeModel get_model ();
-		public bool get_size_of_row (Gtk.TreePath path, out Gtk.Requisition requisition);
 		public void set_background_color (Gdk.Color color);
 		public void set_displayed_row (Gtk.TreePath path);
 		public void set_model (Gtk.TreeModel? model);
@@ -1064,22 +1070,22 @@ namespace Gtk {
 		public Gtk.TreeModel model { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class CheckButton : Gtk.ToggleButton, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
+	public class CheckButton : Gtk.ToggleButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public CheckButton ();
 		[NoWrapper]
-		public virtual void draw_indicator (Gdk.Rectangle area);
+		public virtual void draw_indicator (Cairo.Context cr);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public CheckButton.with_label (string label);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public CheckButton.with_mnemonic (string label);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class CheckMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
+	public class CheckMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public CheckMenuItem ();
 		[NoWrapper]
-		public virtual void draw_indicator (Gdk.Rectangle area);
+		public virtual void draw_indicator (Cairo.Context cr);
 		public bool get_active ();
 		public bool get_draw_as_radio ();
 		public bool get_inconsistent ();
@@ -1131,7 +1137,7 @@ namespace Gtk {
 		public virtual signal void owner_change (Gdk.Event p0);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ColorButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
+	public class ColorButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ColorButton ();
 		public uint16 get_alpha ();
@@ -1151,7 +1157,7 @@ namespace Gtk {
 		public virtual signal void color_set ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ColorSelection : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class ColorSelection : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ColorSelection ();
 		public uint16 get_current_alpha ();
@@ -1177,7 +1183,7 @@ namespace Gtk {
 		public virtual signal void color_changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ColorSelectionDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class ColorSelectionDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ColorSelectionDialog (string title);
 		public unowned Gtk.Widget get_color_selection ();
@@ -1190,7 +1196,7 @@ namespace Gtk {
 		public Gtk.Widget ok_button { owned get; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ComboBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.CellLayout, Gtk.CellEditable {
+	public class ComboBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.CellEditable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ComboBox ();
 		public void append_text (string text);
@@ -1248,7 +1254,7 @@ namespace Gtk {
 		public virtual signal void popup ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ComboBoxEntry : Gtk.ComboBox, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.CellLayout, Gtk.CellEditable {
+	public class ComboBoxEntry : Gtk.ComboBox, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.CellEditable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ComboBoxEntry ();
 		public int get_text_column ();
@@ -1260,7 +1266,7 @@ namespace Gtk {
 		public int text_column { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Container : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Container : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
 		[CCode (has_construct_function = false)]
 		protected Container ();
 		public void add_with_properties (Gtk.Widget widget, ...);
@@ -1288,9 +1294,11 @@ namespace Gtk {
 		public unowned Gtk.Adjustment get_focus_hadjustment ();
 		public unowned Gtk.Adjustment get_focus_vadjustment ();
 		public Gtk.ResizeMode get_resize_mode ();
+		[CCode (cname = "gtk_container_class_handle_border_width")]
+		public class void handle_border_width ();
 		[CCode (cname = "gtk_container_class_install_child_property")]
 		public class void install_child_property (uint property_id, GLib.ParamSpec pspec);
-		public void propagate_expose (Gtk.Widget child, Gdk.EventExpose event);
+		public void propagate_draw (Gtk.Widget child, Cairo.Context cr);
 		public void resize_children ();
 		public void set_border_width (uint border_width);
 		[NoWrapper]
@@ -1315,7 +1323,7 @@ namespace Gtk {
 		public virtual signal void set_focus_child (Gtk.Widget? widget);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Dialog : Gtk.Window, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Dialog : Gtk.Window, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Dialog ();
 		public void add_action_widget (Gtk.Widget child, int response_id);
@@ -1323,7 +1331,6 @@ namespace Gtk {
 		public void add_buttons (...);
 		public unowned Gtk.Widget get_action_area ();
 		public unowned Gtk.Widget get_content_area ();
-		public bool get_has_separator ();
 		public int get_response_for_widget (Gtk.Widget widget);
 		public unowned Gtk.Widget get_widget_for_response (int response_id);
 		public int run ();
@@ -1331,22 +1338,20 @@ namespace Gtk {
 		public void set_alternative_button_order (...);
 		public void set_alternative_button_order_from_array (int n_params, int new_order);
 		public void set_default_response (int response_id);
-		public void set_has_separator (bool setting);
 		public void set_response_sensitive (int response_id, bool setting);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Dialog.with_buttons (string? title, Gtk.Window? parent, Gtk.DialogFlags flags, ...);
-		public bool has_separator { get; set; }
 		public virtual signal void close ();
 		[HasEmitter]
 		public virtual signal void response (int response_id);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class DrawingArea : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class DrawingArea : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public DrawingArea ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Entry : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Editable, Gtk.CellEditable {
+	public class Entry : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Editable, Gtk.CellEditable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Entry ();
 		public bool get_activates_default ();
@@ -1559,7 +1564,7 @@ namespace Gtk {
 		public virtual signal bool match_selected (Gtk.TreeModel model, Gtk.TreeIter iter);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class EventBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class EventBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public EventBox ();
 		public bool get_above_child ();
@@ -1570,17 +1575,19 @@ namespace Gtk {
 		public bool visible_window { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Expander : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Expander : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Expander (string label);
 		public bool get_expanded ();
 		public unowned string get_label ();
+		public bool get_label_fill ();
 		public unowned Gtk.Widget get_label_widget ();
 		public int get_spacing ();
 		public bool get_use_markup ();
 		public bool get_use_underline ();
 		public void set_expanded (bool expanded);
 		public void set_label (string label);
+		public void set_label_fill (bool label_fill);
 		public void set_label_widget (Gtk.Widget label_widget);
 		public void set_spacing (int spacing);
 		public void set_use_markup (bool use_markup);
@@ -1589,6 +1596,7 @@ namespace Gtk {
 		public Expander.with_mnemonic (string label);
 		public bool expanded { get; set construct; }
 		public string label { get; set construct; }
+		public bool label_fill { get; set construct; }
 		public Gtk.Widget label_widget { get; set; }
 		public int spacing { get; set; }
 		public bool use_markup { get; set construct; }
@@ -1596,7 +1604,7 @@ namespace Gtk {
 		public virtual signal void activate ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FileChooserButton : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable, Gtk.FileChooser {
+	public class FileChooserButton : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.FileChooser {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public FileChooserButton (string title, Gtk.FileChooserAction action);
 		public bool get_focus_on_click ();
@@ -1614,17 +1622,17 @@ namespace Gtk {
 		public virtual signal void file_set ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FileChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.FileChooser {
+	public class FileChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.FileChooser {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public FileChooserDialog (string? title, Gtk.Window? parent, Gtk.FileChooserAction action, ...);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FileChooserWidget : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable, Gtk.FileChooser, Gtk.FileChooserEmbed {
+	public class FileChooserWidget : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.FileChooser, Gtk.FileChooserEmbed {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public FileChooserWidget (Gtk.FileChooserAction action);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FileFilter : Gtk.Object {
+	public class FileFilter : GLib.InitiallyUnowned {
 		[CCode (has_construct_function = false)]
 		public FileFilter ();
 		public void add_custom (Gtk.FileFilterFlags needed, owned Gtk.FileFilterFunc func);
@@ -1646,7 +1654,7 @@ namespace Gtk {
 		public weak string uri;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Fixed : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Fixed : Gtk.Container, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Fixed ();
 		public void move (Gtk.Widget widget, int x, int y);
@@ -1660,7 +1668,7 @@ namespace Gtk {
 		public int y;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FontButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
+	public class FontButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public FontButton ();
 		public unowned string get_font_name ();
@@ -1686,7 +1694,7 @@ namespace Gtk {
 		public virtual signal void font_set ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FontSelection : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class FontSelection : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public FontSelection ();
 		public unowned Pango.FontFace get_face ();
@@ -1701,24 +1709,23 @@ namespace Gtk {
 		public unowned Gtk.Widget get_size_list ();
 		public bool set_font_name (string fontname);
 		public void set_preview_text (string text);
-		[NoAccessorMethod]
-		public Gdk.Font font { owned get; }
 		public string font_name { get; set; }
 		public string preview_text { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FontSelectionDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class FontSelectionDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public FontSelectionDialog (string title);
 		public unowned Gtk.Widget get_cancel_button ();
 		public unowned string get_font_name ();
+		public unowned Gtk.Widget get_font_selection ();
 		public unowned Gtk.Widget get_ok_button ();
 		public unowned string get_preview_text ();
 		public bool set_font_name (string fontname);
 		public void set_preview_text (string text);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Frame : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Frame : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Frame (string? label);
 		[NoWrapper]
@@ -1737,32 +1744,30 @@ namespace Gtk {
 		public float label_xalign { get; set; }
 		[NoAccessorMethod]
 		public float label_yalign { get; set; }
-		[NoAccessorMethod]
-		public Gtk.ShadowType shadow { get; set; }
 		public Gtk.ShadowType shadow_type { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class HBox : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class HBox : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public HBox (bool homogeneous, int spacing);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class HButtonBox : Gtk.ButtonBox, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class HButtonBox : Gtk.ButtonBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public HButtonBox ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class HPaned : Gtk.Paned, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class HPaned : Gtk.Paned, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public HPaned ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class HRuler : Gtk.Ruler, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class HRuler : Gtk.Ruler, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public HRuler ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class HSV : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class HSV : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public HSV ();
 		public void get_color (double h, double s, double v);
@@ -1775,24 +1780,24 @@ namespace Gtk {
 		public virtual signal void move (Gtk.DirectionType type);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class HScale : Gtk.Scale, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class HScale : Gtk.Scale, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public HScale (Gtk.Adjustment? adjustment);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public HScale.with_range (double min, double max, double step);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class HScrollbar : Gtk.Scrollbar, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class HScrollbar : Gtk.Scrollbar, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public HScrollbar (Gtk.Adjustment? adjustment);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class HSeparator : Gtk.Separator, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class HSeparator : Gtk.Separator, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public HSeparator ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class HandleBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class HandleBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public HandleBox ();
 		public bool get_child_detached ();
@@ -1804,8 +1809,6 @@ namespace Gtk {
 		public void set_snap_edge (Gtk.PositionType edge);
 		public bool child_detached { get; }
 		public Gtk.PositionType handle_position { get; set; }
-		[NoAccessorMethod]
-		public Gtk.ShadowType shadow { get; set; }
 		public Gtk.ShadowType shadow_type { get; set; }
 		public Gtk.PositionType snap_edge { get; set; }
 		[NoAccessorMethod]
@@ -1939,11 +1942,11 @@ namespace Gtk {
 		public virtual signal void changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class IconView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.CellLayout {
+	public class IconView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public IconView ();
 		public void convert_widget_to_bin_window_coords (int wx, int wy, int bx, int by);
-		public unowned Gdk.Pixmap create_drag_icon (Gtk.TreePath path);
+		public unowned Cairo.Surface create_drag_icon (Gtk.TreePath path);
 		public void enable_model_drag_dest (Gtk.TargetEntry[] targets, Gdk.DragAction actions);
 		public void enable_model_drag_source (Gdk.ModifierType start_button_mask, Gtk.TargetEntry[] targets, Gdk.DragAction actions);
 		public int get_column_spacing ();
@@ -1953,13 +1956,13 @@ namespace Gtk {
 		public void get_drag_dest_item (out unowned Gtk.TreePath path, Gtk.IconViewDropPosition pos);
 		public bool get_item_at_pos (int x, int y, out unowned Gtk.TreePath path, out unowned Gtk.CellRenderer cell);
 		public int get_item_column (Gtk.TreePath path);
+		public Gtk.Orientation get_item_orientation ();
 		public int get_item_padding ();
 		public int get_item_row (Gtk.TreePath path);
 		public int get_item_width ();
 		public int get_margin ();
 		public int get_markup_column ();
 		public unowned Gtk.TreeModel get_model ();
-		public Gtk.Orientation get_orientation ();
 		public unowned Gtk.TreePath get_path_at_pos (int x, int y);
 		public int get_pixbuf_column ();
 		public bool get_reorderable ();
@@ -1979,12 +1982,12 @@ namespace Gtk {
 		public void set_columns (int columns);
 		public void set_cursor (Gtk.TreePath path, Gtk.CellRenderer? cell, bool start_editing);
 		public void set_drag_dest_item (Gtk.TreePath path, Gtk.IconViewDropPosition pos);
+		public void set_item_orientation (Gtk.Orientation orientation);
 		public void set_item_padding (int item_padding);
 		public void set_item_width (int item_width);
 		public void set_margin (int margin);
 		public void set_markup_column (int column);
 		public void set_model (Gtk.TreeModel? model);
-		public void set_orientation (Gtk.Orientation orientation);
 		public void set_pixbuf_column (int column);
 		public void set_reorderable (bool reorderable);
 		public void set_row_spacing (int row_spacing);
@@ -2001,12 +2004,12 @@ namespace Gtk {
 		public IconView.with_model (Gtk.TreeModel model);
 		public int column_spacing { get; set; }
 		public int columns { get; set; }
+		public Gtk.Orientation item_orientation { get; set; }
 		public int item_padding { get; set; }
 		public int item_width { get; set; }
 		public int margin { get; set; }
 		public int markup_column { get; set; }
 		public Gtk.TreeModel model { get; set; }
-		public Gtk.Orientation orientation { get; set; }
 		public int pixbuf_column { get; set; }
 		public bool reorderable { get; set; }
 		public int row_spacing { get; set; }
@@ -2026,7 +2029,7 @@ namespace Gtk {
 		public virtual signal void unselect_all ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Image : Gtk.Misc, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Image : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Image ();
 		public void clear ();
@@ -2041,21 +2044,15 @@ namespace Gtk {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Image.from_icon_set (Gtk.IconSet icon_set, Gtk.IconSize size);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Image.from_image (Gdk.Image image, Gdk.Bitmap mask);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Image.from_pixbuf (Gdk.Pixbuf pixbuf);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Image.from_pixmap (Gdk.Pixmap pixmap, Gdk.Bitmap mask);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Image.from_stock (string stock_id, Gtk.IconSize size);
 		public unowned Gdk.PixbufAnimation get_animation ();
 		public void get_gicon (out unowned GLib.Icon gicon, Gtk.IconSize size);
 		public void get_icon_name (out unowned string icon_name, out Gtk.IconSize size);
 		public void get_icon_set (out unowned Gtk.IconSet icon_set, out Gtk.IconSize size);
-		public void get_image (out unowned Gdk.Image gdk_image, out unowned Gdk.Bitmap mask);
 		public unowned Gdk.Pixbuf get_pixbuf ();
 		public int get_pixel_size ();
-		public void get_pixmap (out unowned Gdk.Pixmap pixmap, out unowned Gdk.Bitmap mask);
 		public void get_stock (out string stock_id, out Gtk.IconSize size);
 		public Gtk.ImageType get_storage_type ();
 		public void set_from_animation (Gdk.PixbufAnimation animation);
@@ -2063,9 +2060,7 @@ namespace Gtk {
 		public void set_from_gicon (GLib.Icon icon, Gtk.IconSize size);
 		public void set_from_icon_name (string icon_name, Gtk.IconSize size);
 		public void set_from_icon_set (Gtk.IconSet icon_set, Gtk.IconSize size);
-		public void set_from_image (Gdk.Image gdk_image, Gdk.Bitmap mask);
 		public void set_from_pixbuf (Gdk.Pixbuf pixbuf);
-		public void set_from_pixmap (Gdk.Pixmap? pixmap, Gdk.Bitmap? mask);
 		public void set_from_stock (string stock_id, Gtk.IconSize size);
 		public void set_pixel_size (int pixel_size);
 		[NoAccessorMethod]
@@ -2079,17 +2074,11 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public int icon_size { get; set; }
 		[NoAccessorMethod]
-		public Gdk.Image image { owned get; set; }
-		[NoAccessorMethod]
-		public Gdk.Pixmap mask { owned get; set; }
-		[NoAccessorMethod]
 		public Gdk.Pixbuf pixbuf { owned get; set; }
 		[NoAccessorMethod]
 		public Gdk.PixbufAnimation pixbuf_animation { owned get; set; }
 		public int pixel_size { get; set; }
 		[NoAccessorMethod]
-		public Gdk.Pixmap pixmap { owned get; set; }
-		[NoAccessorMethod]
 		public string stock { owned get; set; }
 		public Gtk.ImageType storage_type { get; }
 	}
@@ -2119,13 +2108,8 @@ namespace Gtk {
 	public class ImageIconSetData {
 		public weak Gtk.IconSet icon_set;
 	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ImageImageData {
-		public weak Gdk.Image image;
-	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ImageMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
+	public class ImageMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ImageMenuItem ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -2153,16 +2137,11 @@ namespace Gtk {
 	}
 	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ImagePixmapData {
-		public weak Gdk.Pixmap pixmap;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ImageStockData {
 		public weak string stock_id;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class InfoBar : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class InfoBar : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public InfoBar ();
 		public void add_action_widget (Gtk.Widget child, int response_id);
@@ -2182,7 +2161,7 @@ namespace Gtk {
 		public virtual signal void response (int response_id);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Invisible : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Invisible : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Invisible ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -2192,18 +2171,7 @@ namespace Gtk {
 		public Gdk.Screen screen { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Item : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
-		[CCode (has_construct_function = false)]
-		protected Item ();
-		[HasEmitter]
-		public virtual signal void deselect ();
-		[HasEmitter]
-		public virtual signal void select ();
-		[HasEmitter]
-		public virtual signal void toggle ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Label : Gtk.Misc, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Label : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Label (string? str);
 		public double get_angle ();
@@ -2284,7 +2252,7 @@ namespace Gtk {
 	public class LabelSelectionInfo {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Layout : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Layout : Gtk.Container, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Layout (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
 		public unowned Gdk.Window get_bin_window ();
@@ -2305,13 +2273,12 @@ namespace Gtk {
 		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class LinkButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
+	public class LinkButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public LinkButton (string uri);
 		public unowned string get_uri ();
 		public bool get_visited ();
 		public void set_uri (string uri);
-		public static void set_uri_hook (owned Gtk.LinkButtonUriFunc func);
 		public void set_visited (bool visited);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public LinkButton.with_label (string uri, string label);
@@ -2347,7 +2314,7 @@ namespace Gtk {
 		public void swap (Gtk.TreeIter a, Gtk.TreeIter b);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Menu : Gtk.MenuShell, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Menu : Gtk.MenuShell, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Menu ();
 		public void attach (Gtk.Widget child, uint left_attach, uint right_attach, uint top_attach, uint bottom_attach);
@@ -2364,7 +2331,7 @@ namespace Gtk {
 		public unowned string get_title ();
 		public void popdown ();
 		public void popup (Gtk.Widget? parent_menu_shell, Gtk.Widget? parent_menu_item, Gtk.MenuPositionFunc? func, uint button, uint32 activate_time);
-		public void popup_for_device (Gdk.Device device, Gtk.Widget parent_menu_shell, Gtk.Widget parent_menu_item, Gtk.MenuPositionFunc func, void* data, uint button, uint32 activate_time);
+		public void popup_for_device (Gdk.Device device, Gtk.Widget parent_menu_shell, Gtk.Widget parent_menu_item, Gtk.MenuPositionFunc func, void* data, GLib.DestroyNotify destroy, uint button, uint32 activate_time);
 		public void reorder_child (Gtk.Widget child, int position);
 		public void reposition ();
 		public void set_accel_group (Gtk.AccelGroup accel_group);
@@ -2388,7 +2355,7 @@ namespace Gtk {
 		public virtual signal void move_scroll (Gtk.ScrollType p0);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class MenuBar : Gtk.MenuShell, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class MenuBar : Gtk.MenuShell, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public MenuBar ();
 		public Gtk.PackDirection get_child_pack_direction ();
@@ -2399,7 +2366,7 @@ namespace Gtk {
 		public Gtk.PackDirection pack_direction { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class MenuItem : Gtk.Item, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
+	public class MenuItem : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public MenuItem ();
 		public unowned string get_accel_path ();
@@ -2424,13 +2391,15 @@ namespace Gtk {
 		[HasEmitter]
 		public virtual signal void activate ();
 		public virtual signal void activate_item ();
+		public virtual signal void deselect ();
+		public virtual signal void select ();
 		[HasEmitter]
 		public virtual signal void toggle_size_allocate (int allocation);
 		[HasEmitter]
 		public virtual signal void toggle_size_request (void* requisition);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class MenuShell : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class MenuShell : Gtk.Container, Atk.Implementor, Gtk.Buildable {
 		[CCode (has_construct_function = false)]
 		protected MenuShell ();
 		public void activate_item (Gtk.Widget menu_item, bool force_deactivate);
@@ -2456,7 +2425,7 @@ namespace Gtk {
 		public virtual signal void selection_done ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class MenuToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
+	public class MenuToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
 		public MenuToolButton (Gtk.Widget? icon_widget, string? label);
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
@@ -2469,13 +2438,14 @@ namespace Gtk {
 		public virtual signal void show_menu ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class MessageDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class MessageDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
 		[PrintfFormat]
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public MessageDialog (Gtk.Window? parent, Gtk.DialogFlags flags, Gtk.MessageType type, Gtk.ButtonsType buttons, string message_format, ...);
 		public void format_secondary_markup (string message_format, ...);
 		public void format_secondary_text (string message_format, ...);
 		public unowned Gtk.Widget get_image ();
+		public unowned Gtk.Widget get_message_area ();
 		public void set_image (Gtk.Widget image);
 		public void set_markup (string str);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -2483,6 +2453,7 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public Gtk.ButtonsType buttons { construct; }
 		public Gtk.Widget image { get; set; }
+		public Gtk.Widget message_area { get; }
 		[NoAccessorMethod]
 		public Gtk.MessageType message_type { get; set construct; }
 		[NoAccessorMethod]
@@ -2495,7 +2466,7 @@ namespace Gtk {
 		public bool use_markup { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Misc : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Misc : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
 		[CCode (has_construct_function = false)]
 		protected Misc ();
 		public void get_alignment (float xalign, float yalign);
@@ -2525,14 +2496,14 @@ namespace Gtk {
 		public Gdk.Screen screen { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Notebook : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Notebook : Gtk.Container, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Notebook ();
 		public int append_page (Gtk.Widget child, Gtk.Widget? tab_label);
 		public int append_page_menu (Gtk.Widget child, Gtk.Widget? tab_label, Gtk.Widget? menu_label);
 		public unowned Gtk.Widget get_action_widget (Gtk.PackType pack_type);
 		public int get_current_page ();
-		public void* get_group ();
+		public unowned string get_group_name ();
 		public unowned Gtk.Widget get_menu_label (Gtk.Widget child);
 		public unowned string get_menu_label_text (Gtk.Widget child);
 		public int get_n_pages ();
@@ -2541,10 +2512,12 @@ namespace Gtk {
 		public bool get_show_border ();
 		public bool get_show_tabs ();
 		public bool get_tab_detachable (Gtk.Widget child);
+		public uint16 get_tab_hborder ();
 		public unowned Gtk.Widget get_tab_label (Gtk.Widget child);
 		public unowned string get_tab_label_text (Gtk.Widget child);
 		public Gtk.PositionType get_tab_pos ();
 		public bool get_tab_reorderable (Gtk.Widget child);
+		public uint16 get_tab_vborder ();
 		public int insert_page (Gtk.Widget child, Gtk.Widget? tab_label, int position);
 		[CCode (vfunc_name = "insert_page")]
 		public virtual int insert_page_menu (Gtk.Widget child, Gtk.Widget? tab_label, Gtk.Widget? menu_label, int position);
@@ -2559,7 +2532,7 @@ namespace Gtk {
 		public void reorder_child (Gtk.Widget child, int position);
 		public void set_action_widget (Gtk.Widget widget, Gtk.PackType pack_type);
 		public void set_current_page (int page_num);
-		public void set_group (void* group);
+		public void set_group_name (string group_name);
 		public void set_menu_label (Gtk.Widget child, Gtk.Widget? menu_label);
 		public void set_menu_label_text (Gtk.Widget child, string menu_text);
 		public void set_scrollable (bool scrollable);
@@ -2570,10 +2543,9 @@ namespace Gtk {
 		public void set_tab_label_text (Gtk.Widget child, string tab_text);
 		public void set_tab_pos (Gtk.PositionType pos);
 		public void set_tab_reorderable (Gtk.Widget child, bool reorderable);
-		public static void set_window_creation_hook (owned Gtk.NotebookWindowCreationFunc func);
 		[NoAccessorMethod]
 		public bool enable_popup { get; set; }
-		public void* group { get; set; }
+		public string group_name { get; set; }
 		[NoAccessorMethod]
 		public int page { get; set; }
 		public bool scrollable { get; set; }
@@ -2589,25 +2561,14 @@ namespace Gtk {
 		public virtual signal void page_reordered (Gtk.Widget p0, uint p1);
 		public virtual signal bool reorder_tab (Gtk.DirectionType direction, bool move_to_last);
 		public virtual signal bool select_page (bool move_focus);
-		public virtual signal void switch_page (Gtk.NotebookPage page, uint page_num);
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class NotebookPage {
+		public virtual signal void switch_page (Gtk.Widget page, uint page_num);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Object : GLib.InitiallyUnowned {
-		[CCode (has_construct_function = false)]
-		protected Object ();
-		[HasEmitter]
-		public virtual signal void destroy ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class OffscreenWindow : Gtk.Window, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class OffscreenWindow : Gtk.Window, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public OffscreenWindow ();
 		public unowned Gdk.Pixbuf get_pixbuf ();
-		public unowned Gdk.Pixmap get_pixmap ();
+		public unowned Cairo.Surface get_surface ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -2647,7 +2608,7 @@ namespace Gtk {
 		public void to_key_file (GLib.KeyFile key_file, string group_name);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Paned : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class Paned : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Paned (Gtk.Orientation orientation);
 		public void add1 (Gtk.Widget child);
@@ -2702,7 +2663,7 @@ namespace Gtk {
 		public void to_key_file (GLib.KeyFile key_file, string group_name);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Plug : Gtk.Window, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Plug : Gtk.Window, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Plug (Gdk.NativeWindow socket_id);
 		public void @construct (Gdk.NativeWindow socket_id);
@@ -2885,31 +2846,25 @@ namespace Gtk {
 		public void unset (string key);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ProgressBar : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class ProgressBar : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ProgressBar ();
-		[NoWrapper]
-		public virtual void act_mode_enter ();
 		public Pango.EllipsizeMode get_ellipsize ();
 		public double get_fraction ();
-		public Gtk.ProgressBarOrientation get_orientation ();
+		public bool get_inverted ();
 		public double get_pulse_step ();
 		public bool get_show_text ();
 		public unowned string get_text ();
-		[NoWrapper]
-		public virtual void paint ();
 		public void pulse ();
 		public void set_ellipsize (Pango.EllipsizeMode mode);
 		public void set_fraction (double fraction);
-		public void set_orientation (Gtk.ProgressBarOrientation orientation);
+		public void set_inverted (bool inverted);
 		public void set_pulse_step (double fraction);
 		public void set_show_text (bool show_text);
 		public void set_text (string text);
-		[NoWrapper]
-		public virtual void update ();
 		public Pango.EllipsizeMode ellipsize { get; set; }
 		public double fraction { get; set; }
-		public Gtk.ProgressBarOrientation orientation { get; set; }
+		public bool inverted { get; set; }
 		public double pulse_step { get; set; }
 		public bool show_text { get; set; }
 		public string text { get; set; }
@@ -2931,12 +2886,13 @@ namespace Gtk {
 		public virtual signal void changed (Gtk.RadioAction current);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RadioButton : Gtk.CheckButton, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
+	public class RadioButton : Gtk.CheckButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public RadioButton (GLib.SList<Gtk.RadioButton>? group);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public RadioButton.from_widget (Gtk.RadioButton radio_group_member);
 		public unowned GLib.SList<Gtk.RadioButton> get_group ();
+		public void join_group (Gtk.RadioButton group_source);
 		public void set_group (GLib.SList<Gtk.RadioButton> group);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public RadioButton.with_label (GLib.SList<Gtk.RadioButton>? group, string label);
@@ -2951,7 +2907,7 @@ namespace Gtk {
 		public virtual signal void group_changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RadioMenuItem : Gtk.CheckMenuItem, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
+	public class RadioMenuItem : Gtk.CheckMenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public RadioMenuItem (GLib.SList<Gtk.RadioMenuItem> group);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -2970,7 +2926,7 @@ namespace Gtk {
 		public virtual signal void group_changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RadioToolButton : Gtk.ToggleToolButton, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
+	public class RadioToolButton : Gtk.ToggleToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
 		public RadioToolButton (GLib.SList<Gtk.RadioToolButton>? group);
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
@@ -2984,7 +2940,7 @@ namespace Gtk {
 		public Gtk.RadioToolButton group { set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Range : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class Range : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (has_construct_function = false)]
 		protected Range ();
 		public unowned Gtk.Adjustment get_adjustment ();
@@ -3009,7 +2965,7 @@ namespace Gtk {
 		public void set_increments (double step, double page);
 		public void set_inverted (bool setting);
 		public void set_lower_stepper_sensitivity (Gtk.SensitivityType sensitivity);
-		public void set_min_slider_size (bool min_size);
+		public void set_min_slider_size (int min_size);
 		public void set_range (double min, double max);
 		public void set_restrict_to_fill_level (bool restrict_to_fill_level);
 		public void set_show_fill_level (bool show_fill_level);
@@ -3032,14 +2988,6 @@ namespace Gtk {
 	}
 	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RangeLayout {
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RangeStepTimer {
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class RcContext {
 	}
 	[Compact]
@@ -3100,14 +3048,14 @@ namespace Gtk {
 		public bool show_numbers { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RecentChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.RecentChooser {
+	public class RecentChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.RecentChooser {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public RecentChooserDialog (string title, Gtk.Window parent, ...);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public RecentChooserDialog.for_manager (string title, Gtk.Window parent, Gtk.RecentManager manager, ...);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RecentChooserMenu : Gtk.Menu, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.RecentChooser, Gtk.Activatable {
+	public class RecentChooserMenu : Gtk.Menu, Atk.Implementor, Gtk.Buildable, Gtk.RecentChooser, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public RecentChooserMenu ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -3125,14 +3073,14 @@ namespace Gtk {
 		public bool show_numbers { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RecentChooserWidget : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable, Gtk.RecentChooser {
+	public class RecentChooserWidget : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.RecentChooser {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public RecentChooserWidget ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public RecentChooserWidget.for_manager (Gtk.RecentManager manager);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RecentFilter : Gtk.Object {
+	public class RecentFilter : GLib.InitiallyUnowned {
 		[CCode (has_construct_function = false)]
 		public RecentFilter ();
 		public void add_age (int days);
@@ -3194,26 +3142,32 @@ namespace Gtk {
 		public static GLib.Quark error_quark ();
 		public static unowned Gtk.RecentManager get_default ();
 		public GLib.List<Gtk.RecentInfo> get_items ();
-		public int get_limit ();
 		public bool has_item (string uri);
 		public unowned Gtk.RecentInfo lookup_item (string uri) throws GLib.Error;
 		public bool move_item (string uri, string new_uri) throws GLib.Error;
 		public int purge_items () throws GLib.Error;
 		public bool remove_item (string uri) throws GLib.Error;
-		public void set_limit (int limit);
 		[NoAccessorMethod]
 		public string filename { owned get; construct; }
-		public int limit { get; set; }
 		[NoAccessorMethod]
 		public int size { get; }
 		public virtual signal void changed ();
 	}
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class RequestedSize {
+		public void* data;
+		public int minimum_size;
+		public int natural_size;
+	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Ruler : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class Ruler : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Ruler (Gtk.Orientation orientation);
-		public virtual void draw_pos ();
-		public virtual void draw_ticks ();
+		[NoWrapper]
+		public virtual void draw_pos (Cairo.Context cr);
+		[NoWrapper]
+		public virtual void draw_ticks (Cairo.Context cr);
 		public Gtk.MetricType get_metric ();
 		public void get_range (double lower, double upper, double position, double max_size);
 		public void set_metric (Gtk.MetricType metric);
@@ -3240,7 +3194,7 @@ namespace Gtk {
 		public weak int[] subdivide;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Scale : Gtk.Range, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class Scale : Gtk.Range, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Scale (Gtk.Orientation orientation, Gtk.Adjustment adjustment);
 		public void add_mark (double value, Gtk.PositionType position, string? markup);
@@ -3261,7 +3215,7 @@ namespace Gtk {
 		public virtual signal string format_value (double value);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ScaleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable, Gtk.Orientable {
+	public class ScaleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ScaleButton (Gtk.IconSize size, double min, double max, double step, [CCode (array_length = false)] string[] icons);
 		public unowned Gtk.Adjustment get_adjustment ();
@@ -3284,12 +3238,12 @@ namespace Gtk {
 		public virtual signal void value_changed (double value);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Scrollbar : Gtk.Range, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class Scrollbar : Gtk.Range, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Scrollbar (Gtk.Orientation orientation, Gtk.Adjustment adjustment);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ScrolledWindow : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class ScrolledWindow : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ScrolledWindow (Gtk.Adjustment? hadjustment, Gtk.Adjustment? vadjustment);
 		public void add_with_viewport (Gtk.Widget child);
@@ -3347,17 +3301,17 @@ namespace Gtk {
 		public bool targets_include_uri ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Separator : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class Separator : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Separator (Gtk.Orientation orientation);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class SeparatorMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
+	public class SeparatorMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public SeparatorMenuItem ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class SeparatorToolItem : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
+	public class SeparatorToolItem : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
 		public SeparatorToolItem ();
 		public bool get_draw ();
@@ -3513,8 +3467,27 @@ namespace Gtk {
 		public bool ignore_hidden { get; set; }
 		public Gtk.SizeGroupMode mode { get; set; }
 	}
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class SizeRequest {
+		public int for_size;
+		public int minimum_size;
+		public int natural_size;
+	}
+	[Compact]
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class SizeRequestCache {
+		public uint cached_heights;
+		public uint cached_widths;
+		[CCode (array_length = false)]
+		public weak Gtk.SizeRequest[] heights;
+		public uint last_cached_height;
+		public uint last_cached_width;
+		[CCode (array_length = false)]
+		public weak Gtk.SizeRequest[] widths;
+	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Socket : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Socket : Gtk.Container, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Socket ();
 		public void add_id (Gdk.NativeWindow window_id);
@@ -3524,7 +3497,7 @@ namespace Gtk {
 		public virtual signal bool plug_removed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class SpinButton : Gtk.Entry, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Editable, Gtk.CellEditable {
+	public class SpinButton : Gtk.Entry, Atk.Implementor, Gtk.Buildable, Gtk.Editable, Gtk.CellEditable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public SpinButton (Gtk.Adjustment adjustment, double climb_rate, uint digits);
 		public void configure (Gtk.Adjustment adjustment, double climb_rate, uint digits);
@@ -3567,7 +3540,7 @@ namespace Gtk {
 		public virtual signal void wrapped ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Spinner : Gtk.DrawingArea, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Spinner : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Spinner ();
 		public void start ();
@@ -3589,7 +3562,6 @@ namespace Gtk {
 		public StatusIcon.from_pixbuf (Gdk.Pixbuf pixbuf);
 		[CCode (has_construct_function = false)]
 		public StatusIcon.from_stock (string stock_id);
-		public bool get_blinking ();
 		public bool get_geometry (out unowned Gdk.Screen screen, out Gdk.Rectangle area, out Gtk.Orientation orientation);
 		public unowned GLib.Icon get_gicon ();
 		public bool get_has_tooltip ();
@@ -3607,7 +3579,6 @@ namespace Gtk {
 		public bool is_embedded ();
 		[CCode (instance_pos = -1)]
 		public void position_menu (Gtk.Menu menu, out int x, out int y, out bool push_in);
-		public void set_blinking (bool blinking);
 		public void set_from_file (string filename);
 		public void set_from_gicon (GLib.Icon icon);
 		public void set_from_icon_name (string icon_name);
@@ -3620,7 +3591,6 @@ namespace Gtk {
 		public void set_tooltip_markup (string markup);
 		public void set_tooltip_text (string text);
 		public void set_visible (bool visible);
-		public bool blinking { get; set; }
 		[NoAccessorMethod]
 		public bool embedded { get; }
 		[NoAccessorMethod]
@@ -3652,7 +3622,7 @@ namespace Gtk {
 		public virtual signal bool size_changed (int size);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Statusbar : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class Statusbar : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Statusbar ();
 		public uint get_context_id (string context_description);
@@ -3671,37 +3641,22 @@ namespace Gtk {
 	public class Style : GLib.Object {
 		public int attach_count;
 		[CCode (array_length = false)]
-		public Gdk.Color[] @base;
+		public weak Cairo.Pattern[] background;
 		[CCode (array_length = false)]
-		public Gdk.GC[] base_gc;
+		public Gdk.Color[] @base;
 		[CCode (array_length = false)]
 		public Gdk.Color[] bg;
-		[CCode (array_length = false)]
-		public Gdk.GC[] bg_gc;
-		[CCode (array_length = false)]
-		public Gdk.Pixmap[] bg_pixmap;
 		public Gdk.Color black;
-		public weak Gdk.GC black_gc;
-		public weak Gdk.Colormap colormap;
 		[CCode (array_length = false)]
 		public Gdk.Color[] dark;
 		[CCode (array_length = false)]
-		public Gdk.GC[] dark_gc;
-		public int depth;
-		[CCode (array_length = false)]
 		public Gdk.Color[] fg;
-		[CCode (array_length = false)]
-		public Gdk.GC[] fg_gc;
 		public weak Pango.FontDescription font_desc;
 		public weak GLib.SList icon_factories;
 		[CCode (array_length = false)]
 		public Gdk.Color[] light;
 		[CCode (array_length = false)]
-		public Gdk.GC[] light_gc;
-		[CCode (array_length = false)]
 		public Gdk.Color[] mid;
-		[CCode (array_length = false)]
-		public Gdk.GC[] mid_gc;
 		public weak GLib.Array property_cache;
 		public weak Gtk.RcStyle rc_style;
 		public weak GLib.SList styles;
@@ -3709,64 +3664,58 @@ namespace Gtk {
 		public Gdk.Color[] text;
 		[CCode (array_length = false)]
 		public Gdk.Color[] text_aa;
-		[CCode (array_length = false)]
-		public Gdk.GC[] text_aa_gc;
-		[CCode (array_length = false)]
-		public Gdk.GC[] text_gc;
+		public weak Gdk.Visual visual;
 		public Gdk.Color white;
-		public weak Gdk.GC white_gc;
 		public int xthickness;
 		public int ythickness;
 		[CCode (has_construct_function = false)]
 		public Style ();
-		public void apply_default_background (Gdk.Window window, bool set_bg, Gtk.StateType state_type, Gdk.Rectangle area, int x, int y, int width, int height);
+		public void apply_default_background (Cairo.Context cr, Gdk.Window window, Gtk.StateType state_type, int x, int y, int width, int height);
 		public unowned Gtk.Style attach (Gdk.Window window);
 		[NoWrapper]
 		public virtual unowned Gtk.Style clone ();
 		public virtual void copy ();
 		public void detach ();
 		[NoWrapper]
-		public virtual void draw_arrow (Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gtk.ArrowType arrow_type, bool fill, int x, int y, int width, int height);
+		public virtual void draw_arrow (Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget widget, string detail, Gtk.ArrowType arrow_type, bool fill, int x, int y, int width, int height);
 		[NoWrapper]
-		public virtual void draw_box (Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
+		public virtual void draw_box (Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget widget, string detail, int x, int y, int width, int height);
 		[NoWrapper]
-		public virtual void draw_box_gap (Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width);
+		public virtual void draw_box_gap (Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width);
 		[NoWrapper]
-		public virtual void draw_check (Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
+		public virtual void draw_check (Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget widget, string detail, int x, int y, int width, int height);
 		[NoWrapper]
-		public virtual void draw_diamond (Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
+		public virtual void draw_diamond (Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget widget, string detail, int x, int y, int width, int height);
 		[NoWrapper]
-		public virtual void draw_expander (Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, Gtk.ExpanderStyle expander_style);
+		public virtual void draw_expander (Cairo.Context cr, Gtk.StateType state_type, Gtk.Widget widget, string detail, int x, int y, Gtk.ExpanderStyle expander_style);
 		[NoWrapper]
-		public virtual void draw_extension (Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side);
+		public virtual void draw_extension (Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side);
 		[NoWrapper]
-		public virtual void draw_flat_box (Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
+		public virtual void draw_flat_box (Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget widget, string detail, int x, int y, int width, int height);
 		[NoWrapper]
-		public virtual void draw_focus (Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
+		public virtual void draw_focus (Cairo.Context cr, Gtk.StateType state_type, Gtk.Widget widget, string detail, int x, int y, int width, int height);
 		[NoWrapper]
-		public virtual void draw_handle (Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.Orientation orientation);
+		public virtual void draw_handle (Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.Orientation orientation);
 		[NoWrapper]
-		public virtual void draw_hline (Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x1, int x2, int y);
+		public virtual void draw_hline (Cairo.Context cr, Gtk.StateType state_type, Gtk.Widget widget, string detail, int x1, int x2, int y);
 		[NoWrapper]
-		public virtual void draw_layout (Gdk.Window window, Gtk.StateType state_type, bool use_text, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, Pango.Layout layout);
+		public virtual void draw_layout (Cairo.Context cr, Gtk.StateType state_type, bool use_text, Gtk.Widget widget, string detail, int x, int y, Pango.Layout layout);
 		[NoWrapper]
-		public virtual void draw_option (Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
+		public virtual void draw_option (Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget widget, string detail, int x, int y, int width, int height);
 		[NoWrapper]
-		public virtual void draw_polygon (Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gdk.Point point, int npoints, bool fill);
+		public virtual void draw_resize_grip (Cairo.Context cr, Gtk.StateType state_type, Gtk.Widget widget, string detail, Gdk.WindowEdge edge, int x, int y, int width, int height);
 		[NoWrapper]
-		public virtual void draw_resize_grip (Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gdk.WindowEdge edge, int x, int y, int width, int height);
+		public virtual void draw_shadow (Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget widget, string detail, int x, int y, int width, int height);
 		[NoWrapper]
-		public virtual void draw_shadow (Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
+		public virtual void draw_shadow_gap (Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width);
 		[NoWrapper]
-		public virtual void draw_shadow_gap (Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width);
+		public virtual void draw_slider (Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.Orientation orientation);
 		[NoWrapper]
-		public virtual void draw_slider (Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.Orientation orientation);
+		public virtual void draw_spinner (Cairo.Context cr, Gtk.StateType state_type, Gtk.Widget widget, string detail, uint step, int x, int y, int width, int height);
 		[NoWrapper]
-		public virtual void draw_spinner (Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, uint step, int x, int y, int width, int height);
+		public virtual void draw_tab (Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget widget, string detail, int x, int y, int width, int height);
 		[NoWrapper]
-		public virtual void draw_tab (Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height);
-		[NoWrapper]
-		public virtual void draw_vline (Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int y1_, int y2_, int x);
+		public virtual void draw_vline (Cairo.Context cr, Gtk.StateType state_type, Gtk.Widget widget, string detail, int y1_, int y2_, int x);
 		public void @get (GLib.Type widget_type, ...);
 		public void get_style_property (GLib.Type widget_type, string property_name, GLib.Value value);
 		public void get_valist (GLib.Type widget_type, string first_property_name, void* var_args);
@@ -3780,7 +3729,7 @@ namespace Gtk {
 		public virtual signal void unrealize ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Table : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Table : Gtk.Container, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Table (uint rows, uint columns, bool homogeneous);
 		public void attach (Gtk.Widget child, uint left_attach, uint right_attach, uint top_attach, uint bottom_attach, Gtk.AttachOptions xoptions, Gtk.AttachOptions yoptions, uint xpadding, uint ypadding);
@@ -3790,6 +3739,7 @@ namespace Gtk {
 		public uint get_default_row_spacing ();
 		public bool get_homogeneous ();
 		public uint get_row_spacing (uint row);
+		public void get_size (uint rows, uint columns);
 		public void resize (uint rows, uint columns);
 		public void set_col_spacing (uint column, uint spacing);
 		public void set_col_spacings (uint spacing);
@@ -3859,7 +3809,7 @@ namespace Gtk {
 		public Gdk.Atom target;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TearoffMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
+	public class TearoffMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public TearoffMenuItem ();
 	}
@@ -3867,10 +3817,8 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class TextAppearance {
 		public Gdk.Color bg_color;
-		public weak Gdk.Bitmap bg_stipple;
 		public uint draw_bg;
 		public Gdk.Color fg_color;
-		public weak Gdk.Bitmap fg_stipple;
 		public uint inside_selection;
 		public uint is_text;
 		public uint pad1;
@@ -3904,7 +3852,6 @@ namespace Gtk {
 		public int pixels_above_lines;
 		public int pixels_below_lines;
 		public int pixels_inside_wrap;
-		public uint realized;
 		public uint refcount;
 		public int right_margin;
 		public weak Pango.TabArray tabs;
@@ -4023,10 +3970,6 @@ namespace Gtk {
 		public bool get_deleted ();
 		public GLib.List<weak Gtk.Widget> get_widgets ();
 	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TextLogAttrCache {
-	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class TextMark : GLib.Object {
 		[CCode (has_construct_function = false)]
@@ -4040,10 +3983,6 @@ namespace Gtk {
 		public bool left_gravity { get; construct; }
 		public string name { get; construct; }
 	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TextPendingScroll {
-	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class TextTag : GLib.Object {
 		[CCode (has_construct_function = false)]
@@ -4063,10 +4002,6 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public bool background_set { get; set; }
 		[NoAccessorMethod]
-		public Gdk.Pixmap background_stipple { owned get; set; }
-		[NoAccessorMethod]
-		public bool background_stipple_set { get; set; }
-		[NoAccessorMethod]
 		public Gtk.TextDirection direction { get; set; }
 		[NoAccessorMethod]
 		public bool editable { get; set; }
@@ -4087,10 +4022,6 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public bool foreground_set { get; set; }
 		[NoAccessorMethod]
-		public Gdk.Pixmap foreground_stipple { owned get; set; }
-		[NoAccessorMethod]
-		public bool foreground_stipple_set { get; set; }
-		[NoAccessorMethod]
 		public int indent { get; set; }
 		[NoAccessorMethod]
 		public bool indent_set { get; set; }
@@ -4197,7 +4128,7 @@ namespace Gtk {
 		public virtual signal void tag_removed (Gtk.TextTag tag);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TextView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class TextView : Gtk.Container, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public TextView ();
 		public void add_child_at_anchor (Gtk.Widget child, Gtk.TextChildAnchor anchor);
@@ -4286,7 +4217,6 @@ namespace Gtk {
 		public virtual signal void insert_at_cursor (string str);
 		public virtual signal void move_cursor (Gtk.MovementStep step, int count, bool extend_selection);
 		public virtual signal void move_viewport (Gtk.ScrollStep p0, int p1);
-		public virtual signal void page_horizontally (int count, bool extend_selection);
 		public virtual signal void paste_clipboard ();
 		public virtual signal void populate_popup (Gtk.Menu menu);
 		public virtual signal void preedit_changed (string p0);
@@ -4298,10 +4228,6 @@ namespace Gtk {
 	}
 	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TextWindow {
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ThemeEngine {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -4318,7 +4244,7 @@ namespace Gtk {
 		public virtual signal void toggled ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ToggleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
+	public class ToggleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ToggleButton ();
 		public bool get_active ();
@@ -4339,7 +4265,7 @@ namespace Gtk {
 		public virtual signal void toggled ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ToggleToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
+	public class ToggleToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
 		public ToggleToolButton ();
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
@@ -4350,7 +4276,7 @@ namespace Gtk {
 		public virtual signal void toggled ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ToolButton : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
+	public class ToolButton : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
 		public ToolButton (Gtk.Widget? icon_widget, string? label);
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
@@ -4376,7 +4302,7 @@ namespace Gtk {
 		public virtual signal void clicked ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ToolItem : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
+	public class ToolItem : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		[CCode (has_construct_function = false)]
 		public ToolItem ();
 		public Pango.EllipsizeMode get_ellipsize_mode ();
@@ -4412,7 +4338,7 @@ namespace Gtk {
 		public virtual signal void toolbar_reconfigured ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ToolItemGroup : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.ToolShell {
+	public class ToolItemGroup : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.ToolShell {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ToolItemGroup (string label);
 		public bool get_collapsed ();
@@ -4438,26 +4364,19 @@ namespace Gtk {
 		public Gtk.Widget label_widget { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ToolPalette : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class ToolPalette : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ToolPalette ();
 		public void add_drag_dest (Gtk.Widget widget, Gtk.DestDefaults flags, Gtk.ToolPaletteDragTargets targets, Gdk.DragAction actions);
 		public unowned Gtk.Widget get_drag_item (Gtk.SelectionData selection);
 		public static Gtk.TargetEntry get_drag_target_group ();
 		public static Gtk.TargetEntry get_drag_target_item ();
-		public unowned Gtk.ToolItemGroup get_drop_group (int x, int y);
 		public unowned Gtk.ToolItem get_drop_item (int x, int y);
-		public bool get_exclusive (Gtk.ToolItemGroup group);
-		public bool get_expand (Gtk.ToolItemGroup group);
-		public int get_group_position (Gtk.ToolItemGroup group);
 		public unowned Gtk.Adjustment get_hadjustment ();
 		public Gtk.IconSize get_icon_size ();
 		public Gtk.ToolbarStyle get_style ();
 		public unowned Gtk.Adjustment get_vadjustment ();
 		public void set_drag_source (Gtk.ToolPaletteDragTargets targets);
-		public void set_exclusive (Gtk.ToolItemGroup group, bool exclusive);
-		public void set_expand (Gtk.ToolItemGroup group, bool expand);
-		public void set_group_position (Gtk.ToolItemGroup group, int position);
 		public void set_icon_size (Gtk.IconSize icon_size);
 		public void set_style (Gtk.ToolbarStyle style);
 		public void unset_icon_size ();
@@ -4470,7 +4389,7 @@ namespace Gtk {
 		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Toolbar : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.ToolShell, Gtk.Orientable {
+	public class Toolbar : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.ToolShell, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Toolbar ();
 		public int get_drop_index (int x, int y);
@@ -4649,7 +4568,7 @@ namespace Gtk {
 		public void swap (Gtk.TreeIter a, Gtk.TreeIter b);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TreeView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class TreeView : Gtk.Container, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public TreeView ();
 		public int append_column (Gtk.TreeViewColumn column);
@@ -4662,7 +4581,7 @@ namespace Gtk {
 		public void convert_tree_to_widget_coords (int tx, int ty, out int wx, out int wy);
 		public void convert_widget_to_bin_window_coords (int wx, int wy, out int bx, out int by);
 		public void convert_widget_to_tree_coords (int wx, int wy, out int tx, out int ty);
-		public unowned Gdk.Pixmap create_row_drag_icon (Gtk.TreePath path);
+		public unowned Cairo.Surface create_row_drag_icon (Gtk.TreePath path);
 		public void enable_model_drag_dest (Gtk.TargetEntry[] targets, Gdk.DragAction actions);
 		public void enable_model_drag_source (Gdk.ModifierType start_button_mask, Gtk.TargetEntry[] targets, Gdk.DragAction actions);
 		public void expand_all ();
@@ -4788,7 +4707,7 @@ namespace Gtk {
 		public virtual signal bool unselect_all ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TreeViewColumn : Gtk.Object, Gtk.CellLayout, Gtk.Buildable {
+	public class TreeViewColumn : GLib.InitiallyUnowned, Gtk.CellLayout, Gtk.Buildable {
 		[CCode (has_construct_function = false)]
 		public TreeViewColumn ();
 		public bool cell_get_position (Gtk.CellRenderer cell_renderer, int start_pos, int width);
@@ -4884,44 +4803,44 @@ namespace Gtk {
 		public virtual signal void pre_activate (Gtk.Action action);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class VBox : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class VBox : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public VBox (bool homogeneous, int spacing);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class VButtonBox : Gtk.ButtonBox, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class VButtonBox : Gtk.ButtonBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public VButtonBox ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class VPaned : Gtk.Paned, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class VPaned : Gtk.Paned, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public VPaned ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class VRuler : Gtk.Ruler, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class VRuler : Gtk.Ruler, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public VRuler ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class VScale : Gtk.Scale, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class VScale : Gtk.Scale, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public VScale (Gtk.Adjustment? adjustment);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public VScale.with_range (double min, double max, double step);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class VScrollbar : Gtk.Scrollbar, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class VScrollbar : Gtk.Scrollbar, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public VScrollbar (Gtk.Adjustment? adjustment);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class VSeparator : Gtk.Separator, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
+	public class VSeparator : Gtk.Separator, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public VSeparator ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Viewport : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Viewport : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Viewport (Gtk.Adjustment? hadjustment, Gtk.Adjustment? vadjustment);
 		public unowned Gdk.Window get_bin_window ();
@@ -4938,12 +4857,12 @@ namespace Gtk {
 		public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class VolumeButton : Gtk.ScaleButton, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable, Gtk.Orientable {
+	public class VolumeButton : Gtk.ScaleButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public VolumeButton ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Widget : Gtk.Object, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Widget : GLib.InitiallyUnowned, Atk.Implementor, Gtk.Buildable {
 		[CCode (has_new_function = false, construct_function = "gtk_widget_new")]
 		public Widget (...);
 		public bool activate ();
@@ -4951,6 +4870,10 @@ namespace Gtk {
 		public void add_device_events (Gdk.Device device, Gdk.EventMask events);
 		public void add_events (int events);
 		public void add_mnemonic_label (Gtk.Widget label);
+		[NoWrapper]
+		public virtual void adjust_size_allocation (Gtk.Allocation allocation);
+		[NoWrapper]
+		public virtual void adjust_size_request (Gtk.Orientation orientation, int for_size, int minimum_size, int natural_size);
 		public bool child_focus (Gtk.DirectionType direction);
 		public void class_path (out uint path_length, out unowned string path, out unowned string path_reversed);
 		public Pango.Context create_pango_context ();
@@ -4965,44 +4888,52 @@ namespace Gtk {
 		public class unowned GLib.ParamSpec find_style_property (string property_name);
 		public void freeze_child_notify ();
 		public virtual unowned Atk.Object get_accessible ();
+		public int get_allocated_height ();
+		public int get_allocated_width ();
 		public void get_allocation (out Gtk.Allocation allocation);
 		public unowned Gtk.Widget get_ancestor (GLib.Type widget_type);
 		public bool get_app_paintable ();
 		public bool get_can_default ();
 		public bool get_can_focus ();
-		public void get_child_requisition (out Gtk.Requisition requisition);
 		public bool get_child_visible ();
 		public unowned Gtk.Clipboard get_clipboard (Gdk.Atom selection);
-		public unowned Gdk.Colormap get_colormap ();
 		public unowned string get_composite_name ();
-		public static unowned Gdk.Colormap get_default_colormap ();
 		public static Gtk.TextDirection get_default_direction ();
 		public static unowned Gtk.Style get_default_style ();
-		public static unowned Gdk.Visual get_default_visual ();
 		public Gdk.EventMask get_device_events (Gdk.Device device);
 		public Gtk.TextDirection get_direction ();
 		public unowned Gdk.Display get_display ();
 		public bool get_double_buffered ();
 		public int get_events ();
 		public Gdk.ExtensionMode get_extension_events ();
+		public Gtk.Align get_halign ();
 		public bool get_has_tooltip ();
 		public bool get_has_window ();
 		public bool get_mapped ();
+		public int get_margin_bottom ();
+		public int get_margin_left ();
+		public int get_margin_right ();
+		public int get_margin_top ();
 		public unowned Gtk.RcStyle get_modifier_style ();
 		public bool get_no_show_all ();
 		public unowned Pango.Context get_pango_context ();
 		public unowned Gtk.Widget get_parent ();
 		public unowned Gdk.Window get_parent_window ();
 		public void get_pointer (out int x, out int y);
+		public virtual void get_preferred_height (int minimum_height, int natural_height);
+		public virtual void get_preferred_height_for_width (int width, int minimum_height, int natural_height);
+		public void get_preferred_size (Gtk.Requisition minimum_size, Gtk.Requisition natural_size);
+		public virtual void get_preferred_width (int minimum_width, int natural_width);
+		public virtual void get_preferred_width_for_height (int height, int minimum_width, int natural_width);
 		public bool get_realized ();
 		public bool get_receives_default ();
+		public virtual Gtk.SizeRequestMode get_request_mode ();
 		public void get_requisition (Gtk.Requisition requisition);
 		public unowned Gdk.Window get_root_window ();
 		public unowned Gdk.Screen get_screen ();
 		public bool get_sensitive ();
 		public unowned Gtk.Settings get_settings ();
 		public void get_size_request (out int width, out int height);
-		public unowned Gdk.Pixmap get_snapshot (Gdk.Rectangle clip_rect);
 		public Gtk.StateType get_state ();
 		public unowned Gtk.Style get_style ();
 		public bool get_support_multidevice ();
@@ -5010,6 +4941,7 @@ namespace Gtk {
 		public unowned string get_tooltip_text ();
 		public unowned Gtk.Window get_tooltip_window ();
 		public unowned Gtk.Widget get_toplevel ();
+		public Gtk.Align get_valign ();
 		public bool get_visible ();
 		public unowned Gdk.Visual get_visual ();
 		public unowned Gdk.Window get_window ();
@@ -5018,7 +4950,8 @@ namespace Gtk {
 		public bool has_screen ();
 		public virtual void hide_all ();
 		public bool hide_on_delete ();
-		public void input_shape_combine_mask (Gdk.Bitmap? shape_mask, int offset_x, int offset_y);
+		public bool in_destruction ();
+		public void input_shape_combine_region (Cairo.Region region);
 		[CCode (cname = "gtk_widget_class_install_style_property")]
 		public class void install_style_property (GLib.ParamSpec pspec);
 		[CCode (cname = "gtk_widget_class_install_style_property_parser")]
@@ -5041,15 +4974,13 @@ namespace Gtk {
 		public void modify_symbolic_color (string name, Gdk.Color color);
 		public void modify_text (Gtk.StateType state, Gdk.Color? color);
 		public void path (out uint path_length, out unowned string path, out unowned string path_reversed);
-		public static void pop_colormap ();
 		public static void pop_composite_child ();
-		public static void push_colormap (Gdk.Colormap cmap);
 		public static void push_composite_child ();
 		public void queue_draw ();
 		public void queue_draw_area (int x, int y, int width, int height);
 		public void queue_resize ();
 		public void queue_resize_no_redraw ();
-		public unowned Gdk.Region region_intersect (Gdk.Region region);
+		public unowned Cairo.Region region_intersect (Cairo.Region region);
 		public bool remove_accelerator (Gtk.AccelGroup accel_group, uint accel_key, Gdk.ModifierType accel_mods);
 		public void remove_mnemonic_label (Gtk.Widget label);
 		public Gdk.Pixbuf render_icon (string stock_id, Gtk.IconSize size, string? detail);
@@ -5064,18 +4995,21 @@ namespace Gtk {
 		public void set_can_default (bool can_default);
 		public void set_can_focus (bool can_focus);
 		public void set_child_visible (bool is_visible);
-		public void set_colormap (Gdk.Colormap colormap);
 		public void set_composite_name (string name);
-		public static void set_default_colormap (Gdk.Colormap colormap);
 		public static void set_default_direction (Gtk.TextDirection dir);
 		public void set_device_events (Gdk.Device device, Gdk.EventMask events);
 		public void set_direction (Gtk.TextDirection dir);
 		public void set_double_buffered (bool double_buffered);
 		public void set_events (int events);
 		public void set_extension_events (Gdk.ExtensionMode mode);
+		public void set_halign (Gtk.Align align);
 		public void set_has_tooltip (bool has_tooltip);
 		public void set_has_window (bool has_window);
 		public void set_mapped (bool mapped);
+		public void set_margin_bottom (int margin);
+		public void set_margin_left (int margin);
+		public void set_margin_right (int margin);
+		public void set_margin_top (int margin);
 		public void set_no_show_all (bool no_show_all);
 		public void set_parent (Gtk.Widget parent);
 		public void set_parent_window (Gdk.Window parent_window);
@@ -5091,9 +5025,11 @@ namespace Gtk {
 		public void set_tooltip_markup (string markup);
 		public void set_tooltip_text (string text);
 		public void set_tooltip_window (Gtk.Window custom_window);
+		public void set_valign (Gtk.Align align);
 		public void set_visible (bool visible);
+		public void set_visual (Gdk.Visual visual);
 		public void set_window (Gdk.Window window);
-		public void shape_combine_mask (Gdk.Bitmap? shape_mask, int offset_x, int offset_y);
+		public void shape_combine_region (Cairo.Region region);
 		public virtual void show_all ();
 		public void show_now ();
 		public void style_attach ();
@@ -5113,6 +5049,7 @@ namespace Gtk {
 		public bool double_buffered { get; set; }
 		public Gdk.EventMask events { get; set; }
 		public Gdk.ExtensionMode extension_events { get; set; }
+		public Gtk.Align halign { get; set; }
 		[NoAccessorMethod]
 		public bool has_default { get; set; }
 		[NoAccessorMethod]
@@ -5122,6 +5059,12 @@ namespace Gtk {
 		public int height_request { get; set; }
 		[NoAccessorMethod]
 		public bool is_focus { get; set; }
+		[NoAccessorMethod]
+		public int margin { get; set; }
+		public int margin_bottom { get; set; }
+		public int margin_left { get; set; }
+		public int margin_right { get; set; }
+		public int margin_top { get; set; }
 		public string name { get; set; }
 		public bool no_show_all { get; set; }
 		public Gtk.Container parent { get; set; }
@@ -5130,6 +5073,7 @@ namespace Gtk {
 		public Gtk.Style style { get; set; }
 		public string tooltip_markup { get; set; }
 		public string tooltip_text { get; set; }
+		public Gtk.Align valign { get; set; }
 		public bool visible { get; set; }
 		[NoAccessorMethod]
 		public int width_request { get; set; }
@@ -5145,6 +5089,7 @@ namespace Gtk {
 		public virtual signal bool configure_event (Gdk.EventConfigure event);
 		public virtual signal bool damage_event (Gdk.Event p0);
 		public virtual signal bool delete_event (Gdk.Event event);
+		public virtual signal void destroy ();
 		public virtual signal bool destroy_event (Gdk.Event event);
 		public virtual signal void direction_changed (Gtk.TextDirection previous_direction);
 		public virtual signal void drag_begin (Gdk.DragContext context);
@@ -5156,11 +5101,12 @@ namespace Gtk {
 		public virtual signal bool drag_failed (Gdk.DragContext p0, Gtk.DragResult p1);
 		public virtual signal void drag_leave (Gdk.DragContext context, uint time_);
 		public virtual signal bool drag_motion (Gdk.DragContext context, int x, int y, uint time_);
+		[HasEmitter]
+		public virtual signal bool draw (Cairo.Context cr);
 		public virtual signal bool enter_notify_event (Gdk.EventCrossing event);
 		[HasEmitter]
 		public virtual signal bool event (Gdk.Event event);
 		public virtual signal void event_after (Gdk.Event p0);
-		public virtual signal bool expose_event (Gdk.EventExpose event);
 		public virtual signal bool focus (Gtk.DirectionType direction);
 		public virtual signal bool focus_in_event (Gdk.EventFocus event);
 		public virtual signal bool focus_out_event (Gdk.EventFocus event);
@@ -5219,22 +5165,14 @@ namespace Gtk {
 	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class WidgetAuxInfo {
+		public uint halign;
 		public int height;
+		public weak Gtk.Border margin;
+		public uint valign;
 		public int width;
-		public int x;
-		public uint x_set;
-		public int y;
-		public uint y_set;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class WidgetShapeInfo {
-		public int16 offset_x;
-		public int16 offset_y;
-		public weak Gdk.Bitmap shape_mask;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Window : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
+	public class Window : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Window (Gtk.WindowType type = Gtk.WindowType.TOPLEVEL);
 		public bool activate_default ();
@@ -5340,10 +5278,6 @@ namespace Gtk {
 		public void unmaximize ();
 		public void unstick ();
 		public bool accept_focus { get; set; }
-		[NoAccessorMethod]
-		public bool allow_grow { get; set; }
-		[NoAccessorMethod]
-		public bool allow_shrink { get; set; }
 		public bool decorated { get; set; }
 		[NoAccessorMethod]
 		public int default_height { get; set; }
@@ -5393,10 +5327,39 @@ namespace Gtk {
 		public WindowGroup ();
 		public void add_window (Gtk.Window window);
 		public unowned Gtk.Widget get_current_device_grab (Gdk.Device device);
+		public unowned Gtk.Widget get_current_grab ();
 		public GLib.List<weak Gtk.Window> list_windows ();
 		public void remove_window (Gtk.Window window);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public class WrapBox : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public WrapBox (Gtk.WrapAllocationMode mode, Gtk.WrapBoxSpreading horizontal_spreading, Gtk.WrapBoxSpreading vertical_spreading, uint horizontal_spacing, uint vertical_spacing);
+		public Gtk.WrapAllocationMode get_allocation_mode ();
+		public uint get_horizontal_spacing ();
+		public Gtk.WrapBoxSpreading get_horizontal_spreading ();
+		public uint get_minimum_line_children ();
+		public uint get_natural_line_children ();
+		public uint get_vertical_spacing ();
+		public Gtk.WrapBoxSpreading get_vertical_spreading ();
+		public void insert_child (Gtk.Widget widget, int index, Gtk.WrapBoxPacking packing);
+		public void reorder_child (Gtk.Widget widget, uint index);
+		public void set_allocation_mode (Gtk.WrapAllocationMode mode);
+		public void set_horizontal_spacing (uint spacing);
+		public void set_horizontal_spreading (Gtk.WrapBoxSpreading spreading);
+		public void set_minimum_line_children (uint n_children);
+		public void set_natural_line_children (uint n_children);
+		public void set_vertical_spacing (uint spacing);
+		public void set_vertical_spreading (Gtk.WrapBoxSpreading spreading);
+		public Gtk.WrapAllocationMode allocation_mode { get; set; }
+		public uint horizontal_spacing { get; set; }
+		public Gtk.WrapBoxSpreading horizontal_spreading { get; set; }
+		public uint minimum_line_children { get; set; }
+		public uint natural_line_children { get; set; }
+		public uint vertical_spacing { get; set; }
+		public Gtk.WrapBoxSpreading vertical_spreading { get; set; }
+	}
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public interface Activatable : GLib.Object {
 		public void do_set_related_action (Gtk.Action action);
 		public unowned Gtk.Action get_related_action ();
@@ -5612,15 +5575,6 @@ namespace Gtk {
 		public signal void selection_changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public interface SizeRequest : Gtk.Object {
-		public abstract void get_height (int minimum_height, int natural_height);
-		public abstract void get_height_for_width (int width, int minimum_height, int natural_height);
-		public abstract Gtk.SizeRequestMode get_request_mode ();
-		public void get_size (Gtk.Requisition minimum_size, Gtk.Requisition natural_size);
-		public abstract void get_width (int minimum_width, int natural_width);
-		public abstract void get_width_for_height (int height, int minimum_width, int natural_width);
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public interface ToolShell : Gtk.Widget {
 		public abstract Pango.EllipsizeMode get_ellipsize_mode ();
 		public abstract Gtk.IconSize get_icon_size ();
@@ -5742,6 +5696,8 @@ namespace Gtk {
 	public struct Requisition {
 		public int width;
 		public int height;
+		[CCode (cname = "gtk_requisition_new", has_construct_function = false)]
+		public Requisition ();
 		public Gtk.Requisition copy ();
 		public void free ();
 	}
@@ -5893,25 +5849,12 @@ namespace Gtk {
 		LOCKED,
 		MASK
 	}
-	[CCode (cprefix = "GTK_ANCHOR_", cheader_filename = "gtk/gtk.h")]
-	public enum AnchorType {
-		CENTER,
-		NORTH,
-		NORTH_WEST,
-		NORTH_EAST,
-		SOUTH,
-		SOUTH_WEST,
-		SOUTH_EAST,
-		WEST,
-		EAST,
-		N,
-		NW,
-		NE,
-		S,
-		SW,
-		SE,
-		W,
-		E
+	[CCode (cprefix = "GTK_ALIGN_", cheader_filename = "gtk/gtk.h")]
+	public enum Align {
+		FILL,
+		START,
+		END,
+		CENTER
 	}
 	[CCode (cprefix = "GTK_ARROWS_", cheader_filename = "gtk/gtk.h")]
 	public enum ArrowPlacement {
@@ -5944,7 +5887,6 @@ namespace Gtk {
 	}
 	[CCode (cprefix = "GTK_BUTTONBOX_", cheader_filename = "gtk/gtk.h")]
 	public enum ButtonBoxStyle {
-		DEFAULT_STYLE,
 		SPREAD,
 		EDGE,
 		START,
@@ -5967,7 +5909,6 @@ namespace Gtk {
 		SHOW_DAY_NAMES,
 		NO_MONTH_CHANGE,
 		SHOW_WEEK_NUMBERS,
-		WEEK_START_MONDAY,
 		SHOW_DETAILS
 	}
 	[CCode (cprefix = "GTK_CELL_RENDERER_ACCEL_MODE_", cheader_filename = "gtk/gtk.h")]
@@ -6012,7 +5953,7 @@ namespace Gtk {
 		ICONTHEME,
 		PRINTING,
 		BUILDER,
-		EXTENDED_LAYOUT
+		SIZE_REQUEST
 	}
 	[CCode (cprefix = "GTK_DELETE_", cheader_filename = "gtk/gtk.h")]
 	public enum DeleteType {
@@ -6037,8 +5978,7 @@ namespace Gtk {
 	[Flags]
 	public enum DialogFlags {
 		MODAL,
-		DESTROY_WITH_PARENT,
-		NO_SEPARATOR
+		DESTROY_WITH_PARENT
 	}
 	[CCode (cprefix = "GTK_DIR_", cheader_filename = "gtk/gtk.h")]
 	public enum DirectionType {
@@ -6146,8 +6086,6 @@ namespace Gtk {
 	[CCode (cprefix = "GTK_IMAGE_", cheader_filename = "gtk/gtk.h")]
 	public enum ImageType {
 		EMPTY,
-		PIXMAP,
-		IMAGE,
 		PIXBUF,
 		STOCK,
 		ICON_SET,
@@ -6162,6 +6100,18 @@ namespace Gtk {
 		CENTER,
 		FILL
 	}
+	[CCode (cprefix = "GTK_LICENSE_", cheader_filename = "gtk/gtk.h")]
+	public enum License {
+		UNKNOWN,
+		CUSTOM,
+		GPL_2_0,
+		GPL_3_0,
+		LGPL_2_1,
+		LGPL_3_0,
+		BSD,
+		MIT_X11,
+		ARTISTIC
+	}
 	[CCode (cprefix = "GTK_MENU_DIR_", cheader_filename = "gtk/gtk.h")]
 	public enum MenuDirectionType {
 		PARENT,
@@ -6212,13 +6162,6 @@ namespace Gtk {
 		BOTTOM_TO_TOP_LEFT_TO_RIGHT,
 		BOTTOM_TO_TOP_RIGHT_TO_LEFT
 	}
-	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum ObjectFlags {
-		IN_DESTRUCTION,
-		RESERVED_1,
-		RESERVED_2
-	}
 	[CCode (cprefix = "GTK_ORIENTATION_", cheader_filename = "gtk/gtk.h")]
 	public enum Orientation {
 		HORIZONTAL,
@@ -6330,32 +6273,6 @@ namespace Gtk {
 		FINISHED,
 		FINISHED_ABORTED
 	}
-	[CCode (cprefix = "PRIVATE_GTK_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum PrivateFlags {
-		USER_STYLE,
-		RESIZE_PENDING,
-		HAS_POINTER,
-		SHADOWED,
-		HAS_SHAPE_MASK,
-		IN_REPARENT,
-		DIRECTION_SET,
-		DIRECTION_LTR,
-		ANCHORED,
-		CHILD_VISIBLE,
-		REDRAW_ON_ALLOC,
-		ALLOC_NEEDED,
-		REQUEST_NEEDED,
-		WIDTH_REQUEST_NEEDED,
-		HEIGHT_REQUEST_NEEDED
-	}
-	[CCode (cprefix = "GTK_PROGRESS_", cheader_filename = "gtk/gtk.h")]
-	public enum ProgressBarOrientation {
-		LEFT_TO_RIGHT,
-		RIGHT_TO_LEFT,
-		BOTTOM_TO_TOP,
-		TOP_TO_BOTTOM
-	}
 	[CCode (cprefix = "GTK_RC_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum RcFlags {
@@ -6498,8 +6415,7 @@ namespace Gtk {
 		NONE,
 		SINGLE,
 		BROWSE,
-		MULTIPLE,
-		EXTENDED
+		MULTIPLE
 	}
 	[CCode (cprefix = "GTK_SENSITIVITY_", cheader_filename = "gtk/gtk.h")]
 	public enum SensitivityType {
@@ -6555,16 +6471,6 @@ namespace Gtk {
 		SELECTED,
 		INSENSITIVE
 	}
-	[CCode (cprefix = "GTK_DIRECTION_", cheader_filename = "gtk/gtk.h")]
-	public enum SubmenuDirection {
-		LEFT,
-		RIGHT
-	}
-	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
-	public enum SubmenuPlacement {
-		TOP_BOTTOM,
-		LEFT_RIGHT
-	}
 	[CCode (cprefix = "GTK_TARGET_", cheader_filename = "gtk/gtk.h")]
 	[Flags]
 	public enum TargetFlags {
@@ -6673,35 +6579,6 @@ namespace Gtk {
 		DISCONTINUOUS,
 		DELAYED
 	}
-	[CCode (cprefix = "GTK_VISIBILITY_", cheader_filename = "gtk/gtk.h")]
-	public enum Visibility {
-		NONE,
-		PARTIAL,
-		FULL
-	}
-	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
-	[Flags]
-	public enum WidgetFlags {
-		TOPLEVEL,
-		NO_WINDOW,
-		REALIZED,
-		MAPPED,
-		VISIBLE,
-		SENSITIVE,
-		PARENT_SENSITIVE,
-		CAN_FOCUS,
-		HAS_FOCUS,
-		CAN_DEFAULT,
-		HAS_DEFAULT,
-		HAS_GRAB,
-		RC_STYLE,
-		COMPOSITE_CHILD,
-		APP_PAINTABLE,
-		RECEIVES_DEFAULT,
-		DOUBLE_BUFFERED,
-		NO_SHOW_ALL,
-		MULTIDEVICE
-	}
 	[CCode (cprefix = "GTK_WIDGET_HELP_", cheader_filename = "gtk/gtk.h")]
 	public enum WidgetHelpType {
 		TOOLTIP,
@@ -6720,6 +6597,25 @@ namespace Gtk {
 		TOPLEVEL,
 		POPUP
 	}
+	[CCode (cprefix = "GTK_WRAP_ALLOCATE_", cheader_filename = "gtk/gtk.h")]
+	public enum WrapAllocationMode {
+		FREE,
+		ALIGNED,
+		HOMOGENEOUS
+	}
+	[CCode (cprefix = "GTK_WRAP_BOX_", cheader_filename = "gtk/gtk.h")]
+	[Flags]
+	public enum WrapBoxPacking {
+		H_EXPAND,
+		V_EXPAND
+	}
+	[CCode (cprefix = "GTK_WRAP_BOX_SPREAD_", cheader_filename = "gtk/gtk.h")]
+	public enum WrapBoxSpreading {
+		START,
+		END,
+		EVEN,
+		EXPAND
+	}
 	[CCode (cprefix = "GTK_WRAP_", cheader_filename = "gtk/gtk.h")]
 	public enum WrapMode {
 		NONE,
@@ -6740,8 +6636,6 @@ namespace Gtk {
 		DUPLICATE_ID,
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public delegate void AboutDialogActivateLinkFunc (Gtk.AboutDialog about, string link_);
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate bool AccelGroupActivate (Gtk.AccelGroup accel_group, GLib.Object acceleratable, uint keyval, Gdk.ModifierType modifier);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate bool AccelGroupFindFunc (Gtk.AccelKey key, GLib.Closure closure);
@@ -6758,7 +6652,7 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void Callback (Gtk.Widget widget);
 	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
-	public delegate void CallbackMarshal (Gtk.Object object, void* data, Gtk.Arg[] args);
+	public delegate void CallbackMarshal (GLib.Object object, void* data, Gtk.Arg[] args);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void CellLayoutDataFunc (Gtk.CellLayout cell_layout, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, Gtk.TreeIter iter);
 	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
@@ -6791,8 +6685,6 @@ namespace Gtk {
 	public delegate void IconViewForeachFunc (Gtk.IconView icon_view, Gtk.TreePath path);
 	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
 	public delegate int KeySnoopFunc (Gtk.Widget grab_widget, Gdk.EventKey event, void* func_data);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public delegate void LinkButtonUriFunc (Gtk.LinkButton button, string link_);
 	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
 	public delegate void MenuDetachFunc (Gtk.Widget attach_widget, Gtk.Menu menu);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -6802,8 +6694,6 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
 	public delegate void ModuleInitFunc (int argc, string argv);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public delegate unowned Gtk.Notebook NotebookWindowCreationFunc (Gtk.Notebook source, Gtk.Widget page, int x, int y);
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void PageSetupDoneFunc (Gtk.PageSetup page_setup);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void PrintSettingsFunc (string key, string value);
@@ -6856,8 +6746,6 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int BINARY_AGE;
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public const int BUTTONBOX_DEFAULT;
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int INPUT_ERROR;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int INTERFACE_AGE;
@@ -6953,6 +6841,8 @@ namespace Gtk {
 	public const string PRINT_SETTINGS_WIN32_DRIVER_VERSION;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int PRIORITY_RESIZE;
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public const int SIZE_REQUEST_CACHED_SIZES;
 	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ABOUT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STOCK_ABOUT;
@@ -7289,9 +7179,13 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool alternative_dialog_button_order (Gdk.Screen screen);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static bool bindings_activate (Gtk.Object object, uint keyval, Gdk.ModifierType modifiers);
+	public static bool bindings_activate (GLib.Object object, uint keyval, Gdk.ModifierType modifiers);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static bool bindings_activate_event (GLib.Object object, Gdk.EventKey event);
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static bool cairo_should_draw_window (Cairo.Context cr, Gdk.Window window);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static bool bindings_activate_event (Gtk.Object object, Gdk.EventKey event);
+	public static void cairo_transform_to_window (Cairo.Context cr, Gtk.Widget widget, Gdk.Window window);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static unowned string check_version (uint required_major, uint required_minor, uint required_micro);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -7301,6 +7195,8 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void disable_setlocale ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static int distribute_natural_allocation (int extra_space, uint n_requested_sizes, Gtk.RequestedSize sizes);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static unowned Gdk.DragContext drag_begin (Gtk.Widget widget, Gtk.TargetList targets, Gdk.DragAction actions, int button, Gdk.Event event);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool drag_check_threshold (Gtk.Widget widget, int start_x, int start_y, int current_x, int current_y);
@@ -7341,10 +7237,10 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_set_icon_pixbuf (Gdk.DragContext context, Gdk.Pixbuf pixbuf, int hot_x, int hot_y);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void drag_set_icon_pixmap (Gdk.DragContext context, Gdk.Colormap colormap, Gdk.Pixmap pixmap, Gdk.Bitmap mask, int hot_x, int hot_y);
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_set_icon_stock (Gdk.DragContext context, string stock_id, int hot_x, int hot_y);
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static void drag_set_icon_surface (Gdk.DragContext context, Cairo.Surface surface);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_set_icon_widget (Gdk.DragContext context, Gtk.Widget widget, int hot_x, int hot_y);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_source_add_image_targets (Gtk.Widget widget);
@@ -7357,8 +7253,6 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_source_set (Gtk.Widget widget, Gdk.ModifierType start_button_mask, Gtk.TargetEntry[] targets, Gdk.DragAction actions);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void drag_source_set_icon (Gtk.Widget widget, Gdk.Colormap colormap, Gdk.Pixmap pixmap, Gdk.Bitmap mask);
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_source_set_icon_name (Gtk.Widget widget, string icon_name);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_source_set_icon_pixbuf (Gtk.Widget widget, Gdk.Pixbuf pixbuf);
@@ -7371,13 +7265,11 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void drag_unhighlight (Gtk.Widget widget);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void draw_insertion_cursor (Gtk.Widget widget, Gdk.Drawable drawable, Gdk.Rectangle area, Gdk.Rectangle location, bool is_primary, Gtk.TextDirection direction, bool draw_arrow);
+	public static void draw_insertion_cursor (Gtk.Widget widget, Cairo.Context cr, Gdk.Rectangle location, bool is_primary, Gtk.TextDirection direction, bool draw_arrow);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool events_pending ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static unowned Gdk.GC gc_get (int depth, Gdk.Colormap colormap, Gdk.GCValues values, Gdk.GCValuesMask values_mask);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void gc_release (Gdk.GC gc);
+	public static uint get_binary_age ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static Gdk.Event get_current_event ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -7387,10 +7279,20 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static uint32 get_current_event_time ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static uint get_debug_flags ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static unowned Pango.Language get_default_language ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static unowned Gtk.Widget get_event_widget (Gdk.Event event);
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static uint get_interface_age ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static uint get_major_version ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static uint get_micro_version ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static uint get_minor_version ();
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static GLib.OptionGroup get_option_group (bool open_default_display);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void grab_add (Gtk.Widget widget);
@@ -7437,47 +7339,45 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void main_quit ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_arrow (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle? area, Gtk.Widget? widget, string? detail, Gtk.ArrowType arrow_type, bool fill, int x, int y, int width, int height);
+	public static void paint_arrow (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget? widget, string? detail, Gtk.ArrowType arrow_type, bool fill, int x, int y, int width, int height);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_box (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle? area, Gtk.Widget? widget, string? detail, int x, int y, int width, int height);
+	public static void paint_box (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget? widget, string? detail, int x, int y, int width, int height);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_box_gap (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle? area, Gtk.Widget? widget, string? detail, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width);
+	public static void paint_box_gap (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget? widget, string? detail, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_check (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle? area, Gtk.Widget? widget, string? detail, int x, int y, int width, int height);
+	public static void paint_check (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget? widget, string? detail, int x, int y, int width, int height);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_diamond (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle? area, Gtk.Widget? widget, string? detail, int x, int y, int width, int height);
+	public static void paint_diamond (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget? widget, string? detail, int x, int y, int width, int height);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_expander (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle? area, Gtk.Widget? widget, string? detail, int x, int y, Gtk.ExpanderStyle expander_style);
+	public static void paint_expander (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, Gtk.Widget? widget, string? detail, int x, int y, Gtk.ExpanderStyle expander_style);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_extension (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle? area, Gtk.Widget? widget, string? detail, int x, int y, int width, int height, Gtk.PositionType gap_side);
+	public static void paint_extension (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget? widget, string? detail, int x, int y, int width, int height, Gtk.PositionType gap_side);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_flat_box (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle? area, Gtk.Widget? widget, string? detail, int x, int y, int width, int height);
+	public static void paint_flat_box (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget? widget, string? detail, int x, int y, int width, int height);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_focus (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle? area, Gtk.Widget? widget, string? detail, int x, int y, int width, int height);
+	public static void paint_focus (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, Gtk.Widget? widget, string? detail, int x, int y, int width, int height);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_handle (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle? area, Gtk.Widget? widget, string? detail, int x, int y, int width, int height, Gtk.Orientation orientation);
+	public static void paint_handle (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget? widget, string? detail, int x, int y, int width, int height, Gtk.Orientation orientation);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_hline (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle? area, Gtk.Widget? widget, string? detail, int x1, int x2, int y);
+	public static void paint_hline (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, Gtk.Widget? widget, string? detail, int x1, int x2, int y);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_layout (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, bool use_text, Gdk.Rectangle? area, Gtk.Widget? widget, string? detail, int x, int y, Pango.Layout layout);
+	public static void paint_layout (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, bool use_text, Gtk.Widget? widget, string? detail, int x, int y, Pango.Layout layout);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_option (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle? area, Gtk.Widget? widget, string? detail, int x, int y, int width, int height);
+	public static void paint_option (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget? widget, string? detail, int x, int y, int width, int height);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_polygon (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle? area, Gtk.Widget? widget, string? detail, Gdk.Point[] points, bool fill);
+	public static void paint_resize_grip (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, Gtk.Widget? widget, string? detail, Gdk.WindowEdge edge, int x, int y, int width, int height);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_resize_grip (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle? area, Gtk.Widget? widget, string? detail, Gdk.WindowEdge edge, int x, int y, int width, int height);
+	public static void paint_shadow (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget? widget, string? detail, int x, int y, int width, int height);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_shadow (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle? area, Gtk.Widget? widget, string? detail, int x, int y, int width, int height);
+	public static void paint_shadow_gap (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget? widget, string? detail, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_shadow_gap (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle? area, Gtk.Widget? widget, string? detail, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width);
+	public static void paint_slider (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget? widget, string? detail, int x, int y, int width, int height, Gtk.Orientation orientation);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_slider (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle? area, Gtk.Widget? widget, string? detail, int x, int y, int width, int height, Gtk.Orientation orientation);
+	public static void paint_spinner (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, Gtk.Widget widget, string detail, uint step, int x, int y, int width, int height);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_spinner (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, uint step, int x, int y, int width, int height);
+	public static void paint_tab (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget? widget, string? detail, int x, int y, int width, int height);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_tab (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle? area, Gtk.Widget? widget, string? detail, int x, int y, int width, int height);
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void paint_vline (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle? area, Gtk.Widget? widget, string? detail, int y1_, int y2_, int x);
+	public static void paint_vline (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, Gtk.Widget? widget, string? detail, int y1_, int y2_, int x);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool parse_args (int argc, string[] argv);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -7491,7 +7391,7 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static uint quit_add (uint main_level, Gtk.Function function, void* data);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void quit_add_destroy (uint main_level, Gtk.Object object);
+	public static void quit_add_destroy (uint main_level, Gtk.Widget object);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void quit_remove (uint quit_handler_id);
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -7555,6 +7455,8 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void selection_remove_all (Gtk.Widget widget);
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static void set_debug_flags (uint flags);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static unowned string set_locale ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void show_about_dialog (Gtk.Window? parent, ...);
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
index dfc32b7..a1cc6bd 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
@@ -68,7 +68,7 @@ namespace Gtk {
 	}
 
 	[CCode (has_target = false)]
-	public delegate void CallbackMarshal (Object object, void* data, Arg[] args);
+	public delegate void CallbackMarshal (GLib.Object object, void* data, Arg[] args);
 
 	public delegate void ActionCallback (Action action);
 
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.gi b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
index eb4a98f..e564c9d 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.gi
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
@@ -62,7 +62,7 @@
 		<function name="bindings_activate" symbol="gtk_bindings_activate">
 			<return-type type="gboolean"/>
 			<parameters>
-				<parameter name="object" type="GtkObject*"/>
+				<parameter name="object" type="GObject*"/>
 				<parameter name="keyval" type="guint"/>
 				<parameter name="modifiers" type="GdkModifierType"/>
 			</parameters>
@@ -70,10 +70,25 @@
 		<function name="bindings_activate_event" symbol="gtk_bindings_activate_event">
 			<return-type type="gboolean"/>
 			<parameters>
-				<parameter name="object" type="GtkObject*"/>
+				<parameter name="object" type="GObject*"/>
 				<parameter name="event" type="GdkEventKey*"/>
 			</parameters>
 		</function>
+		<function name="cairo_should_draw_window" symbol="gtk_cairo_should_draw_window">
+			<return-type type="gboolean"/>
+			<parameters>
+				<parameter name="cr" type="cairo_t*"/>
+				<parameter name="window" type="GdkWindow*"/>
+			</parameters>
+		</function>
+		<function name="cairo_transform_to_window" symbol="gtk_cairo_transform_to_window">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="cr" type="cairo_t*"/>
+				<parameter name="widget" type="GtkWidget*"/>
+				<parameter name="window" type="GdkWindow*"/>
+			</parameters>
+		</function>
 		<function name="check_version" symbol="gtk_check_version">
 			<return-type type="gchar*"/>
 			<parameters>
@@ -100,6 +115,14 @@
 		<function name="disable_setlocale" symbol="gtk_disable_setlocale">
 			<return-type type="void"/>
 		</function>
+		<function name="distribute_natural_allocation" symbol="gtk_distribute_natural_allocation">
+			<return-type type="gint"/>
+			<parameters>
+				<parameter name="extra_space" type="gint"/>
+				<parameter name="n_requested_sizes" type="guint"/>
+				<parameter name="sizes" type="GtkRequestedSize*"/>
+			</parameters>
+		</function>
 		<function name="drag_begin" symbol="gtk_drag_begin">
 			<return-type type="GdkDragContext*"/>
 			<parameters>
@@ -251,24 +274,20 @@
 				<parameter name="hot_y" type="gint"/>
 			</parameters>
 		</function>
-		<function name="drag_set_icon_pixmap" symbol="gtk_drag_set_icon_pixmap">
+		<function name="drag_set_icon_stock" symbol="gtk_drag_set_icon_stock">
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="context" type="GdkDragContext*"/>
-				<parameter name="colormap" type="GdkColormap*"/>
-				<parameter name="pixmap" type="GdkPixmap*"/>
-				<parameter name="mask" type="GdkBitmap*"/>
+				<parameter name="stock_id" type="gchar*"/>
 				<parameter name="hot_x" type="gint"/>
 				<parameter name="hot_y" type="gint"/>
 			</parameters>
 		</function>
-		<function name="drag_set_icon_stock" symbol="gtk_drag_set_icon_stock">
+		<function name="drag_set_icon_surface" symbol="gtk_drag_set_icon_surface">
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="context" type="GdkDragContext*"/>
-				<parameter name="stock_id" type="gchar*"/>
-				<parameter name="hot_x" type="gint"/>
-				<parameter name="hot_y" type="gint"/>
+				<parameter name="surface" type="cairo_surface_t*"/>
 			</parameters>
 		</function>
 		<function name="drag_set_icon_widget" symbol="gtk_drag_set_icon_widget">
@@ -314,15 +333,6 @@
 				<parameter name="actions" type="GdkDragAction"/>
 			</parameters>
 		</function>
-		<function name="drag_source_set_icon" symbol="gtk_drag_source_set_icon">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="widget" type="GtkWidget*"/>
-				<parameter name="colormap" type="GdkColormap*"/>
-				<parameter name="pixmap" type="GdkPixmap*"/>
-				<parameter name="mask" type="GdkBitmap*"/>
-			</parameters>
-		</function>
 		<function name="drag_source_set_icon_name" symbol="gtk_drag_source_set_icon_name">
 			<return-type type="void"/>
 			<parameters>
@@ -367,8 +377,7 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="widget" type="GtkWidget*"/>
-				<parameter name="drawable" type="GdkDrawable*"/>
-				<parameter name="area" type="GdkRectangle*"/>
+				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="location" type="GdkRectangle*"/>
 				<parameter name="is_primary" type="gboolean"/>
 				<parameter name="direction" type="GtkTextDirection"/>
@@ -381,20 +390,8 @@
 		<function name="false" symbol="gtk_false">
 			<return-type type="gboolean"/>
 		</function>
-		<function name="gc_get" symbol="gtk_gc_get">
-			<return-type type="GdkGC*"/>
-			<parameters>
-				<parameter name="depth" type="gint"/>
-				<parameter name="colormap" type="GdkColormap*"/>
-				<parameter name="values" type="GdkGCValues*"/>
-				<parameter name="values_mask" type="GdkGCValuesMask"/>
-			</parameters>
-		</function>
-		<function name="gc_release" symbol="gtk_gc_release">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="gc" type="GdkGC*"/>
-			</parameters>
+		<function name="get_binary_age" symbol="gtk_get_binary_age">
+			<return-type type="guint"/>
 		</function>
 		<function name="get_current_event" symbol="gtk_get_current_event">
 			<return-type type="GdkEvent*"/>
@@ -411,6 +408,9 @@
 		<function name="get_current_event_time" symbol="gtk_get_current_event_time">
 			<return-type type="guint32"/>
 		</function>
+		<function name="get_debug_flags" symbol="gtk_get_debug_flags">
+			<return-type type="guint"/>
+		</function>
 		<function name="get_default_language" symbol="gtk_get_default_language">
 			<return-type type="PangoLanguage*"/>
 		</function>
@@ -420,6 +420,18 @@
 				<parameter name="event" type="GdkEvent*"/>
 			</parameters>
 		</function>
+		<function name="get_interface_age" symbol="gtk_get_interface_age">
+			<return-type type="guint"/>
+		</function>
+		<function name="get_major_version" symbol="gtk_get_major_version">
+			<return-type type="guint"/>
+		</function>
+		<function name="get_micro_version" symbol="gtk_get_micro_version">
+			<return-type type="guint"/>
+		</function>
+		<function name="get_minor_version" symbol="gtk_get_minor_version">
+			<return-type type="guint"/>
+		</function>
 		<function name="get_option_group" symbol="gtk_get_option_group">
 			<return-type type="GOptionGroup*"/>
 			<parameters>
@@ -561,10 +573,9 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="style" type="GtkStyle*"/>
-				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="state_type" type="GtkStateType"/>
 				<parameter name="shadow_type" type="GtkShadowType"/>
-				<parameter name="area" type="GdkRectangle*"/>
 				<parameter name="widget" type="GtkWidget*"/>
 				<parameter name="detail" type="gchar*"/>
 				<parameter name="arrow_type" type="GtkArrowType"/>
@@ -579,10 +590,9 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="style" type="GtkStyle*"/>
-				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="state_type" type="GtkStateType"/>
 				<parameter name="shadow_type" type="GtkShadowType"/>
-				<parameter name="area" type="GdkRectangle*"/>
 				<parameter name="widget" type="GtkWidget*"/>
 				<parameter name="detail" type="gchar*"/>
 				<parameter name="x" type="gint"/>
@@ -595,10 +605,9 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="style" type="GtkStyle*"/>
-				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="state_type" type="GtkStateType"/>
 				<parameter name="shadow_type" type="GtkShadowType"/>
-				<parameter name="area" type="GdkRectangle*"/>
 				<parameter name="widget" type="GtkWidget*"/>
 				<parameter name="detail" type="gchar*"/>
 				<parameter name="x" type="gint"/>
@@ -614,10 +623,9 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="style" type="GtkStyle*"/>
-				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="state_type" type="GtkStateType"/>
 				<parameter name="shadow_type" type="GtkShadowType"/>
-				<parameter name="area" type="GdkRectangle*"/>
 				<parameter name="widget" type="GtkWidget*"/>
 				<parameter name="detail" type="gchar*"/>
 				<parameter name="x" type="gint"/>
@@ -630,10 +638,9 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="style" type="GtkStyle*"/>
-				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="state_type" type="GtkStateType"/>
 				<parameter name="shadow_type" type="GtkShadowType"/>
-				<parameter name="area" type="GdkRectangle*"/>
 				<parameter name="widget" type="GtkWidget*"/>
 				<parameter name="detail" type="gchar*"/>
 				<parameter name="x" type="gint"/>
@@ -646,9 +653,8 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="style" type="GtkStyle*"/>
-				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="state_type" type="GtkStateType"/>
-				<parameter name="area" type="GdkRectangle*"/>
 				<parameter name="widget" type="GtkWidget*"/>
 				<parameter name="detail" type="gchar*"/>
 				<parameter name="x" type="gint"/>
@@ -660,10 +666,9 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="style" type="GtkStyle*"/>
-				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="state_type" type="GtkStateType"/>
 				<parameter name="shadow_type" type="GtkShadowType"/>
-				<parameter name="area" type="GdkRectangle*"/>
 				<parameter name="widget" type="GtkWidget*"/>
 				<parameter name="detail" type="gchar*"/>
 				<parameter name="x" type="gint"/>
@@ -677,10 +682,9 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="style" type="GtkStyle*"/>
-				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="state_type" type="GtkStateType"/>
 				<parameter name="shadow_type" type="GtkShadowType"/>
-				<parameter name="area" type="GdkRectangle*"/>
 				<parameter name="widget" type="GtkWidget*"/>
 				<parameter name="detail" type="gchar*"/>
 				<parameter name="x" type="gint"/>
@@ -693,9 +697,8 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="style" type="GtkStyle*"/>
-				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="state_type" type="GtkStateType"/>
-				<parameter name="area" type="GdkRectangle*"/>
 				<parameter name="widget" type="GtkWidget*"/>
 				<parameter name="detail" type="gchar*"/>
 				<parameter name="x" type="gint"/>
@@ -708,10 +711,9 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="style" type="GtkStyle*"/>
-				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="state_type" type="GtkStateType"/>
 				<parameter name="shadow_type" type="GtkShadowType"/>
-				<parameter name="area" type="GdkRectangle*"/>
 				<parameter name="widget" type="GtkWidget*"/>
 				<parameter name="detail" type="gchar*"/>
 				<parameter name="x" type="gint"/>
@@ -725,9 +727,8 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="style" type="GtkStyle*"/>
-				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="state_type" type="GtkStateType"/>
-				<parameter name="area" type="GdkRectangle*"/>
 				<parameter name="widget" type="GtkWidget*"/>
 				<parameter name="detail" type="gchar*"/>
 				<parameter name="x1" type="gint"/>
@@ -739,10 +740,9 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="style" type="GtkStyle*"/>
-				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="state_type" type="GtkStateType"/>
 				<parameter name="use_text" type="gboolean"/>
-				<parameter name="area" type="GdkRectangle*"/>
 				<parameter name="widget" type="GtkWidget*"/>
 				<parameter name="detail" type="gchar*"/>
 				<parameter name="x" type="gint"/>
@@ -754,10 +754,9 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="style" type="GtkStyle*"/>
-				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="state_type" type="GtkStateType"/>
 				<parameter name="shadow_type" type="GtkShadowType"/>
-				<parameter name="area" type="GdkRectangle*"/>
 				<parameter name="widget" type="GtkWidget*"/>
 				<parameter name="detail" type="gchar*"/>
 				<parameter name="x" type="gint"/>
@@ -766,28 +765,12 @@
 				<parameter name="height" type="gint"/>
 			</parameters>
 		</function>
-		<function name="paint_polygon" symbol="gtk_paint_polygon">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="style" type="GtkStyle*"/>
-				<parameter name="window" type="GdkWindow*"/>
-				<parameter name="state_type" type="GtkStateType"/>
-				<parameter name="shadow_type" type="GtkShadowType"/>
-				<parameter name="area" type="GdkRectangle*"/>
-				<parameter name="widget" type="GtkWidget*"/>
-				<parameter name="detail" type="gchar*"/>
-				<parameter name="points" type="GdkPoint*"/>
-				<parameter name="n_points" type="gint"/>
-				<parameter name="fill" type="gboolean"/>
-			</parameters>
-		</function>
 		<function name="paint_resize_grip" symbol="gtk_paint_resize_grip">
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="style" type="GtkStyle*"/>
-				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="state_type" type="GtkStateType"/>
-				<parameter name="area" type="GdkRectangle*"/>
 				<parameter name="widget" type="GtkWidget*"/>
 				<parameter name="detail" type="gchar*"/>
 				<parameter name="edge" type="GdkWindowEdge"/>
@@ -801,10 +784,9 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="style" type="GtkStyle*"/>
-				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="state_type" type="GtkStateType"/>
 				<parameter name="shadow_type" type="GtkShadowType"/>
-				<parameter name="area" type="GdkRectangle*"/>
 				<parameter name="widget" type="GtkWidget*"/>
 				<parameter name="detail" type="gchar*"/>
 				<parameter name="x" type="gint"/>
@@ -817,10 +799,9 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="style" type="GtkStyle*"/>
-				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="state_type" type="GtkStateType"/>
 				<parameter name="shadow_type" type="GtkShadowType"/>
-				<parameter name="area" type="GdkRectangle*"/>
 				<parameter name="widget" type="GtkWidget*"/>
 				<parameter name="detail" type="gchar*"/>
 				<parameter name="x" type="gint"/>
@@ -836,10 +817,9 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="style" type="GtkStyle*"/>
-				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="state_type" type="GtkStateType"/>
 				<parameter name="shadow_type" type="GtkShadowType"/>
-				<parameter name="area" type="GdkRectangle*"/>
 				<parameter name="widget" type="GtkWidget*"/>
 				<parameter name="detail" type="gchar*"/>
 				<parameter name="x" type="gint"/>
@@ -853,9 +833,8 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="style" type="GtkStyle*"/>
-				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="state_type" type="GtkStateType"/>
-				<parameter name="area" type="GdkRectangle*"/>
 				<parameter name="widget" type="GtkWidget*"/>
 				<parameter name="detail" type="gchar*"/>
 				<parameter name="step" type="guint"/>
@@ -869,10 +848,9 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="style" type="GtkStyle*"/>
-				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="state_type" type="GtkStateType"/>
 				<parameter name="shadow_type" type="GtkShadowType"/>
-				<parameter name="area" type="GdkRectangle*"/>
 				<parameter name="widget" type="GtkWidget*"/>
 				<parameter name="detail" type="gchar*"/>
 				<parameter name="x" type="gint"/>
@@ -885,9 +863,8 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="style" type="GtkStyle*"/>
-				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="cr" type="cairo_t*"/>
 				<parameter name="state_type" type="GtkStateType"/>
-				<parameter name="area" type="GdkRectangle*"/>
 				<parameter name="widget" type="GtkWidget*"/>
 				<parameter name="detail" type="gchar*"/>
 				<parameter name="y1_" type="gint"/>
@@ -942,7 +919,7 @@
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="main_level" type="guint"/>
-				<parameter name="object" type="GtkObject*"/>
+				<parameter name="object" type="GtkWidget*"/>
 			</parameters>
 		</function>
 		<function name="quit_add_full" symbol="gtk_quit_add_full">
@@ -1151,6 +1128,12 @@
 				<parameter name="widget" type="GtkWidget*"/>
 			</parameters>
 		</function>
+		<function name="set_debug_flags" symbol="gtk_set_debug_flags">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="flags" type="guint"/>
+			</parameters>
+		</function>
 		<function name="set_locale" symbol="gtk_set_locale">
 			<return-type type="gchar*"/>
 		</function>
@@ -1375,14 +1358,6 @@
 		<function name="true" symbol="gtk_true">
 			<return-type type="gboolean"/>
 		</function>
-		<callback name="GtkAboutDialogActivateLinkFunc">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="about" type="GtkAboutDialog*"/>
-				<parameter name="link_" type="gchar*"/>
-				<parameter name="data" type="gpointer"/>
-			</parameters>
-		</callback>
 		<callback name="GtkAccelGroupActivate">
 			<return-type type="gboolean"/>
 			<parameters>
@@ -1449,7 +1424,7 @@
 		<callback name="GtkCallbackMarshal">
 			<return-type type="void"/>
 			<parameters>
-				<parameter name="object" type="GtkObject*"/>
+				<parameter name="object" type="GObject*"/>
 				<parameter name="data" type="gpointer"/>
 				<parameter name="n_args" type="guint"/>
 				<parameter name="args" type="GtkArg*"/>
@@ -1585,14 +1560,6 @@
 				<parameter name="func_data" type="gpointer"/>
 			</parameters>
 		</callback>
-		<callback name="GtkLinkButtonUriFunc">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="button" type="GtkLinkButton*"/>
-				<parameter name="link_" type="gchar*"/>
-				<parameter name="user_data" type="gpointer"/>
-			</parameters>
-		</callback>
 		<callback name="GtkMenuDetachFunc">
 			<return-type type="void"/>
 			<parameters>
@@ -1623,16 +1590,6 @@
 				<parameter name="argv" type="gchar***"/>
 			</parameters>
 		</callback>
-		<callback name="GtkNotebookWindowCreationFunc">
-			<return-type type="GtkNotebook*"/>
-			<parameters>
-				<parameter name="source" type="GtkNotebook*"/>
-				<parameter name="page" type="GtkWidget*"/>
-				<parameter name="x" type="gint"/>
-				<parameter name="y" type="gint"/>
-				<parameter name="data" type="gpointer"/>
-			</parameters>
-		</callback>
 		<callback name="GtkPageSetupDoneFunc">
 			<return-type type="void"/>
 			<parameters>
@@ -1929,7 +1886,7 @@
 					<parameter name="binding_set" type="GtkBindingSet*"/>
 					<parameter name="keyval" type="guint"/>
 					<parameter name="modifiers" type="GdkModifierType"/>
-					<parameter name="object" type="GtkObject*"/>
+					<parameter name="object" type="GObject*"/>
 				</parameters>
 			</method>
 			<method name="add_path" symbol="gtk_binding_set_add_path">
@@ -1974,14 +1931,6 @@
 			<field name="n_args" type="guint"/>
 			<field name="args" type="GtkBindingArg*"/>
 		</struct>
-		<struct name="GtkBoxChild">
-			<field name="widget" type="GtkWidget*"/>
-			<field name="padding" type="guint16"/>
-			<field name="expand" type="guint"/>
-			<field name="fill" type="guint"/>
-			<field name="pack" type="guint"/>
-			<field name="is_secondary" type="guint"/>
-		</struct>
 		<struct name="GtkFileFilterInfo">
 			<field name="contains" type="GtkFileFilterFlags"/>
 			<field name="filename" type="gchar*"/>
@@ -2019,29 +1968,14 @@
 		<struct name="GtkImageIconSetData">
 			<field name="icon_set" type="GtkIconSet*"/>
 		</struct>
-		<struct name="GtkImageImageData">
-			<field name="image" type="GdkImage*"/>
-		</struct>
 		<struct name="GtkImagePixbufData">
 			<field name="pixbuf" type="GdkPixbuf*"/>
 		</struct>
-		<struct name="GtkImagePixmapData">
-			<field name="pixmap" type="GdkPixmap*"/>
-		</struct>
 		<struct name="GtkImageStockData">
 			<field name="stock_id" type="gchar*"/>
 		</struct>
 		<struct name="GtkLabelSelectionInfo">
 		</struct>
-		<struct name="GtkNotebookPage">
-			<method name="num" symbol="gtk_notebook_page_num">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="notebook" type="GtkNotebook*"/>
-					<parameter name="child" type="GtkWidget*"/>
-				</parameters>
-			</method>
-		</struct>
 		<struct name="GtkPageRange">
 			<field name="start" type="gint"/>
 			<field name="end" type="gint"/>
@@ -2054,10 +1988,6 @@
 			<field name="tooltip" type="gchar*"/>
 			<field name="value" type="gint"/>
 		</struct>
-		<struct name="GtkRangeLayout">
-		</struct>
-		<struct name="GtkRangeStepTimer">
-		</struct>
 		<struct name="GtkRcContext">
 		</struct>
 		<struct name="GtkRcProperty">
@@ -2124,6 +2054,11 @@
 			<field name="groups" type="gchar**"/>
 			<field name="age" type="gint"/>
 		</struct>
+		<struct name="GtkRequestedSize">
+			<field name="data" type="gpointer"/>
+			<field name="minimum_size" type="gint"/>
+			<field name="natural_size" type="gint"/>
+		</struct>
 		<struct name="GtkRulerMetric">
 			<field name="metric_name" type="gchar*"/>
 			<field name="abbrev" type="gchar*"/>
@@ -2194,8 +2129,6 @@
 		<struct name="GtkTextAppearance">
 			<field name="bg_color" type="GdkColor"/>
 			<field name="fg_color" type="GdkColor"/>
-			<field name="bg_stipple" type="GdkBitmap*"/>
-			<field name="fg_stipple" type="GdkBitmap*"/>
 			<field name="rise" type="gint"/>
 			<field name="padding1" type="gpointer"/>
 			<field name="underline" type="guint"/>
@@ -2210,12 +2143,6 @@
 		</struct>
 		<struct name="GtkTextBTree">
 		</struct>
-		<struct name="GtkTextLogAttrCache">
-		</struct>
-		<struct name="GtkTextPendingScroll">
-		</struct>
-		<struct name="GtkTextWindow">
-		</struct>
 		<struct name="GtkThemeEngine">
 		</struct>
 		<struct name="GtkToggleActionEntry">
@@ -2228,20 +2155,27 @@
 			<field name="is_active" type="gboolean"/>
 		</struct>
 		<struct name="GtkWidgetAuxInfo">
-			<field name="x" type="gint"/>
-			<field name="y" type="gint"/>
 			<field name="width" type="gint"/>
 			<field name="height" type="gint"/>
-			<field name="x_set" type="guint"/>
-			<field name="y_set" type="guint"/>
-		</struct>
-		<struct name="GtkWidgetShapeInfo">
-			<field name="offset_x" type="gint16"/>
-			<field name="offset_y" type="gint16"/>
-			<field name="shape_mask" type="GdkBitmap*"/>
+			<field name="halign" type="guint"/>
+			<field name="valign" type="guint"/>
+			<field name="margin" type="GtkBorder"/>
 		</struct>
 		<struct name="GtkWindowGeometryInfo">
 		</struct>
+		<struct name="SizeRequest">
+			<field name="for_size" type="gint"/>
+			<field name="minimum_size" type="gint"/>
+			<field name="natural_size" type="gint"/>
+		</struct>
+		<struct name="SizeRequestCache">
+			<field name="widths" type="SizeRequest[]"/>
+			<field name="heights" type="SizeRequest[]"/>
+			<field name="cached_widths" type="guint"/>
+			<field name="cached_heights" type="guint"/>
+			<field name="last_cached_width" type="guint"/>
+			<field name="last_cached_height" type="guint"/>
+		</struct>
 		<boxed name="GtkBorder" type-name="GtkBorder" get-type="gtk_border_get_type">
 			<method name="copy" symbol="gtk_border_copy">
 				<return-type type="GtkBorder*"/>
@@ -2258,10 +2192,10 @@
 			<constructor name="new" symbol="gtk_border_new">
 				<return-type type="GtkBorder*"/>
 			</constructor>
-			<field name="left" type="gint"/>
-			<field name="right" type="gint"/>
-			<field name="top" type="gint"/>
-			<field name="bottom" type="gint"/>
+			<field name="left" type="gint16"/>
+			<field name="right" type="gint16"/>
+			<field name="top" type="gint16"/>
+			<field name="bottom" type="gint16"/>
 		</boxed>
 		<boxed name="GtkIconInfo" type-name="GtkIconInfo" get-type="gtk_icon_info_get_type">
 			<method name="copy" symbol="gtk_icon_info_copy">
@@ -2858,6 +2792,9 @@
 					<parameter name="requisition" type="GtkRequisition*"/>
 				</parameters>
 			</method>
+			<constructor name="new" symbol="gtk_requisition_new">
+				<return-type type="GtkRequisition*"/>
+			</constructor>
 			<field name="width" type="gint"/>
 			<field name="height" type="gint"/>
 		</boxed>
@@ -3142,7 +3079,6 @@
 			<field name="invisible" type="guint"/>
 			<field name="bg_full_height" type="guint"/>
 			<field name="editable" type="guint"/>
-			<field name="realized" type="guint"/>
 			<field name="pad1" type="guint"/>
 			<field name="pad2" type="guint"/>
 			<field name="pad3" type="guint"/>
@@ -3965,24 +3901,11 @@
 				</parameters>
 			</method>
 		</boxed>
-		<enum name="GtkAnchorType" type-name="GtkAnchorType" get-type="gtk_anchor_type_get_type">
-			<member name="GTK_ANCHOR_CENTER" value="0"/>
-			<member name="GTK_ANCHOR_NORTH" value="1"/>
-			<member name="GTK_ANCHOR_NORTH_WEST" value="2"/>
-			<member name="GTK_ANCHOR_NORTH_EAST" value="3"/>
-			<member name="GTK_ANCHOR_SOUTH" value="4"/>
-			<member name="GTK_ANCHOR_SOUTH_WEST" value="5"/>
-			<member name="GTK_ANCHOR_SOUTH_EAST" value="6"/>
-			<member name="GTK_ANCHOR_WEST" value="7"/>
-			<member name="GTK_ANCHOR_EAST" value="8"/>
-			<member name="GTK_ANCHOR_N" value="1"/>
-			<member name="GTK_ANCHOR_NW" value="2"/>
-			<member name="GTK_ANCHOR_NE" value="3"/>
-			<member name="GTK_ANCHOR_S" value="4"/>
-			<member name="GTK_ANCHOR_SW" value="5"/>
-			<member name="GTK_ANCHOR_SE" value="6"/>
-			<member name="GTK_ANCHOR_W" value="7"/>
-			<member name="GTK_ANCHOR_E" value="8"/>
+		<enum name="GtkAlign" type-name="GtkAlign" get-type="gtk_align_get_type">
+			<member name="GTK_ALIGN_FILL" value="0"/>
+			<member name="GTK_ALIGN_START" value="1"/>
+			<member name="GTK_ALIGN_END" value="2"/>
+			<member name="GTK_ALIGN_CENTER" value="3"/>
 		</enum>
 		<enum name="GtkArrowPlacement" type-name="GtkArrowPlacement" get-type="gtk_arrow_placement_get_type">
 			<member name="GTK_ARROWS_BOTH" value="0"/>
@@ -4015,7 +3938,6 @@
 			<member name="GTK_BUILDER_ERROR_DUPLICATE_ID" value="8"/>
 		</enum>
 		<enum name="GtkButtonBoxStyle" type-name="GtkButtonBoxStyle" get-type="gtk_button_box_style_get_type">
-			<member name="GTK_BUTTONBOX_DEFAULT_STYLE" value="0"/>
 			<member name="GTK_BUTTONBOX_SPREAD" value="1"/>
 			<member name="GTK_BUTTONBOX_EDGE" value="2"/>
 			<member name="GTK_BUTTONBOX_START" value="3"/>
@@ -4131,14 +4053,12 @@
 		</enum>
 		<enum name="GtkImageType" type-name="GtkImageType" get-type="gtk_image_type_get_type">
 			<member name="GTK_IMAGE_EMPTY" value="0"/>
-			<member name="GTK_IMAGE_PIXMAP" value="1"/>
-			<member name="GTK_IMAGE_IMAGE" value="2"/>
-			<member name="GTK_IMAGE_PIXBUF" value="3"/>
-			<member name="GTK_IMAGE_STOCK" value="4"/>
-			<member name="GTK_IMAGE_ICON_SET" value="5"/>
-			<member name="GTK_IMAGE_ANIMATION" value="6"/>
-			<member name="GTK_IMAGE_ICON_NAME" value="7"/>
-			<member name="GTK_IMAGE_GICON" value="8"/>
+			<member name="GTK_IMAGE_PIXBUF" value="1"/>
+			<member name="GTK_IMAGE_STOCK" value="2"/>
+			<member name="GTK_IMAGE_ICON_SET" value="3"/>
+			<member name="GTK_IMAGE_ANIMATION" value="4"/>
+			<member name="GTK_IMAGE_ICON_NAME" value="5"/>
+			<member name="GTK_IMAGE_GICON" value="6"/>
 		</enum>
 		<enum name="GtkJustification" type-name="GtkJustification" get-type="gtk_justification_get_type">
 			<member name="GTK_JUSTIFY_LEFT" value="0"/>
@@ -4146,6 +4066,17 @@
 			<member name="GTK_JUSTIFY_CENTER" value="2"/>
 			<member name="GTK_JUSTIFY_FILL" value="3"/>
 		</enum>
+		<enum name="GtkLicense" type-name="GtkLicense" get-type="gtk_license_get_type">
+			<member name="GTK_LICENSE_UNKNOWN" value="0"/>
+			<member name="GTK_LICENSE_CUSTOM" value="1"/>
+			<member name="GTK_LICENSE_GPL_2_0" value="2"/>
+			<member name="GTK_LICENSE_GPL_3_0" value="3"/>
+			<member name="GTK_LICENSE_LGPL_2_1" value="4"/>
+			<member name="GTK_LICENSE_LGPL_3_0" value="5"/>
+			<member name="GTK_LICENSE_BSD" value="6"/>
+			<member name="GTK_LICENSE_MIT_X11" value="7"/>
+			<member name="GTK_LICENSE_ARTISTIC" value="8"/>
+		</enum>
 		<enum name="GtkMenuDirectionType" type-name="GtkMenuDirectionType" get-type="gtk_menu_direction_type_get_type">
 			<member name="GTK_MENU_DIR_PARENT" value="0"/>
 			<member name="GTK_MENU_DIR_CHILD" value="1"/>
@@ -4285,12 +4216,6 @@
 			<member name="GTK_PRINT_STATUS_FINISHED" value="7"/>
 			<member name="GTK_PRINT_STATUS_FINISHED_ABORTED" value="8"/>
 		</enum>
-		<enum name="GtkProgressBarOrientation" type-name="GtkProgressBarOrientation" get-type="gtk_progress_bar_orientation_get_type">
-			<member name="GTK_PROGRESS_LEFT_TO_RIGHT" value="0"/>
-			<member name="GTK_PROGRESS_RIGHT_TO_LEFT" value="1"/>
-			<member name="GTK_PROGRESS_BOTTOM_TO_TOP" value="2"/>
-			<member name="GTK_PROGRESS_TOP_TO_BOTTOM" value="3"/>
-		</enum>
 		<enum name="GtkRcTokenType" type-name="GtkRcTokenType" get-type="gtk_rc_token_type_get_type">
 			<member name="GTK_RC_TOKEN_INVALID" value="270"/>
 			<member name="GTK_RC_TOKEN_INCLUDE" value="271"/>
@@ -4406,7 +4331,6 @@
 			<member name="GTK_SELECTION_SINGLE" value="1"/>
 			<member name="GTK_SELECTION_BROWSE" value="2"/>
 			<member name="GTK_SELECTION_MULTIPLE" value="3"/>
-			<member name="GTK_SELECTION_EXTENDED" value="3"/>
 		</enum>
 		<enum name="GtkSensitivityType" type-name="GtkSensitivityType" get-type="gtk_sensitivity_type_get_type">
 			<member name="GTK_SENSITIVITY_AUTO" value="0"/>
@@ -4454,14 +4378,6 @@
 			<member name="GTK_STATE_SELECTED" value="3"/>
 			<member name="GTK_STATE_INSENSITIVE" value="4"/>
 		</enum>
-		<enum name="GtkSubmenuDirection" type-name="GtkSubmenuDirection" get-type="gtk_submenu_direction_get_type">
-			<member name="GTK_DIRECTION_LEFT" value="0"/>
-			<member name="GTK_DIRECTION_RIGHT" value="1"/>
-		</enum>
-		<enum name="GtkSubmenuPlacement" type-name="GtkSubmenuPlacement" get-type="gtk_submenu_placement_get_type">
-			<member name="GTK_TOP_BOTTOM" value="0"/>
-			<member name="GTK_LEFT_RIGHT" value="1"/>
-		</enum>
 		<enum name="GtkTextBufferTargetInfo" type-name="GtkTextBufferTargetInfo" get-type="gtk_text_buffer_target_info_get_type">
 			<member name="GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS" value="-1"/>
 			<member name="GTK_TEXT_BUFFER_TARGET_INFO_RICH_TEXT" value="-2"/>
@@ -4519,11 +4435,6 @@
 			<member name="GTK_UPDATE_DISCONTINUOUS" value="1"/>
 			<member name="GTK_UPDATE_DELAYED" value="2"/>
 		</enum>
-		<enum name="GtkVisibility" type-name="GtkVisibility" get-type="gtk_visibility_get_type">
-			<member name="GTK_VISIBILITY_NONE" value="0"/>
-			<member name="GTK_VISIBILITY_PARTIAL" value="1"/>
-			<member name="GTK_VISIBILITY_FULL" value="2"/>
-		</enum>
 		<enum name="GtkWidgetHelpType" type-name="GtkWidgetHelpType" get-type="gtk_widget_help_type_get_type">
 			<member name="GTK_WIDGET_HELP_TOOLTIP" value="0"/>
 			<member name="GTK_WIDGET_HELP_WHATS_THIS" value="1"/>
@@ -4539,6 +4450,17 @@
 			<member name="GTK_WINDOW_TOPLEVEL" value="0"/>
 			<member name="GTK_WINDOW_POPUP" value="1"/>
 		</enum>
+		<enum name="GtkWrapAllocationMode" type-name="GtkWrapAllocationMode" get-type="gtk_wrap_allocation_mode_get_type">
+			<member name="GTK_WRAP_ALLOCATE_FREE" value="0"/>
+			<member name="GTK_WRAP_ALLOCATE_ALIGNED" value="1"/>
+			<member name="GTK_WRAP_ALLOCATE_HOMOGENEOUS" value="2"/>
+		</enum>
+		<enum name="GtkWrapBoxSpreading" type-name="GtkWrapBoxSpreading" get-type="gtk_wrap_box_spreading_get_type">
+			<member name="GTK_WRAP_BOX_SPREAD_START" value="0"/>
+			<member name="GTK_WRAP_BOX_SPREAD_END" value="1"/>
+			<member name="GTK_WRAP_BOX_SPREAD_EVEN" value="2"/>
+			<member name="GTK_WRAP_BOX_SPREAD_EXPAND" value="3"/>
+		</enum>
 		<enum name="GtkWrapMode" type-name="GtkWrapMode" get-type="gtk_wrap_mode_get_type">
 			<member name="GTK_WRAP_NONE" value="0"/>
 			<member name="GTK_WRAP_CHAR" value="1"/>
@@ -4560,7 +4482,6 @@
 			<member name="GTK_CALENDAR_SHOW_DAY_NAMES" value="2"/>
 			<member name="GTK_CALENDAR_NO_MONTH_CHANGE" value="4"/>
 			<member name="GTK_CALENDAR_SHOW_WEEK_NUMBERS" value="8"/>
-			<member name="GTK_CALENDAR_WEEK_START_MONDAY" value="16"/>
 			<member name="GTK_CALENDAR_SHOW_DETAILS" value="32"/>
 		</flags>
 		<flags name="GtkCellRendererState" type-name="GtkCellRendererState" get-type="gtk_cell_renderer_state_get_type">
@@ -4583,7 +4504,7 @@
 			<member name="GTK_DEBUG_ICONTHEME" value="512"/>
 			<member name="GTK_DEBUG_PRINTING" value="1024"/>
 			<member name="GTK_DEBUG_BUILDER" value="2048"/>
-			<member name="GTK_DEBUG_EXTENDED_LAYOUT" value="4096"/>
+			<member name="GTK_DEBUG_SIZE_REQUEST" value="4096"/>
 		</flags>
 		<flags name="GtkDestDefaults" type-name="GtkDestDefaults" get-type="gtk_dest_defaults_get_type">
 			<member name="GTK_DEST_DEFAULT_MOTION" value="1"/>
@@ -4594,7 +4515,6 @@
 		<flags name="GtkDialogFlags" type-name="GtkDialogFlags" get-type="gtk_dialog_flags_get_type">
 			<member name="GTK_DIALOG_MODAL" value="1"/>
 			<member name="GTK_DIALOG_DESTROY_WITH_PARENT" value="2"/>
-			<member name="GTK_DIALOG_NO_SEPARATOR" value="4"/>
 		</flags>
 		<flags name="GtkFileFilterFlags" type-name="GtkFileFilterFlags" get-type="gtk_file_filter_flags_get_type">
 			<member name="GTK_FILE_FILTER_FILENAME" value="1"/>
@@ -4609,28 +4529,6 @@
 			<member name="GTK_ICON_LOOKUP_GENERIC_FALLBACK" value="8"/>
 			<member name="GTK_ICON_LOOKUP_FORCE_SIZE" value="16"/>
 		</flags>
-		<flags name="GtkObjectFlags" type-name="GtkObjectFlags" get-type="gtk_object_flags_get_type">
-			<member name="GTK_IN_DESTRUCTION" value="1"/>
-			<member name="GTK_RESERVED_1" value="4"/>
-			<member name="GTK_RESERVED_2" value="8"/>
-		</flags>
-		<flags name="GtkPrivateFlags" type-name="GtkPrivateFlags" get-type="gtk_private_flags_get_type">
-			<member name="PRIVATE_GTK_USER_STYLE" value="1"/>
-			<member name="PRIVATE_GTK_RESIZE_PENDING" value="4"/>
-			<member name="PRIVATE_GTK_HAS_POINTER" value="8"/>
-			<member name="PRIVATE_GTK_SHADOWED" value="16"/>
-			<member name="PRIVATE_GTK_HAS_SHAPE_MASK" value="32"/>
-			<member name="PRIVATE_GTK_IN_REPARENT" value="64"/>
-			<member name="PRIVATE_GTK_DIRECTION_SET" value="128"/>
-			<member name="PRIVATE_GTK_DIRECTION_LTR" value="256"/>
-			<member name="PRIVATE_GTK_ANCHORED" value="512"/>
-			<member name="PRIVATE_GTK_CHILD_VISIBLE" value="1024"/>
-			<member name="PRIVATE_GTK_REDRAW_ON_ALLOC" value="2048"/>
-			<member name="PRIVATE_GTK_ALLOC_NEEDED" value="4096"/>
-			<member name="PRIVATE_GTK_REQUEST_NEEDED" value="8192"/>
-			<member name="PRIVATE_GTK_WIDTH_REQUEST_NEEDED" value="16384"/>
-			<member name="PRIVATE_GTK_HEIGHT_REQUEST_NEEDED" value="32768"/>
-		</flags>
 		<flags name="GtkRcFlags" type-name="GtkRcFlags" get-type="gtk_rc_flags_get_type">
 			<member name="GTK_RC_FG" value="1"/>
 			<member name="GTK_RC_BG" value="2"/>
@@ -4676,32 +4574,14 @@
 			<member name="GTK_UI_MANAGER_ACCELERATOR" value="256"/>
 			<member name="GTK_UI_MANAGER_POPUP_WITH_ACCELS" value="512"/>
 		</flags>
-		<flags name="GtkWidgetFlags" type-name="GtkWidgetFlags" get-type="gtk_widget_flags_get_type">
-			<member name="GTK_TOPLEVEL" value="16"/>
-			<member name="GTK_NO_WINDOW" value="32"/>
-			<member name="GTK_REALIZED" value="64"/>
-			<member name="GTK_MAPPED" value="128"/>
-			<member name="GTK_VISIBLE" value="256"/>
-			<member name="GTK_SENSITIVE" value="512"/>
-			<member name="GTK_PARENT_SENSITIVE" value="1024"/>
-			<member name="GTK_CAN_FOCUS" value="2048"/>
-			<member name="GTK_HAS_FOCUS" value="4096"/>
-			<member name="GTK_CAN_DEFAULT" value="8192"/>
-			<member name="GTK_HAS_DEFAULT" value="16384"/>
-			<member name="GTK_HAS_GRAB" value="32768"/>
-			<member name="GTK_RC_STYLE" value="65536"/>
-			<member name="GTK_COMPOSITE_CHILD" value="131072"/>
-			<member name="GTK_APP_PAINTABLE" value="262144"/>
-			<member name="GTK_RECEIVES_DEFAULT" value="524288"/>
-			<member name="GTK_DOUBLE_BUFFERED" value="1048576"/>
-			<member name="GTK_NO_SHOW_ALL" value="2097152"/>
-			<member name="GTK_MULTIDEVICE" value="4194304"/>
+		<flags name="GtkWrapBoxPacking" type-name="GtkWrapBoxPacking" get-type="gtk_wrap_box_packing_get_type">
+			<member name="GTK_WRAP_BOX_H_EXPAND" value="1"/>
+			<member name="GTK_WRAP_BOX_V_EXPAND" value="2"/>
 		</flags>
 		<object name="GtkAboutDialog" parent="GtkDialog" type-name="GtkAboutDialog" get-type="gtk_about_dialog_get_type">
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_artists" symbol="gtk_about_dialog_get_artists">
 				<return-type type="gchar**"/>
@@ -4739,6 +4619,12 @@
 					<parameter name="about" type="GtkAboutDialog*"/>
 				</parameters>
 			</method>
+			<method name="get_license_type" symbol="gtk_about_dialog_get_license_type">
+				<return-type type="GtkLicense"/>
+				<parameters>
+					<parameter name="about" type="GtkAboutDialog*"/>
+				</parameters>
+			</method>
 			<method name="get_logo" symbol="gtk_about_dialog_get_logo">
 				<return-type type="GdkPixbuf*"/>
 				<parameters>
@@ -4825,19 +4711,18 @@
 					<parameter name="documenters" type="gchar**"/>
 				</parameters>
 			</method>
-			<method name="set_email_hook" symbol="gtk_about_dialog_set_email_hook">
-				<return-type type="GtkAboutDialogActivateLinkFunc"/>
+			<method name="set_license" symbol="gtk_about_dialog_set_license">
+				<return-type type="void"/>
 				<parameters>
-					<parameter name="func" type="GtkAboutDialogActivateLinkFunc"/>
-					<parameter name="data" type="gpointer"/>
-					<parameter name="destroy" type="GDestroyNotify"/>
+					<parameter name="about" type="GtkAboutDialog*"/>
+					<parameter name="license" type="gchar*"/>
 				</parameters>
 			</method>
-			<method name="set_license" symbol="gtk_about_dialog_set_license">
+			<method name="set_license_type" symbol="gtk_about_dialog_set_license_type">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="about" type="GtkAboutDialog*"/>
-					<parameter name="license" type="gchar*"/>
+					<parameter name="license_type" type="GtkLicense"/>
 				</parameters>
 			</method>
 			<method name="set_logo" symbol="gtk_about_dialog_set_logo">
@@ -4868,14 +4753,6 @@
 					<parameter name="translator_credits" type="gchar*"/>
 				</parameters>
 			</method>
-			<method name="set_url_hook" symbol="gtk_about_dialog_set_url_hook">
-				<return-type type="GtkAboutDialogActivateLinkFunc"/>
-				<parameters>
-					<parameter name="func" type="GtkAboutDialogActivateLinkFunc"/>
-					<parameter name="data" type="gpointer"/>
-					<parameter name="destroy" type="GDestroyNotify"/>
-				</parameters>
-			</method>
 			<method name="set_version" symbol="gtk_about_dialog_set_version">
 				<return-type type="void"/>
 				<parameters>
@@ -4910,6 +4787,7 @@
 			<property name="copyright" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="documenters" type="GStrv*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="license" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="license-type" type="GtkLicense" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="logo" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="logo-icon-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="program-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -4918,6 +4796,13 @@
 			<property name="website" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="website-label" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="wrap-license" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<signal name="activate-link" when="LAST">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="dialog" type="GtkAboutDialog*"/>
+					<parameter name="uri" type="char*"/>
+				</parameters>
+			</signal>
 		</object>
 		<object name="GtkAccelGroup" parent="GObject" type-name="GtkAccelGroup" get-type="gtk_accel_group_get_type">
 			<method name="activate" symbol="gtk_accel_group_activate">
@@ -5038,7 +4923,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_accel_widget" symbol="gtk_accel_label_get_accel_widget">
 				<return-type type="GtkWidget*"/>
@@ -5194,6 +5078,13 @@
 					<parameter name="accessible" type="GtkAccessible*"/>
 				</parameters>
 			</method>
+			<method name="set_widget" symbol="gtk_accessible_set_widget">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="accessible" type="GtkAccessible*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<vfunc name="connect_widget_destroyed">
 				<return-type type="void"/>
 				<parameters>
@@ -5732,7 +5623,7 @@
 				</parameters>
 			</vfunc>
 		</object>
-		<object name="GtkAdjustment" parent="GtkObject" type-name="GtkAdjustment" get-type="gtk_adjustment_get_type">
+		<object name="GtkAdjustment" parent="GInitiallyUnowned" type-name="GtkAdjustment" get-type="gtk_adjustment_get_type">
 			<method name="changed" symbol="gtk_adjustment_changed">
 				<return-type type="void"/>
 				<parameters>
@@ -5796,7 +5687,7 @@
 				</parameters>
 			</method>
 			<constructor name="new" symbol="gtk_adjustment_new">
-				<return-type type="GtkObject*"/>
+				<return-type type="GtkAdjustment*"/>
 				<parameters>
 					<parameter name="value" type="gdouble"/>
 					<parameter name="lower" type="gdouble"/>
@@ -5877,7 +5768,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_padding" symbol="gtk_alignment_get_padding">
 				<return-type type="void"/>
@@ -5950,6 +5840,12 @@
 					<parameter name="app" type="GtkApplication*"/>
 				</parameters>
 			</method>
+			<method name="get_windows" symbol="gtk_application_get_windows">
+				<return-type type="GSList*"/>
+				<parameters>
+					<parameter name="app" type="GtkApplication*"/>
+				</parameters>
+			</method>
 			<constructor name="new" symbol="gtk_application_new">
 				<return-type type="GtkApplication*"/>
 				<parameters>
@@ -5980,27 +5876,27 @@
 			<signal name="action" when="FIRST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="application" type="GtkApplication*"/>
+					<parameter name="app" type="GtkApplication*"/>
 					<parameter name="action_name" type="char*"/>
 				</parameters>
 			</signal>
 			<signal name="activated" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="application" type="GtkApplication*"/>
+					<parameter name="app" type="GtkApplication*"/>
 					<parameter name="args" type="GVariant"/>
 				</parameters>
 			</signal>
 			<signal name="quit" when="LAST">
 				<return-type type="gboolean"/>
 				<parameters>
-					<parameter name="application" type="GtkApplication*"/>
+					<parameter name="app" type="GtkApplication*"/>
 				</parameters>
 			</signal>
 			<vfunc name="create_window">
 				<return-type type="GtkWindow*"/>
 				<parameters>
-					<parameter name="application" type="GtkApplication*"/>
+					<parameter name="app" type="GtkApplication*"/>
 				</parameters>
 			</vfunc>
 		</object>
@@ -6008,7 +5904,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<constructor name="new" symbol="gtk_arrow_new">
 				<return-type type="GtkWidget*"/>
@@ -6032,7 +5927,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<constructor name="new" symbol="gtk_aspect_frame_new">
 				<return-type type="GtkWidget*"/>
@@ -6063,7 +5957,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="add_action_widget" symbol="gtk_assistant_add_action_widget">
 				<return-type type="void"/>
@@ -6256,7 +6149,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_child" symbol="gtk_bin_get_child">
 				<return-type type="GtkWidget*"/>
@@ -6269,7 +6161,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="get_homogeneous" symbol="gtk_box_get_homogeneous">
@@ -6483,7 +6374,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="clicked" symbol="gtk_button_clicked">
@@ -6500,6 +6390,12 @@
 					<parameter name="yalign" type="gfloat*"/>
 				</parameters>
 			</method>
+			<method name="get_event_window" symbol="gtk_button_get_event_window">
+				<return-type type="GdkWindow*"/>
+				<parameters>
+					<parameter name="button" type="GtkButton*"/>
+				</parameters>
+			</method>
 			<method name="get_focus_on_click" symbol="gtk_button_get_focus_on_click">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -6670,7 +6566,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="get_child_secondary" symbol="gtk_button_box_get_child_secondary">
@@ -6713,7 +6608,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="clear_marks" symbol="gtk_calendar_clear_marks">
 				<return-type type="void"/>
@@ -6730,6 +6624,13 @@
 					<parameter name="day" type="guint*"/>
 				</parameters>
 			</method>
+			<method name="get_day_is_marked" symbol="gtk_calendar_get_day_is_marked">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="calendar" type="GtkCalendar*"/>
+					<parameter name="day" type="guint"/>
+				</parameters>
+			</method>
 			<method name="get_detail_height_rows" symbol="gtk_calendar_get_detail_height_rows">
 				<return-type type="gint"/>
 				<parameters>
@@ -6863,7 +6764,7 @@
 				</parameters>
 			</signal>
 		</object>
-		<object name="GtkCellRenderer" parent="GtkObject" type-name="GtkCellRenderer" get-type="gtk_cell_renderer_get_type">
+		<object name="GtkCellRenderer" parent="GInitiallyUnowned" type-name="GtkCellRenderer" get-type="gtk_cell_renderer_get_type">
 			<method name="activate" symbol="gtk_cell_renderer_activate">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -6900,22 +6801,63 @@
 					<parameter name="ypad" type="gint*"/>
 				</parameters>
 			</method>
-			<method name="get_sensitive" symbol="gtk_cell_renderer_get_sensitive">
-				<return-type type="gboolean"/>
+			<method name="get_preferred_height" symbol="gtk_cell_renderer_get_preferred_height">
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="cell" type="GtkCellRenderer*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="minimum_size" type="gint*"/>
+					<parameter name="natural_size" type="gint*"/>
 				</parameters>
 			</method>
-			<method name="get_size" symbol="gtk_cell_renderer_get_size">
+			<method name="get_preferred_height_for_width" symbol="gtk_cell_renderer_get_preferred_height_for_width">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="cell" type="GtkCellRenderer*"/>
 					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="cell_area" type="GdkRectangle*"/>
-					<parameter name="x_offset" type="gint*"/>
-					<parameter name="y_offset" type="gint*"/>
-					<parameter name="width" type="gint*"/>
-					<parameter name="height" type="gint*"/>
+					<parameter name="width" type="gint"/>
+					<parameter name="minimum_height" type="gint*"/>
+					<parameter name="natural_height" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="get_preferred_size" symbol="gtk_cell_renderer_get_preferred_size">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="minimum_size" type="GtkRequisition*"/>
+					<parameter name="natural_size" type="GtkRequisition*"/>
+				</parameters>
+			</method>
+			<method name="get_preferred_width" symbol="gtk_cell_renderer_get_preferred_width">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="minimum_size" type="gint*"/>
+					<parameter name="natural_size" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="get_preferred_width_for_height" symbol="gtk_cell_renderer_get_preferred_width_for_height">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="height" type="gint"/>
+					<parameter name="minimum_width" type="gint*"/>
+					<parameter name="natural_width" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="get_request_mode" symbol="gtk_cell_renderer_get_request_mode">
+				<return-type type="GtkSizeRequestMode"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
+				</parameters>
+			</method>
+			<method name="get_sensitive" symbol="gtk_cell_renderer_get_sensitive">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
 				</parameters>
 			</method>
 			<method name="get_visible" symbol="gtk_cell_renderer_get_visible">
@@ -6928,11 +6870,10 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="cell" type="GtkCellRenderer*"/>
-					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="background_area" type="GdkRectangle*"/>
 					<parameter name="cell_area" type="GdkRectangle*"/>
-					<parameter name="expose_area" type="GdkRectangle*"/>
 					<parameter name="flags" type="GtkCellRendererState"/>
 				</parameters>
 			</method>
@@ -7034,6 +6975,50 @@
 					<parameter name="flags" type="GtkCellRendererState"/>
 				</parameters>
 			</vfunc>
+			<vfunc name="get_preferred_height">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="minimum_size" type="gint*"/>
+					<parameter name="natural_size" type="gint*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_preferred_height_for_width">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="width" type="gint"/>
+					<parameter name="minimum_height" type="gint*"/>
+					<parameter name="natural_height" type="gint*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_preferred_width">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="minimum_size" type="gint*"/>
+					<parameter name="natural_size" type="gint*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_preferred_width_for_height">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="height" type="gint"/>
+					<parameter name="minimum_width" type="gint*"/>
+					<parameter name="natural_width" type="gint*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_request_mode">
+				<return-type type="GtkSizeRequestMode"/>
+				<parameters>
+					<parameter name="cell" type="GtkCellRenderer*"/>
+				</parameters>
+			</vfunc>
 			<vfunc name="get_size">
 				<return-type type="void"/>
 				<parameters>
@@ -7050,11 +7035,10 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="cell" type="GtkCellRenderer*"/>
-					<parameter name="window" type="GdkDrawable*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="background_area" type="GdkRectangle*"/>
 					<parameter name="cell_area" type="GdkRectangle*"/>
-					<parameter name="expose_area" type="GdkRectangle*"/>
 					<parameter name="flags" type="GtkCellRendererState"/>
 				</parameters>
 			</vfunc>
@@ -7128,10 +7112,13 @@
 			<property name="stock-size" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
 		</object>
 		<object name="GtkCellRendererProgress" parent="GtkCellRenderer" type-name="GtkCellRendererProgress" get-type="gtk_cell_renderer_progress_get_type">
+			<implements>
+				<interface name="GtkOrientable"/>
+			</implements>
 			<constructor name="new" symbol="gtk_cell_renderer_progress_new">
 				<return-type type="GtkCellRenderer*"/>
 			</constructor>
-			<property name="orientation" type="GtkProgressBarOrientation" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="inverted" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="pulse" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="text-xalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -7185,6 +7172,7 @@
 			<property name="language" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="language-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="markup" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
+			<property name="max-width-chars" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="rise" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="rise-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="scale" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -7278,27 +7266,37 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkCellLayout"/>
 			</implements>
-			<method name="get_displayed_row" symbol="gtk_cell_view_get_displayed_row">
-				<return-type type="GtkTreePath*"/>
+			<method name="get_desired_height_for_width_of_row" symbol="gtk_cell_view_get_desired_height_for_width_of_row">
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="cell_view" type="GtkCellView*"/>
+					<parameter name="path" type="GtkTreePath*"/>
+					<parameter name="avail_size" type="gint"/>
+					<parameter name="minimum_size" type="gint*"/>
+					<parameter name="natural_size" type="gint*"/>
 				</parameters>
 			</method>
-			<method name="get_model" symbol="gtk_cell_view_get_model">
-				<return-type type="GtkTreeModel*"/>
+			<method name="get_desired_width_of_row" symbol="gtk_cell_view_get_desired_width_of_row">
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="cell_view" type="GtkCellView*"/>
+					<parameter name="path" type="GtkTreePath*"/>
+					<parameter name="minimum_size" type="gint*"/>
+					<parameter name="natural_size" type="gint*"/>
 				</parameters>
 			</method>
-			<method name="get_size_of_row" symbol="gtk_cell_view_get_size_of_row">
-				<return-type type="gboolean"/>
+			<method name="get_displayed_row" symbol="gtk_cell_view_get_displayed_row">
+				<return-type type="GtkTreePath*"/>
+				<parameters>
+					<parameter name="cell_view" type="GtkCellView*"/>
+				</parameters>
+			</method>
+			<method name="get_model" symbol="gtk_cell_view_get_model">
+				<return-type type="GtkTreeModel*"/>
 				<parameters>
 					<parameter name="cell_view" type="GtkCellView*"/>
-					<parameter name="path" type="GtkTreePath*"/>
-					<parameter name="requisition" type="GtkRequisition*"/>
 				</parameters>
 			</method>
 			<constructor name="new" symbol="gtk_cell_view_new">
@@ -7352,7 +7350,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_check_button_new">
@@ -7374,7 +7371,7 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="check_button" type="GtkCheckButton*"/>
-					<parameter name="area" type="GdkRectangle*"/>
+					<parameter name="cr" type="cairo_t*"/>
 				</parameters>
 			</vfunc>
 		</object>
@@ -7382,7 +7379,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_active" symbol="gtk_check_menu_item_get_active">
@@ -7458,7 +7454,7 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="check_menu_item" type="GtkCheckMenuItem*"/>
-					<parameter name="area" type="GdkRectangle*"/>
+					<parameter name="cr" type="cairo_t*"/>
 				</parameters>
 			</vfunc>
 		</object>
@@ -7681,7 +7677,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_alpha" symbol="gtk_color_button_get_alpha">
@@ -7761,7 +7756,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="get_current_alpha" symbol="gtk_color_selection_get_current_alpha">
@@ -7889,7 +7883,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_color_selection" symbol="gtk_color_selection_dialog_get_color_selection">
 				<return-type type="GtkWidget*"/>
@@ -7912,7 +7905,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkCellLayout"/>
 				<interface name="GtkCellEditable"/>
 			</implements>
@@ -8181,7 +8173,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkCellLayout"/>
 				<interface name="GtkCellEditable"/>
 			</implements>
@@ -8217,7 +8208,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="add" symbol="gtk_container_add">
 				<return-type type="void"/>
@@ -8305,6 +8295,12 @@
 					<parameter name="property_name" type="gchar*"/>
 				</parameters>
 			</method>
+			<method name="class_handle_border_width" symbol="gtk_container_class_handle_border_width">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="klass" type="GtkContainerClass*"/>
+				</parameters>
+			</method>
 			<method name="class_install_child_property" symbol="gtk_container_class_install_child_property">
 				<return-type type="void"/>
 				<parameters>
@@ -8379,12 +8375,12 @@
 					<parameter name="container" type="GtkContainer*"/>
 				</parameters>
 			</method>
-			<method name="propagate_expose" symbol="gtk_container_propagate_expose">
+			<method name="propagate_draw" symbol="gtk_container_propagate_draw">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="container" type="GtkContainer*"/>
 					<parameter name="child" type="GtkWidget*"/>
-					<parameter name="event" type="GdkEventExpose*"/>
+					<parameter name="cr" type="cairo_t*"/>
 				</parameters>
 			</method>
 			<method name="remove" symbol="gtk_container_remove">
@@ -8532,7 +8528,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="add_action_widget" symbol="gtk_dialog_add_action_widget">
 				<return-type type="void"/>
@@ -8569,12 +8564,6 @@
 					<parameter name="dialog" type="GtkDialog*"/>
 				</parameters>
 			</method>
-			<method name="get_has_separator" symbol="gtk_dialog_get_has_separator">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="dialog" type="GtkDialog*"/>
-				</parameters>
-			</method>
 			<method name="get_response_for_widget" symbol="gtk_dialog_get_response_for_widget">
 				<return-type type="gint"/>
 				<parameters>
@@ -8636,13 +8625,6 @@
 					<parameter name="response_id" type="gint"/>
 				</parameters>
 			</method>
-			<method name="set_has_separator" symbol="gtk_dialog_set_has_separator">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="GtkDialog*"/>
-					<parameter name="setting" type="gboolean"/>
-				</parameters>
-			</method>
 			<method name="set_response_sensitive" symbol="gtk_dialog_set_response_sensitive">
 				<return-type type="void"/>
 				<parameters>
@@ -8651,7 +8633,6 @@
 					<parameter name="setting" type="gboolean"/>
 				</parameters>
 			</method>
-			<property name="has-separator" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<signal name="close" when="LAST">
 				<return-type type="void"/>
 				<parameters>
@@ -8670,7 +8651,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<constructor name="new" symbol="gtk_drawing_area_new">
 				<return-type type="GtkWidget*"/>
@@ -8680,7 +8660,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkEditable"/>
 				<interface name="GtkCellEditable"/>
 			</implements>
@@ -9595,7 +9574,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_above_child" symbol="gtk_event_box_get_above_child">
 				<return-type type="gboolean"/>
@@ -9633,7 +9611,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_expanded" symbol="gtk_expander_get_expanded">
 				<return-type type="gboolean"/>
@@ -9647,6 +9624,12 @@
 					<parameter name="expander" type="GtkExpander*"/>
 				</parameters>
 			</method>
+			<method name="get_label_fill" symbol="gtk_expander_get_label_fill">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="expander" type="GtkExpander*"/>
+				</parameters>
+			</method>
 			<method name="get_label_widget" symbol="gtk_expander_get_label_widget">
 				<return-type type="GtkWidget*"/>
 				<parameters>
@@ -9697,6 +9680,13 @@
 					<parameter name="label" type="gchar*"/>
 				</parameters>
 			</method>
+			<method name="set_label_fill" symbol="gtk_expander_set_label_fill">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="expander" type="GtkExpander*"/>
+					<parameter name="label_fill" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_label_widget" symbol="gtk_expander_set_label_widget">
 				<return-type type="void"/>
 				<parameters>
@@ -9727,6 +9717,7 @@
 			</method>
 			<property name="expanded" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="label" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
+			<property name="label-fill" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="label-widget" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="use-markup" type="gboolean" readable="1" writable="1" construct="1" construct-only="0"/>
@@ -9742,7 +9733,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 				<interface name="GtkFileChooser"/>
 			</implements>
@@ -9813,7 +9803,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkFileChooser"/>
 			</implements>
 			<constructor name="new" symbol="gtk_file_chooser_dialog_new">
@@ -9830,7 +9819,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 				<interface name="GtkFileChooser"/>
 				<interface name="GtkFileChooserEmbed"/>
@@ -9842,7 +9830,7 @@
 				</parameters>
 			</constructor>
 		</object>
-		<object name="GtkFileFilter" parent="GtkObject" type-name="GtkFileFilter" get-type="gtk_file_filter_get_type">
+		<object name="GtkFileFilter" parent="GInitiallyUnowned" type-name="GtkFileFilter" get-type="gtk_file_filter_get_type">
 			<method name="add_custom" symbol="gtk_file_filter_add_custom">
 				<return-type type="void"/>
 				<parameters>
@@ -9907,7 +9895,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="move" symbol="gtk_fixed_move">
 				<return-type type="void"/>
@@ -9935,7 +9922,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_font_name" symbol="gtk_font_button_get_font_name">
@@ -10042,7 +10028,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="get_face" symbol="gtk_font_selection_get_face">
@@ -10122,7 +10107,6 @@
 					<parameter name="text" type="gchar*"/>
 				</parameters>
 			</method>
-			<property name="font" type="GdkFont*" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="font-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="preview-text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 		</object>
@@ -10130,7 +10114,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_cancel_button" symbol="gtk_font_selection_dialog_get_cancel_button">
 				<return-type type="GtkWidget*"/>
@@ -10144,6 +10127,12 @@
 					<parameter name="fsd" type="GtkFontSelectionDialog*"/>
 				</parameters>
 			</method>
+			<method name="get_font_selection" symbol="gtk_font_selection_dialog_get_font_selection">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="fsd" type="GtkFontSelectionDialog*"/>
+				</parameters>
+			</method>
 			<method name="get_ok_button" symbol="gtk_font_selection_dialog_get_ok_button">
 				<return-type type="GtkWidget*"/>
 				<parameters>
@@ -10181,7 +10170,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_label" symbol="gtk_frame_get_label">
 				<return-type type="gchar*"/>
@@ -10248,7 +10236,6 @@
 			<property name="label-widget" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="label-xalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="label-yalign" type="gfloat" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="shadow" type="GtkShadowType" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="shadow-type" type="GtkShadowType" readable="1" writable="1" construct="0" construct-only="0"/>
 			<vfunc name="compute_child_allocation">
 				<return-type type="void"/>
@@ -10262,7 +10249,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_hbox_new">
@@ -10277,7 +10263,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_hbutton_box_new">
@@ -10288,7 +10273,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_hpaned_new">
@@ -10299,7 +10283,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_hruler_new">
@@ -10310,7 +10293,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_color" symbol="gtk_hsv_get_color">
 				<return-type type="void"/>
@@ -10384,7 +10366,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_hscale_new">
@@ -10406,7 +10387,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_hscrollbar_new">
@@ -10420,7 +10400,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_hseparator_new">
@@ -10431,7 +10410,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_child_detached" symbol="gtk_handle_box_get_child_detached">
 				<return-type type="gboolean"/>
@@ -10483,7 +10461,6 @@
 			</method>
 			<property name="child-detached" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="handle-position" type="GtkPositionType" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="shadow" type="GtkShadowType" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="shadow-type" type="GtkShadowType" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="snap-edge" type="GtkPositionType" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="snap-edge-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -10930,7 +10907,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkCellLayout"/>
 			</implements>
 			<method name="convert_widget_to_bin_window_coords" symbol="gtk_icon_view_convert_widget_to_bin_window_coords">
@@ -10944,7 +10920,7 @@
 				</parameters>
 			</method>
 			<method name="create_drag_icon" symbol="gtk_icon_view_create_drag_icon">
-				<return-type type="GdkPixmap*"/>
+				<return-type type="cairo_surface_t*"/>
 				<parameters>
 					<parameter name="icon_view" type="GtkIconView*"/>
 					<parameter name="path" type="GtkTreePath*"/>
@@ -11024,6 +11000,12 @@
 					<parameter name="path" type="GtkTreePath*"/>
 				</parameters>
 			</method>
+			<method name="get_item_orientation" symbol="gtk_icon_view_get_item_orientation">
+				<return-type type="GtkOrientation"/>
+				<parameters>
+					<parameter name="icon_view" type="GtkIconView*"/>
+				</parameters>
+			</method>
 			<method name="get_item_padding" symbol="gtk_icon_view_get_item_padding">
 				<return-type type="gint"/>
 				<parameters>
@@ -11061,12 +11043,6 @@
 					<parameter name="icon_view" type="GtkIconView*"/>
 				</parameters>
 			</method>
-			<method name="get_orientation" symbol="gtk_icon_view_get_orientation">
-				<return-type type="GtkOrientation"/>
-				<parameters>
-					<parameter name="icon_view" type="GtkIconView*"/>
-				</parameters>
-			</method>
 			<method name="get_path_at_pos" symbol="gtk_icon_view_get_path_at_pos">
 				<return-type type="GtkTreePath*"/>
 				<parameters>
@@ -11228,6 +11204,13 @@
 					<parameter name="pos" type="GtkIconViewDropPosition"/>
 				</parameters>
 			</method>
+			<method name="set_item_orientation" symbol="gtk_icon_view_set_item_orientation">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="icon_view" type="GtkIconView*"/>
+					<parameter name="orientation" type="GtkOrientation"/>
+				</parameters>
+			</method>
 			<method name="set_item_padding" symbol="gtk_icon_view_set_item_padding">
 				<return-type type="void"/>
 				<parameters>
@@ -11263,13 +11246,6 @@
 					<parameter name="model" type="GtkTreeModel*"/>
 				</parameters>
 			</method>
-			<method name="set_orientation" symbol="gtk_icon_view_set_orientation">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="icon_view" type="GtkIconView*"/>
-					<parameter name="orientation" type="GtkOrientation"/>
-				</parameters>
-			</method>
 			<method name="set_pixbuf_column" symbol="gtk_icon_view_set_pixbuf_column">
 				<return-type type="void"/>
 				<parameters>
@@ -11363,12 +11339,12 @@
 			</method>
 			<property name="column-spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="columns" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="item-orientation" type="GtkOrientation" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="item-padding" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="item-width" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="margin" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="markup-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="model" type="GtkTreeModel*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="orientation" type="GtkOrientation" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="pixbuf-column" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="reorderable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="row-spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -11440,7 +11416,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="clear" symbol="gtk_image_clear">
 				<return-type type="void"/>
@@ -11478,14 +11453,6 @@
 					<parameter name="size" type="GtkIconSize*"/>
 				</parameters>
 			</method>
-			<method name="get_image" symbol="gtk_image_get_image">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="image" type="GtkImage*"/>
-					<parameter name="gdk_image" type="GdkImage**"/>
-					<parameter name="mask" type="GdkBitmap**"/>
-				</parameters>
-			</method>
 			<method name="get_pixbuf" symbol="gtk_image_get_pixbuf">
 				<return-type type="GdkPixbuf*"/>
 				<parameters>
@@ -11498,14 +11465,6 @@
 					<parameter name="image" type="GtkImage*"/>
 				</parameters>
 			</method>
-			<method name="get_pixmap" symbol="gtk_image_get_pixmap">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="image" type="GtkImage*"/>
-					<parameter name="pixmap" type="GdkPixmap**"/>
-					<parameter name="mask" type="GdkBitmap**"/>
-				</parameters>
-			</method>
 			<method name="get_stock" symbol="gtk_image_get_stock">
 				<return-type type="void"/>
 				<parameters>
@@ -11556,26 +11515,12 @@
 					<parameter name="size" type="GtkIconSize"/>
 				</parameters>
 			</constructor>
-			<constructor name="new_from_image" symbol="gtk_image_new_from_image">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="image" type="GdkImage*"/>
-					<parameter name="mask" type="GdkBitmap*"/>
-				</parameters>
-			</constructor>
 			<constructor name="new_from_pixbuf" symbol="gtk_image_new_from_pixbuf">
 				<return-type type="GtkWidget*"/>
 				<parameters>
 					<parameter name="pixbuf" type="GdkPixbuf*"/>
 				</parameters>
 			</constructor>
-			<constructor name="new_from_pixmap" symbol="gtk_image_new_from_pixmap">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="pixmap" type="GdkPixmap*"/>
-					<parameter name="mask" type="GdkBitmap*"/>
-				</parameters>
-			</constructor>
 			<constructor name="new_from_stock" symbol="gtk_image_new_from_stock">
 				<return-type type="GtkWidget*"/>
 				<parameters>
@@ -11621,14 +11566,6 @@
 					<parameter name="size" type="GtkIconSize"/>
 				</parameters>
 			</method>
-			<method name="set_from_image" symbol="gtk_image_set_from_image">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="image" type="GtkImage*"/>
-					<parameter name="gdk_image" type="GdkImage*"/>
-					<parameter name="mask" type="GdkBitmap*"/>
-				</parameters>
-			</method>
 			<method name="set_from_pixbuf" symbol="gtk_image_set_from_pixbuf">
 				<return-type type="void"/>
 				<parameters>
@@ -11636,14 +11573,6 @@
 					<parameter name="pixbuf" type="GdkPixbuf*"/>
 				</parameters>
 			</method>
-			<method name="set_from_pixmap" symbol="gtk_image_set_from_pixmap">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="image" type="GtkImage*"/>
-					<parameter name="pixmap" type="GdkPixmap*"/>
-					<parameter name="mask" type="GdkBitmap*"/>
-				</parameters>
-			</method>
 			<method name="set_from_stock" symbol="gtk_image_set_from_stock">
 				<return-type type="void"/>
 				<parameters>
@@ -11664,12 +11593,9 @@
 			<property name="icon-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="icon-set" type="GtkIconSet*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="icon-size" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="image" type="GdkImage*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="mask" type="GdkPixmap*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="pixbuf" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="pixbuf-animation" type="GdkPixbufAnimation*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="pixel-size" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="pixmap" type="GdkPixmap*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="stock" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="storage-type" type="GtkImageType" readable="1" writable="0" construct="0" construct-only="0"/>
 		</object>
@@ -11677,7 +11603,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_always_show_image" symbol="gtk_image_menu_item_get_always_show_image">
@@ -11757,7 +11682,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="add_action_widget" symbol="gtk_info_bar_add_action_widget">
@@ -11858,7 +11782,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_screen" symbol="gtk_invisible_get_screen">
 				<return-type type="GdkScreen*"/>
@@ -11884,54 +11807,10 @@
 			</method>
 			<property name="screen" type="GdkScreen*" readable="1" writable="1" construct="0" construct-only="0"/>
 		</object>
-		<object name="GtkItem" parent="GtkBin" type-name="GtkItem" get-type="gtk_item_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
-			</implements>
-			<method name="deselect" symbol="gtk_item_deselect">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="GtkItem*"/>
-				</parameters>
-			</method>
-			<method name="select" symbol="gtk_item_select">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="GtkItem*"/>
-				</parameters>
-			</method>
-			<method name="toggle" symbol="gtk_item_toggle">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="GtkItem*"/>
-				</parameters>
-			</method>
-			<signal name="deselect" when="FIRST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="GtkItem*"/>
-				</parameters>
-			</signal>
-			<signal name="select" when="FIRST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="GtkItem*"/>
-				</parameters>
-			</signal>
-			<signal name="toggle" when="FIRST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="item" type="GtkItem*"/>
-				</parameters>
-			</signal>
-		</object>
 		<object name="GtkLabel" parent="GtkMisc" type-name="GtkLabel" get-type="gtk_label_get_type">
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_angle" symbol="gtk_label_get_angle">
 				<return-type type="gdouble"/>
@@ -12282,7 +12161,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_bin_window" symbol="gtk_layout_get_bin_window">
 				<return-type type="GdkWindow*"/>
@@ -12374,7 +12252,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_uri" symbol="gtk_link_button_get_uri">
@@ -12409,14 +12286,6 @@
 					<parameter name="uri" type="gchar*"/>
 				</parameters>
 			</method>
-			<method name="set_uri_hook" symbol="gtk_link_button_set_uri_hook">
-				<return-type type="GtkLinkButtonUriFunc"/>
-				<parameters>
-					<parameter name="func" type="GtkLinkButtonUriFunc"/>
-					<parameter name="data" type="gpointer"/>
-					<parameter name="destroy" type="GDestroyNotify"/>
-				</parameters>
-			</method>
 			<method name="set_visited" symbol="gtk_link_button_set_visited">
 				<return-type type="void"/>
 				<parameters>
@@ -12603,7 +12472,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="attach" symbol="gtk_menu_attach">
 				<return-type type="void"/>
@@ -12714,6 +12582,7 @@
 					<parameter name="parent_menu_item" type="GtkWidget*"/>
 					<parameter name="func" type="GtkMenuPositionFunc"/>
 					<parameter name="data" type="gpointer"/>
+					<parameter name="destroy" type="GDestroyNotify"/>
 					<parameter name="button" type="guint"/>
 					<parameter name="activate_time" type="guint32"/>
 				</parameters>
@@ -12808,7 +12677,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_child_pack_direction" symbol="gtk_menu_bar_get_child_pack_direction">
 				<return-type type="GtkPackDirection"/>
@@ -12842,11 +12710,10 @@
 			<property name="child-pack-direction" type="GtkPackDirection" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="pack-direction" type="GtkPackDirection" readable="1" writable="1" construct="0" construct-only="0"/>
 		</object>
-		<object name="GtkMenuItem" parent="GtkItem" type-name="GtkMenuItem" get-type="gtk_menu_item_get_type">
+		<object name="GtkMenuItem" parent="GtkBin" type-name="GtkMenuItem" get-type="gtk_menu_item_get_type">
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="activate" symbol="gtk_menu_item_activate">
@@ -12978,6 +12845,18 @@
 					<parameter name="menu_item" type="GtkMenuItem*"/>
 				</parameters>
 			</signal>
+			<signal name="deselect" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="menu_item" type="GtkMenuItem*"/>
+				</parameters>
+			</signal>
+			<signal name="select" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="menu_item" type="GtkMenuItem*"/>
+				</parameters>
+			</signal>
 			<signal name="toggle-size-allocate" when="FIRST">
 				<return-type type="void"/>
 				<parameters>
@@ -13010,7 +12889,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="activate_item" symbol="gtk_menu_shell_activate_item">
 				<return-type type="void"/>
@@ -13160,7 +13038,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_menu" symbol="gtk_menu_tool_button_get_menu">
@@ -13215,7 +13092,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="format_secondary_markup" symbol="gtk_message_dialog_format_secondary_markup">
 				<return-type type="void"/>
@@ -13237,6 +13113,12 @@
 					<parameter name="dialog" type="GtkMessageDialog*"/>
 				</parameters>
 			</method>
+			<method name="get_message_area" symbol="gtk_message_dialog_get_message_area">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="message_dialog" type="GtkMessageDialog*"/>
+				</parameters>
+			</method>
 			<constructor name="new" symbol="gtk_message_dialog_new">
 				<return-type type="GtkWidget*"/>
 				<parameters>
@@ -13273,6 +13155,7 @@
 			</method>
 			<property name="buttons" type="GtkButtonsType" readable="0" writable="1" construct="0" construct-only="1"/>
 			<property name="image" type="GtkWidget*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="message-area" type="GtkWidget*" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="message-type" type="GtkMessageType" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="secondary-text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="secondary-use-markup" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -13283,7 +13166,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_alignment" symbol="gtk_misc_get_alignment">
 				<return-type type="void"/>
@@ -13369,7 +13251,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="append_page" symbol="gtk_notebook_append_page">
 				<return-type type="gint"/>
@@ -13401,8 +13282,8 @@
 					<parameter name="notebook" type="GtkNotebook*"/>
 				</parameters>
 			</method>
-			<method name="get_group" symbol="gtk_notebook_get_group">
-				<return-type type="gpointer"/>
+			<method name="get_group_name" symbol="gtk_notebook_get_group_name">
+				<return-type type="gchar*"/>
 				<parameters>
 					<parameter name="notebook" type="GtkNotebook*"/>
 				</parameters>
@@ -13459,6 +13340,12 @@
 					<parameter name="child" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="get_tab_hborder" symbol="gtk_notebook_get_tab_hborder">
+				<return-type type="guint16"/>
+				<parameters>
+					<parameter name="notebook" type="GtkNotebook*"/>
+				</parameters>
+			</method>
 			<method name="get_tab_label" symbol="gtk_notebook_get_tab_label">
 				<return-type type="GtkWidget*"/>
 				<parameters>
@@ -13486,6 +13373,12 @@
 					<parameter name="child" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="get_tab_vborder" symbol="gtk_notebook_get_tab_vborder">
+				<return-type type="guint16"/>
+				<parameters>
+					<parameter name="notebook" type="GtkNotebook*"/>
+				</parameters>
+			</method>
 			<method name="insert_page" symbol="gtk_notebook_insert_page">
 				<return-type type="gint"/>
 				<parameters>
@@ -13514,6 +13407,13 @@
 					<parameter name="notebook" type="GtkNotebook*"/>
 				</parameters>
 			</method>
+			<method name="page_num" symbol="gtk_notebook_page_num">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="notebook" type="GtkNotebook*"/>
+					<parameter name="child" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="popup_disable" symbol="gtk_notebook_popup_disable">
 				<return-type type="void"/>
 				<parameters>
@@ -13579,11 +13479,11 @@
 					<parameter name="page_num" type="gint"/>
 				</parameters>
 			</method>
-			<method name="set_group" symbol="gtk_notebook_set_group">
+			<method name="set_group_name" symbol="gtk_notebook_set_group_name">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="notebook" type="GtkNotebook*"/>
-					<parameter name="group" type="gpointer"/>
+					<parameter name="group_name" type="gchar*"/>
 				</parameters>
 			</method>
 			<method name="set_menu_label" symbol="gtk_notebook_set_menu_label">
@@ -13662,16 +13562,8 @@
 					<parameter name="reorderable" type="gboolean"/>
 				</parameters>
 			</method>
-			<method name="set_window_creation_hook" symbol="gtk_notebook_set_window_creation_hook">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="func" type="GtkNotebookWindowCreationFunc"/>
-					<parameter name="data" type="gpointer"/>
-					<parameter name="destroy" type="GDestroyNotify"/>
-				</parameters>
-			</method>
 			<property name="enable-popup" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="group" type="gpointer" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="group-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="page" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="scrollable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="show-border" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -13750,7 +13642,7 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="notebook" type="GtkNotebook*"/>
-					<parameter name="page" type="gpointer"/>
+					<parameter name="page" type="GtkWidget*"/>
 					<parameter name="page_num" type="guint"/>
 				</parameters>
 			</signal>
@@ -13765,25 +13657,10 @@
 				</parameters>
 			</vfunc>
 		</object>
-		<object name="GtkObject" parent="GInitiallyUnowned" type-name="GtkObject" get-type="gtk_object_get_type">
-			<method name="destroy" symbol="gtk_object_destroy">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="object" type="GtkObject*"/>
-				</parameters>
-			</method>
-			<signal name="destroy" when="CLEANUP">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="object" type="GtkObject*"/>
-				</parameters>
-			</signal>
-		</object>
 		<object name="GtkOffscreenWindow" parent="GtkWindow" type-name="GtkOffscreenWindow" get-type="gtk_offscreen_window_get_type">
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_pixbuf" symbol="gtk_offscreen_window_get_pixbuf">
 				<return-type type="GdkPixbuf*"/>
@@ -13791,8 +13668,8 @@
 					<parameter name="offscreen" type="GtkOffscreenWindow*"/>
 				</parameters>
 			</method>
-			<method name="get_pixmap" symbol="gtk_offscreen_window_get_pixmap">
-				<return-type type="GdkPixmap*"/>
+			<method name="get_surface" symbol="gtk_offscreen_window_get_surface">
+				<return-type type="cairo_surface_t*"/>
 				<parameters>
 					<parameter name="offscreen" type="GtkOffscreenWindow*"/>
 				</parameters>
@@ -13985,7 +13862,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="add1" symbol="gtk_paned_add1">
@@ -14105,7 +13981,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="construct" symbol="gtk_plug_construct">
 				<return-type type="void"/>
@@ -15054,7 +14929,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
+				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="get_ellipsize" symbol="gtk_progress_bar_get_ellipsize">
 				<return-type type="PangoEllipsizeMode"/>
@@ -15068,8 +14943,8 @@
 					<parameter name="pbar" type="GtkProgressBar*"/>
 				</parameters>
 			</method>
-			<method name="get_orientation" symbol="gtk_progress_bar_get_orientation">
-				<return-type type="GtkProgressBarOrientation"/>
+			<method name="get_inverted" symbol="gtk_progress_bar_get_inverted">
+				<return-type type="gboolean"/>
 				<parameters>
 					<parameter name="pbar" type="GtkProgressBar*"/>
 				</parameters>
@@ -15115,11 +14990,11 @@
 					<parameter name="fraction" type="gdouble"/>
 				</parameters>
 			</method>
-			<method name="set_orientation" symbol="gtk_progress_bar_set_orientation">
+			<method name="set_inverted" symbol="gtk_progress_bar_set_inverted">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="pbar" type="GtkProgressBar*"/>
-					<parameter name="orientation" type="GtkProgressBarOrientation"/>
+					<parameter name="inverted" type="gboolean"/>
 				</parameters>
 			</method>
 			<method name="set_pulse_step" symbol="gtk_progress_bar_set_pulse_step">
@@ -15145,28 +15020,10 @@
 			</method>
 			<property name="ellipsize" type="PangoEllipsizeMode" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="fraction" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="orientation" type="GtkProgressBarOrientation" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="inverted" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="pulse-step" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="show-text" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<vfunc name="act_mode_enter">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="progress" type="GtkProgressBar*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="paint">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="progress" type="GtkProgressBar*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="update">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="progress" type="GtkProgressBar*"/>
-				</parameters>
-			</vfunc>
 		</object>
 		<object name="GtkRadioAction" parent="GtkToggleAction" type-name="GtkRadioAction" get-type="gtk_radio_action_get_type">
 			<implements>
@@ -15230,7 +15087,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_group" symbol="gtk_radio_button_get_group">
@@ -15239,6 +15095,13 @@
 					<parameter name="radio_button" type="GtkRadioButton*"/>
 				</parameters>
 			</method>
+			<method name="join_group" symbol="gtk_radio_button_join_group">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="radio_button" type="GtkRadioButton*"/>
+					<parameter name="group_source" type="GtkRadioButton*"/>
+				</parameters>
+			</method>
 			<constructor name="new" symbol="gtk_radio_button_new">
 				<return-type type="GtkWidget*"/>
 				<parameters>
@@ -15298,7 +15161,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_group" symbol="gtk_radio_menu_item_get_group">
@@ -15366,7 +15228,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_group" symbol="gtk_radio_tool_button_get_group">
@@ -15414,7 +15275,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="get_adjustment" symbol="gtk_range_get_adjustment">
@@ -15551,7 +15411,7 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="range" type="GtkRange*"/>
-					<parameter name="min_size" type="gboolean"/>
+					<parameter name="min_size" type="gint"/>
 				</parameters>
 			</method>
 			<method name="set_range" symbol="gtk_range_set_range">
@@ -15743,7 +15603,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkRecentChooser"/>
 			</implements>
 			<constructor name="new" symbol="gtk_recent_chooser_dialog_new">
@@ -15768,7 +15627,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkRecentChooser"/>
 				<interface name="GtkActivatable"/>
 			</implements>
@@ -15812,7 +15670,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 				<interface name="GtkRecentChooser"/>
 			</implements>
@@ -15826,7 +15683,7 @@
 				</parameters>
 			</constructor>
 		</object>
-		<object name="GtkRecentFilter" parent="GtkObject" type-name="GtkRecentFilter" get-type="gtk_recent_filter_get_type">
+		<object name="GtkRecentFilter" parent="GInitiallyUnowned" type-name="GtkRecentFilter" get-type="gtk_recent_filter_get_type">
 			<method name="add_age" symbol="gtk_recent_filter_add_age">
 				<return-type type="void"/>
 				<parameters>
@@ -15936,12 +15793,6 @@
 					<parameter name="manager" type="GtkRecentManager*"/>
 				</parameters>
 			</method>
-			<method name="get_limit" symbol="gtk_recent_manager_get_limit">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="manager" type="GtkRecentManager*"/>
-				</parameters>
-			</method>
 			<method name="has_item" symbol="gtk_recent_manager_has_item">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -15984,15 +15835,7 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
-			<method name="set_limit" symbol="gtk_recent_manager_set_limit">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="manager" type="GtkRecentManager*"/>
-					<parameter name="limit" type="gint"/>
-				</parameters>
-			</method>
 			<property name="filename" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="limit" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="size" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
 			<signal name="changed" when="FIRST">
 				<return-type type="void"/>
@@ -16005,21 +15848,8 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
-			<method name="draw_pos" symbol="gtk_ruler_draw_pos">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="ruler" type="GtkRuler*"/>
-				</parameters>
-			</method>
-			<method name="draw_ticks" symbol="gtk_ruler_draw_ticks">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="ruler" type="GtkRuler*"/>
-				</parameters>
-			</method>
 			<method name="get_metric" symbol="gtk_ruler_get_metric">
 				<return-type type="GtkMetricType"/>
 				<parameters>
@@ -16068,12 +15898,14 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="ruler" type="GtkRuler*"/>
+					<parameter name="cr" type="cairo_t*"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="draw_ticks">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="ruler" type="GtkRuler*"/>
+					<parameter name="cr" type="cairo_t*"/>
 				</parameters>
 			</vfunc>
 		</object>
@@ -16081,7 +15913,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="add_mark" symbol="gtk_scale_add_mark">
@@ -16197,7 +16028,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 				<interface name="GtkOrientable"/>
 			</implements>
@@ -16290,7 +16120,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_scrollbar_new">
@@ -16305,7 +16134,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="add_with_viewport" symbol="gtk_scrolled_window_add_with_viewport">
 				<return-type type="void"/>
@@ -16434,7 +16262,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_separator_new">
@@ -16448,7 +16275,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_separator_menu_item_new">
@@ -16459,7 +16285,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_draw" symbol="gtk_separator_tool_item_get_draw">
@@ -16658,7 +16483,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="add_id" symbol="gtk_socket_add_id">
 				<return-type type="void"/>
@@ -16699,7 +16523,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkEditable"/>
 				<interface name="GtkCellEditable"/>
 			</implements>
@@ -16912,11 +16735,10 @@
 				</parameters>
 			</signal>
 		</object>
-		<object name="GtkSpinner" parent="GtkDrawingArea" type-name="GtkSpinner" get-type="gtk_spinner_get_type">
+		<object name="GtkSpinner" parent="GtkWidget" type-name="GtkSpinner" get-type="gtk_spinner_get_type">
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<constructor name="new" symbol="gtk_spinner_new">
 				<return-type type="GtkWidget*"/>
@@ -16936,12 +16758,6 @@
 			<property name="active" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 		</object>
 		<object name="GtkStatusIcon" parent="GObject" type-name="GtkStatusIcon" get-type="gtk_status_icon_get_type">
-			<method name="get_blinking" symbol="gtk_status_icon_get_blinking">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="status_icon" type="GtkStatusIcon*"/>
-				</parameters>
-			</method>
 			<method name="get_geometry" symbol="gtk_status_icon_get_geometry">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -17078,13 +16894,6 @@
 					<parameter name="user_data" type="gpointer"/>
 				</parameters>
 			</method>
-			<method name="set_blinking" symbol="gtk_status_icon_set_blinking">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="status_icon" type="GtkStatusIcon*"/>
-					<parameter name="blinking" type="gboolean"/>
-				</parameters>
-			</method>
 			<method name="set_from_file" symbol="gtk_status_icon_set_from_file">
 				<return-type type="void"/>
 				<parameters>
@@ -17169,7 +16978,6 @@
 					<parameter name="visible" type="gboolean"/>
 				</parameters>
 			</method>
-			<property name="blinking" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="embedded" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="file" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
 			<property name="gicon" type="GIcon*" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -17242,7 +17050,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="get_context_id" symbol="gtk_statusbar_get_context_id">
@@ -17327,10 +17134,9 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="style" type="GtkStyle*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="set_bg" type="gboolean"/>
 					<parameter name="state_type" type="GtkStateType"/>
-					<parameter name="area" type="GdkRectangle*"/>
 					<parameter name="x" type="gint"/>
 					<parameter name="y" type="gint"/>
 					<parameter name="width" type="gint"/>
@@ -17449,10 +17255,9 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="state_type" type="GtkStateType"/>
 					<parameter name="shadow_type" type="GtkShadowType"/>
-					<parameter name="area" type="GdkRectangle*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="detail" type="gchar*"/>
 					<parameter name="arrow_type" type="GtkArrowType"/>
@@ -17467,10 +17272,9 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="state_type" type="GtkStateType"/>
 					<parameter name="shadow_type" type="GtkShadowType"/>
-					<parameter name="area" type="GdkRectangle*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="detail" type="gchar*"/>
 					<parameter name="x" type="gint"/>
@@ -17483,10 +17287,9 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="state_type" type="GtkStateType"/>
 					<parameter name="shadow_type" type="GtkShadowType"/>
-					<parameter name="area" type="GdkRectangle*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="detail" type="gchar*"/>
 					<parameter name="x" type="gint"/>
@@ -17502,10 +17305,9 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="state_type" type="GtkStateType"/>
 					<parameter name="shadow_type" type="GtkShadowType"/>
-					<parameter name="area" type="GdkRectangle*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="detail" type="gchar*"/>
 					<parameter name="x" type="gint"/>
@@ -17518,10 +17320,9 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="state_type" type="GtkStateType"/>
 					<parameter name="shadow_type" type="GtkShadowType"/>
-					<parameter name="area" type="GdkRectangle*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="detail" type="gchar*"/>
 					<parameter name="x" type="gint"/>
@@ -17534,9 +17335,8 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="state_type" type="GtkStateType"/>
-					<parameter name="area" type="GdkRectangle*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="detail" type="gchar*"/>
 					<parameter name="x" type="gint"/>
@@ -17548,10 +17348,9 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="state_type" type="GtkStateType"/>
 					<parameter name="shadow_type" type="GtkShadowType"/>
-					<parameter name="area" type="GdkRectangle*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="detail" type="gchar*"/>
 					<parameter name="x" type="gint"/>
@@ -17565,10 +17364,9 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="state_type" type="GtkStateType"/>
 					<parameter name="shadow_type" type="GtkShadowType"/>
-					<parameter name="area" type="GdkRectangle*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="detail" type="gchar*"/>
 					<parameter name="x" type="gint"/>
@@ -17581,9 +17379,8 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="state_type" type="GtkStateType"/>
-					<parameter name="area" type="GdkRectangle*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="detail" type="gchar*"/>
 					<parameter name="x" type="gint"/>
@@ -17596,10 +17393,9 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="state_type" type="GtkStateType"/>
 					<parameter name="shadow_type" type="GtkShadowType"/>
-					<parameter name="area" type="GdkRectangle*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="detail" type="gchar*"/>
 					<parameter name="x" type="gint"/>
@@ -17613,9 +17409,8 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="state_type" type="GtkStateType"/>
-					<parameter name="area" type="GdkRectangle*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="detail" type="gchar*"/>
 					<parameter name="x1" type="gint"/>
@@ -17627,10 +17422,9 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="state_type" type="GtkStateType"/>
 					<parameter name="use_text" type="gboolean"/>
-					<parameter name="area" type="GdkRectangle*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="detail" type="gchar*"/>
 					<parameter name="x" type="gint"/>
@@ -17642,10 +17436,9 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="state_type" type="GtkStateType"/>
 					<parameter name="shadow_type" type="GtkShadowType"/>
-					<parameter name="area" type="GdkRectangle*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="detail" type="gchar*"/>
 					<parameter name="x" type="gint"/>
@@ -17654,28 +17447,12 @@
 					<parameter name="height" type="gint"/>
 				</parameters>
 			</vfunc>
-			<vfunc name="draw_polygon">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="state_type" type="GtkStateType"/>
-					<parameter name="shadow_type" type="GtkShadowType"/>
-					<parameter name="area" type="GdkRectangle*"/>
-					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="detail" type="gchar*"/>
-					<parameter name="point" type="GdkPoint*"/>
-					<parameter name="npoints" type="gint"/>
-					<parameter name="fill" type="gboolean"/>
-				</parameters>
-			</vfunc>
 			<vfunc name="draw_resize_grip">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="state_type" type="GtkStateType"/>
-					<parameter name="area" type="GdkRectangle*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="detail" type="gchar*"/>
 					<parameter name="edge" type="GdkWindowEdge"/>
@@ -17689,10 +17466,9 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="state_type" type="GtkStateType"/>
 					<parameter name="shadow_type" type="GtkShadowType"/>
-					<parameter name="area" type="GdkRectangle*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="detail" type="gchar*"/>
 					<parameter name="x" type="gint"/>
@@ -17705,10 +17481,9 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="state_type" type="GtkStateType"/>
 					<parameter name="shadow_type" type="GtkShadowType"/>
-					<parameter name="area" type="GdkRectangle*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="detail" type="gchar*"/>
 					<parameter name="x" type="gint"/>
@@ -17724,10 +17499,9 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="state_type" type="GtkStateType"/>
 					<parameter name="shadow_type" type="GtkShadowType"/>
-					<parameter name="area" type="GdkRectangle*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="detail" type="gchar*"/>
 					<parameter name="x" type="gint"/>
@@ -17741,9 +17515,8 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="state_type" type="GtkStateType"/>
-					<parameter name="area" type="GdkRectangle*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="detail" type="gchar*"/>
 					<parameter name="step" type="guint"/>
@@ -17757,10 +17530,9 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="state_type" type="GtkStateType"/>
 					<parameter name="shadow_type" type="GtkShadowType"/>
-					<parameter name="area" type="GdkRectangle*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="detail" type="gchar*"/>
 					<parameter name="x" type="gint"/>
@@ -17773,9 +17545,8 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="style" type="GtkStyle*"/>
-					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="cr" type="cairo_t*"/>
 					<parameter name="state_type" type="GtkStateType"/>
-					<parameter name="area" type="GdkRectangle*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 					<parameter name="detail" type="gchar*"/>
 					<parameter name="y1_" type="gint"/>
@@ -17823,20 +17594,9 @@
 			<field name="font_desc" type="PangoFontDescription*"/>
 			<field name="xthickness" type="gint"/>
 			<field name="ythickness" type="gint"/>
-			<field name="fg_gc" type="GdkGC*[]"/>
-			<field name="bg_gc" type="GdkGC*[]"/>
-			<field name="light_gc" type="GdkGC*[]"/>
-			<field name="dark_gc" type="GdkGC*[]"/>
-			<field name="mid_gc" type="GdkGC*[]"/>
-			<field name="text_gc" type="GdkGC*[]"/>
-			<field name="base_gc" type="GdkGC*[]"/>
-			<field name="text_aa_gc" type="GdkGC*[]"/>
-			<field name="black_gc" type="GdkGC*"/>
-			<field name="white_gc" type="GdkGC*"/>
-			<field name="bg_pixmap" type="GdkPixmap*[]"/>
+			<field name="background" type="cairo_pattern_t*[]"/>
 			<field name="attach_count" type="gint"/>
-			<field name="depth" type="gint"/>
-			<field name="colormap" type="GdkColormap*"/>
+			<field name="visual" type="GdkVisual*"/>
 			<field name="rc_style" type="GtkRcStyle*"/>
 			<field name="styles" type="GSList*"/>
 			<field name="property_cache" type="GArray*"/>
@@ -17846,7 +17606,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="attach" symbol="gtk_table_attach">
 				<return-type type="void"/>
@@ -17906,6 +17665,14 @@
 					<parameter name="row" type="guint"/>
 				</parameters>
 			</method>
+			<method name="get_size" symbol="gtk_table_get_size">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="table" type="GtkTable*"/>
+					<parameter name="rows" type="guint*"/>
+					<parameter name="columns" type="guint*"/>
+				</parameters>
+			</method>
 			<constructor name="new" symbol="gtk_table_new">
 				<return-type type="GtkWidget*"/>
 				<parameters>
@@ -17969,7 +17736,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_tearoff_menu_item_new">
@@ -18757,8 +18523,6 @@
 			<property name="background-full-height-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="background-gdk" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="background-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="background-stipple" type="GdkPixmap*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="background-stipple-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="direction" type="GtkTextDirection" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="editable" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="editable-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -18769,8 +18533,6 @@
 			<property name="foreground" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
 			<property name="foreground-gdk" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="foreground-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="foreground-stipple" type="GdkPixmap*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="foreground-stipple-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="indent" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="indent-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="invisible" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -18892,7 +18654,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="add_child_at_anchor" symbol="gtk_text_view_add_child_at_anchor">
 				<return-type type="void"/>
@@ -19396,14 +19157,6 @@
 					<parameter name="p1" type="gint"/>
 				</parameters>
 			</signal>
-			<signal name="page-horizontally" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="text_view" type="GtkTextView*"/>
-					<parameter name="count" type="gint"/>
-					<parameter name="extend_selection" type="gboolean"/>
-				</parameters>
-			</signal>
 			<signal name="paste-clipboard" when="LAST">
 				<return-type type="void"/>
 				<parameters>
@@ -19523,7 +19276,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_active" symbol="gtk_toggle_button_get_active">
@@ -19600,7 +19352,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_active" symbol="gtk_toggle_tool_button_get_active">
@@ -19637,7 +19388,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_icon_name" symbol="gtk_tool_button_get_icon_name">
@@ -19748,7 +19498,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_ellipsize_mode" symbol="gtk_tool_item_get_ellipsize_mode">
@@ -19947,7 +19696,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkToolShell"/>
 			</implements>
 			<method name="get_collapsed" symbol="gtk_tool_item_group_get_collapsed">
@@ -20075,7 +19823,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="add_drag_dest" symbol="gtk_tool_palette_add_drag_dest">
@@ -20101,14 +19848,6 @@
 			<method name="get_drag_target_item" symbol="gtk_tool_palette_get_drag_target_item">
 				<return-type type="GtkTargetEntry*"/>
 			</method>
-			<method name="get_drop_group" symbol="gtk_tool_palette_get_drop_group">
-				<return-type type="GtkToolItemGroup*"/>
-				<parameters>
-					<parameter name="palette" type="GtkToolPalette*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-				</parameters>
-			</method>
 			<method name="get_drop_item" symbol="gtk_tool_palette_get_drop_item">
 				<return-type type="GtkToolItem*"/>
 				<parameters>
@@ -20117,27 +19856,6 @@
 					<parameter name="y" type="gint"/>
 				</parameters>
 			</method>
-			<method name="get_exclusive" symbol="gtk_tool_palette_get_exclusive">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="palette" type="GtkToolPalette*"/>
-					<parameter name="group" type="GtkToolItemGroup*"/>
-				</parameters>
-			</method>
-			<method name="get_expand" symbol="gtk_tool_palette_get_expand">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="palette" type="GtkToolPalette*"/>
-					<parameter name="group" type="GtkToolItemGroup*"/>
-				</parameters>
-			</method>
-			<method name="get_group_position" symbol="gtk_tool_palette_get_group_position">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="palette" type="GtkToolPalette*"/>
-					<parameter name="group" type="GtkToolItemGroup*"/>
-				</parameters>
-			</method>
 			<method name="get_hadjustment" symbol="gtk_tool_palette_get_hadjustment">
 				<return-type type="GtkAdjustment*"/>
 				<parameters>
@@ -20172,30 +19890,6 @@
 					<parameter name="targets" type="GtkToolPaletteDragTargets"/>
 				</parameters>
 			</method>
-			<method name="set_exclusive" symbol="gtk_tool_palette_set_exclusive">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="palette" type="GtkToolPalette*"/>
-					<parameter name="group" type="GtkToolItemGroup*"/>
-					<parameter name="exclusive" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_expand" symbol="gtk_tool_palette_set_expand">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="palette" type="GtkToolPalette*"/>
-					<parameter name="group" type="GtkToolItemGroup*"/>
-					<parameter name="expand" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_group_position" symbol="gtk_tool_palette_set_group_position">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="palette" type="GtkToolPalette*"/>
-					<parameter name="group" type="GtkToolItemGroup*"/>
-					<parameter name="position" type="gint"/>
-				</parameters>
-			</method>
 			<method name="set_icon_size" symbol="gtk_tool_palette_set_icon_size">
 				<return-type type="void"/>
 				<parameters>
@@ -20238,7 +19932,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkToolShell"/>
 				<interface name="GtkOrientable"/>
 			</implements>
@@ -20971,7 +20664,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="append_column" symbol="gtk_tree_view_append_column">
 				<return-type type="gint"/>
@@ -21060,7 +20752,7 @@
 				</parameters>
 			</method>
 			<method name="create_row_drag_icon" symbol="gtk_tree_view_create_row_drag_icon">
-				<return-type type="GdkPixmap*"/>
+				<return-type type="cairo_surface_t*"/>
 				<parameters>
 					<parameter name="tree_view" type="GtkTreeView*"/>
 					<parameter name="path" type="GtkTreePath*"/>
@@ -21829,7 +21521,7 @@
 				</parameters>
 			</signal>
 		</object>
-		<object name="GtkTreeViewColumn" parent="GtkObject" type-name="GtkTreeViewColumn" get-type="gtk_tree_view_column_get_type">
+		<object name="GtkTreeViewColumn" parent="GInitiallyUnowned" type-name="GtkTreeViewColumn" get-type="gtk_tree_view_column_get_type">
 			<implements>
 				<interface name="GtkCellLayout"/>
 				<interface name="GtkBuildable"/>
@@ -22205,7 +21897,7 @@
 			<method name="add_ui" symbol="gtk_ui_manager_add_ui">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="self" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 					<parameter name="merge_id" type="guint"/>
 					<parameter name="path" type="gchar*"/>
 					<parameter name="name" type="gchar*"/>
@@ -22217,7 +21909,7 @@
 			<method name="add_ui_from_file" symbol="gtk_ui_manager_add_ui_from_file">
 				<return-type type="guint"/>
 				<parameters>
-					<parameter name="self" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 					<parameter name="filename" type="gchar*"/>
 					<parameter name="error" type="GError**"/>
 				</parameters>
@@ -22225,7 +21917,7 @@
 			<method name="add_ui_from_string" symbol="gtk_ui_manager_add_ui_from_string">
 				<return-type type="guint"/>
 				<parameters>
-					<parameter name="self" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 					<parameter name="buffer" type="gchar*"/>
 					<parameter name="length" type="gssize"/>
 					<parameter name="error" type="GError**"/>
@@ -22234,58 +21926,58 @@
 			<method name="ensure_update" symbol="gtk_ui_manager_ensure_update">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="self" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 				</parameters>
 			</method>
 			<method name="get_accel_group" symbol="gtk_ui_manager_get_accel_group">
 				<return-type type="GtkAccelGroup*"/>
 				<parameters>
-					<parameter name="self" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 				</parameters>
 			</method>
 			<method name="get_action" symbol="gtk_ui_manager_get_action">
 				<return-type type="GtkAction*"/>
 				<parameters>
-					<parameter name="self" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 					<parameter name="path" type="gchar*"/>
 				</parameters>
 			</method>
 			<method name="get_action_groups" symbol="gtk_ui_manager_get_action_groups">
 				<return-type type="GList*"/>
 				<parameters>
-					<parameter name="self" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 				</parameters>
 			</method>
 			<method name="get_add_tearoffs" symbol="gtk_ui_manager_get_add_tearoffs">
 				<return-type type="gboolean"/>
 				<parameters>
-					<parameter name="self" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 				</parameters>
 			</method>
 			<method name="get_toplevels" symbol="gtk_ui_manager_get_toplevels">
 				<return-type type="GSList*"/>
 				<parameters>
-					<parameter name="self" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 					<parameter name="types" type="GtkUIManagerItemType"/>
 				</parameters>
 			</method>
 			<method name="get_ui" symbol="gtk_ui_manager_get_ui">
 				<return-type type="gchar*"/>
 				<parameters>
-					<parameter name="self" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 				</parameters>
 			</method>
 			<method name="get_widget" symbol="gtk_ui_manager_get_widget">
 				<return-type type="GtkWidget*"/>
 				<parameters>
-					<parameter name="self" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 					<parameter name="path" type="gchar*"/>
 				</parameters>
 			</method>
 			<method name="insert_action_group" symbol="gtk_ui_manager_insert_action_group">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="self" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 					<parameter name="action_group" type="GtkActionGroup*"/>
 					<parameter name="pos" type="gint"/>
 				</parameters>
@@ -22296,27 +21988,27 @@
 			<constructor name="new_merge_id" symbol="gtk_ui_manager_new_merge_id">
 				<return-type type="guint"/>
 				<parameters>
-					<parameter name="self" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 				</parameters>
 			</constructor>
 			<method name="remove_action_group" symbol="gtk_ui_manager_remove_action_group">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="self" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 					<parameter name="action_group" type="GtkActionGroup*"/>
 				</parameters>
 			</method>
 			<method name="remove_ui" symbol="gtk_ui_manager_remove_ui">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="self" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 					<parameter name="merge_id" type="guint"/>
 				</parameters>
 			</method>
 			<method name="set_add_tearoffs" symbol="gtk_ui_manager_set_add_tearoffs">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="self" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 					<parameter name="add_tearoffs" type="gboolean"/>
 				</parameters>
 			</method>
@@ -22325,20 +22017,20 @@
 			<signal name="actions-changed" when="FIRST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="merge" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 				</parameters>
 			</signal>
 			<signal name="add-widget" when="FIRST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="merge" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</signal>
 			<signal name="connect-proxy" when="FIRST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="merge" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 					<parameter name="action" type="GtkAction*"/>
 					<parameter name="proxy" type="GtkWidget*"/>
 				</parameters>
@@ -22346,7 +22038,7 @@
 			<signal name="disconnect-proxy" when="FIRST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="merge" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 					<parameter name="action" type="GtkAction*"/>
 					<parameter name="proxy" type="GtkWidget*"/>
 				</parameters>
@@ -22354,14 +22046,14 @@
 			<signal name="post-activate" when="FIRST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="merge" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 					<parameter name="action" type="GtkAction*"/>
 				</parameters>
 			</signal>
 			<signal name="pre-activate" when="FIRST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="merge" type="GtkUIManager*"/>
+					<parameter name="manager" type="GtkUIManager*"/>
 					<parameter name="action" type="GtkAction*"/>
 				</parameters>
 			</signal>
@@ -22384,7 +22076,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_vbox_new">
@@ -22399,7 +22090,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_vbutton_box_new">
@@ -22410,7 +22100,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_vpaned_new">
@@ -22421,7 +22110,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_vruler_new">
@@ -22432,7 +22120,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_vscale_new">
@@ -22454,7 +22141,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_vscrollbar_new">
@@ -22468,7 +22154,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_vseparator_new">
@@ -22479,7 +22164,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_bin_window" symbol="gtk_viewport_get_bin_window">
 				<return-type type="GdkWindow*"/>
@@ -22555,7 +22239,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 				<interface name="GtkOrientable"/>
 			</implements>
@@ -22563,11 +22246,10 @@
 				<return-type type="GtkWidget*"/>
 			</constructor>
 		</object>
-		<object name="GtkWidget" parent="GtkObject" type-name="GtkWidget" get-type="gtk_widget_get_type">
+		<object name="GtkWidget" parent="GInitiallyUnowned" type-name="GtkWidget" get-type="gtk_widget_get_type">
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="activate" symbol="gtk_widget_activate">
 				<return-type type="gboolean"/>
@@ -22700,6 +22382,13 @@
 					<parameter name="device" type="GdkDevice*"/>
 				</parameters>
 			</method>
+			<method name="draw" symbol="gtk_widget_draw">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="cr" type="cairo_t*"/>
+				</parameters>
+			</method>
 			<method name="ensure_style" symbol="gtk_widget_ensure_style">
 				<return-type type="void"/>
 				<parameters>
@@ -22731,6 +22420,18 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="get_allocated_height" symbol="gtk_widget_get_allocated_height">
+				<return-type type="int"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
+			<method name="get_allocated_width" symbol="gtk_widget_get_allocated_width">
+				<return-type type="int"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="get_allocation" symbol="gtk_widget_get_allocation">
 				<return-type type="void"/>
 				<parameters>
@@ -22763,13 +22464,6 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
-			<method name="get_child_requisition" symbol="gtk_widget_get_child_requisition">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="requisition" type="GtkRequisition*"/>
-				</parameters>
-			</method>
 			<method name="get_child_visible" symbol="gtk_widget_get_child_visible">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -22783,30 +22477,18 @@
 					<parameter name="selection" type="GdkAtom"/>
 				</parameters>
 			</method>
-			<method name="get_colormap" symbol="gtk_widget_get_colormap">
-				<return-type type="GdkColormap*"/>
-				<parameters>
-					<parameter name="widget" type="GtkWidget*"/>
-				</parameters>
-			</method>
 			<method name="get_composite_name" symbol="gtk_widget_get_composite_name">
 				<return-type type="gchar*"/>
 				<parameters>
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
-			<method name="get_default_colormap" symbol="gtk_widget_get_default_colormap">
-				<return-type type="GdkColormap*"/>
-			</method>
 			<method name="get_default_direction" symbol="gtk_widget_get_default_direction">
 				<return-type type="GtkTextDirection"/>
 			</method>
 			<method name="get_default_style" symbol="gtk_widget_get_default_style">
 				<return-type type="GtkStyle*"/>
 			</method>
-			<method name="get_default_visual" symbol="gtk_widget_get_default_visual">
-				<return-type type="GdkVisual*"/>
-			</method>
 			<method name="get_device_events" symbol="gtk_widget_get_device_events">
 				<return-type type="GdkEventMask"/>
 				<parameters>
@@ -22844,6 +22526,12 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="get_halign" symbol="gtk_widget_get_halign">
+				<return-type type="GtkAlign"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="get_has_tooltip" symbol="gtk_widget_get_has_tooltip">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -22862,6 +22550,30 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="get_margin_bottom" symbol="gtk_widget_get_margin_bottom">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
+			<method name="get_margin_left" symbol="gtk_widget_get_margin_left">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
+			<method name="get_margin_right" symbol="gtk_widget_get_margin_right">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
+			<method name="get_margin_top" symbol="gtk_widget_get_margin_top">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="get_modifier_style" symbol="gtk_widget_get_modifier_style">
 				<return-type type="GtkRcStyle*"/>
 				<parameters>
@@ -22906,6 +22618,48 @@
 					<parameter name="y" type="gint*"/>
 				</parameters>
 			</method>
+			<method name="get_preferred_height" symbol="gtk_widget_get_preferred_height">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="minimum_height" type="gint*"/>
+					<parameter name="natural_height" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="get_preferred_height_for_width" symbol="gtk_widget_get_preferred_height_for_width">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="width" type="gint"/>
+					<parameter name="minimum_height" type="gint*"/>
+					<parameter name="natural_height" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="get_preferred_size" symbol="gtk_widget_get_preferred_size">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="minimum_size" type="GtkRequisition*"/>
+					<parameter name="natural_size" type="GtkRequisition*"/>
+				</parameters>
+			</method>
+			<method name="get_preferred_width" symbol="gtk_widget_get_preferred_width">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="minimum_width" type="gint*"/>
+					<parameter name="natural_width" type="gint*"/>
+				</parameters>
+			</method>
+			<method name="get_preferred_width_for_height" symbol="gtk_widget_get_preferred_width_for_height">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="height" type="gint"/>
+					<parameter name="minimum_width" type="gint*"/>
+					<parameter name="natural_width" type="gint*"/>
+				</parameters>
+			</method>
 			<method name="get_realized" symbol="gtk_widget_get_realized">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -22918,6 +22672,12 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="get_request_mode" symbol="gtk_widget_get_request_mode">
+				<return-type type="GtkSizeRequestMode"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="get_requisition" symbol="gtk_widget_get_requisition">
 				<return-type type="void"/>
 				<parameters>
@@ -22957,13 +22717,6 @@
 					<parameter name="height" type="gint*"/>
 				</parameters>
 			</method>
-			<method name="get_snapshot" symbol="gtk_widget_get_snapshot">
-				<return-type type="GdkPixmap*"/>
-				<parameters>
-					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="clip_rect" type="GdkRectangle*"/>
-				</parameters>
-			</method>
 			<method name="get_state" symbol="gtk_widget_get_state">
 				<return-type type="GtkStateType"/>
 				<parameters>
@@ -23006,6 +22759,12 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
+			<method name="get_valign" symbol="gtk_widget_get_valign">
+				<return-type type="GtkAlign"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
 			<method name="get_visible" symbol="gtk_widget_get_visible">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -23084,13 +22843,17 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</method>
-			<method name="input_shape_combine_mask" symbol="gtk_widget_input_shape_combine_mask">
+			<method name="in_destruction" symbol="gtk_widget_in_destruction">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</method>
+			<method name="input_shape_combine_region" symbol="gtk_widget_input_shape_combine_region">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="shape_mask" type="GdkBitmap*"/>
-					<parameter name="offset_x" type="gint"/>
-					<parameter name="offset_y" type="gint"/>
+					<parameter name="region" type="cairo_region_t*"/>
 				</parameters>
 			</method>
 			<method name="intersect" symbol="gtk_widget_intersect">
@@ -23248,18 +23011,9 @@
 					<parameter name="path_reversed" type="gchar**"/>
 				</parameters>
 			</method>
-			<method name="pop_colormap" symbol="gtk_widget_pop_colormap">
-				<return-type type="void"/>
-			</method>
 			<method name="pop_composite_child" symbol="gtk_widget_pop_composite_child">
 				<return-type type="void"/>
 			</method>
-			<method name="push_colormap" symbol="gtk_widget_push_colormap">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="cmap" type="GdkColormap*"/>
-				</parameters>
-			</method>
 			<method name="push_composite_child" symbol="gtk_widget_push_composite_child">
 				<return-type type="void"/>
 			</method>
@@ -23298,10 +23052,10 @@
 				</parameters>
 			</method>
 			<method name="region_intersect" symbol="gtk_widget_region_intersect">
-				<return-type type="GdkRegion*"/>
+				<return-type type="cairo_region_t*"/>
 				<parameters>
 					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="region" type="GdkRegion*"/>
+					<parameter name="region" type="cairo_region_t*"/>
 				</parameters>
 			</method>
 			<method name="remove_accelerator" symbol="gtk_widget_remove_accelerator">
@@ -23405,13 +23159,6 @@
 					<parameter name="is_visible" type="gboolean"/>
 				</parameters>
 			</method>
-			<method name="set_colormap" symbol="gtk_widget_set_colormap">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="colormap" type="GdkColormap*"/>
-				</parameters>
-			</method>
 			<method name="set_composite_name" symbol="gtk_widget_set_composite_name">
 				<return-type type="void"/>
 				<parameters>
@@ -23419,12 +23166,6 @@
 					<parameter name="name" type="gchar*"/>
 				</parameters>
 			</method>
-			<method name="set_default_colormap" symbol="gtk_widget_set_default_colormap">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="colormap" type="GdkColormap*"/>
-				</parameters>
-			</method>
 			<method name="set_default_direction" symbol="gtk_widget_set_default_direction">
 				<return-type type="void"/>
 				<parameters>
@@ -23467,6 +23208,13 @@
 					<parameter name="mode" type="GdkExtensionMode"/>
 				</parameters>
 			</method>
+			<method name="set_halign" symbol="gtk_widget_set_halign">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="align" type="GtkAlign"/>
+				</parameters>
+			</method>
 			<method name="set_has_tooltip" symbol="gtk_widget_set_has_tooltip">
 				<return-type type="void"/>
 				<parameters>
@@ -23488,6 +23236,34 @@
 					<parameter name="mapped" type="gboolean"/>
 				</parameters>
 			</method>
+			<method name="set_margin_bottom" symbol="gtk_widget_set_margin_bottom">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="margin" type="gint"/>
+				</parameters>
+			</method>
+			<method name="set_margin_left" symbol="gtk_widget_set_margin_left">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="margin" type="gint"/>
+				</parameters>
+			</method>
+			<method name="set_margin_right" symbol="gtk_widget_set_margin_right">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="margin" type="gint"/>
+				</parameters>
+			</method>
+			<method name="set_margin_top" symbol="gtk_widget_set_margin_top">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="margin" type="gint"/>
+				</parameters>
+			</method>
 			<method name="set_name" symbol="gtk_widget_set_name">
 				<return-type type="void"/>
 				<parameters>
@@ -23602,6 +23378,13 @@
 					<parameter name="custom_window" type="GtkWindow*"/>
 				</parameters>
 			</method>
+			<method name="set_valign" symbol="gtk_widget_set_valign">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="align" type="GtkAlign"/>
+				</parameters>
+			</method>
 			<method name="set_visible" symbol="gtk_widget_set_visible">
 				<return-type type="void"/>
 				<parameters>
@@ -23609,6 +23392,13 @@
 					<parameter name="visible" type="gboolean"/>
 				</parameters>
 			</method>
+			<method name="set_visual" symbol="gtk_widget_set_visual">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="visual" type="GdkVisual*"/>
+				</parameters>
+			</method>
 			<method name="set_window" symbol="gtk_widget_set_window">
 				<return-type type="void"/>
 				<parameters>
@@ -23616,13 +23406,11 @@
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
-			<method name="shape_combine_mask" symbol="gtk_widget_shape_combine_mask">
+			<method name="shape_combine_region" symbol="gtk_widget_shape_combine_region">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="shape_mask" type="GdkBitmap*"/>
-					<parameter name="offset_x" type="gint"/>
-					<parameter name="offset_y" type="gint"/>
+					<parameter name="region" type="cairo_region_t*"/>
 				</parameters>
 			</method>
 			<method name="show" symbol="gtk_widget_show">
@@ -23650,13 +23438,6 @@
 					<parameter name="allocation" type="GtkAllocation*"/>
 				</parameters>
 			</method>
-			<method name="size_request" symbol="gtk_widget_size_request">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="requisition" type="GtkRequisition*"/>
-				</parameters>
-			</method>
 			<method name="style_attach" symbol="gtk_widget_style_attach">
 				<return-type type="void"/>
 				<parameters>
@@ -23734,11 +23515,17 @@
 			<property name="double-buffered" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="events" type="GdkEventMask" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="extension-events" type="GdkExtensionMode" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="halign" type="GtkAlign" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="has-default" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="has-focus" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="has-tooltip" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="height-request" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="is-focus" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="margin" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="margin-bottom" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="margin-left" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="margin-right" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="margin-top" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="no-show-all" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="parent" type="GtkContainer*" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -23747,6 +23534,7 @@
 			<property name="style" type="GtkStyle*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="tooltip-markup" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="tooltip-text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="valign" type="GtkAlign" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="visible" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="width-request" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="window" type="GdkWindow*" readable="1" writable="0" construct="0" construct-only="0"/>
@@ -23818,6 +23606,12 @@
 					<parameter name="event" type="GdkEvent*"/>
 				</parameters>
 			</signal>
+			<signal name="destroy" when="CLEANUP">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</signal>
 			<signal name="destroy-event" when="LAST">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -23911,6 +23705,13 @@
 					<parameter name="time_" type="guint"/>
 				</parameters>
 			</signal>
+			<signal name="draw" when="LAST">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="cr" type="CairoContext*"/>
+				</parameters>
+			</signal>
 			<signal name="enter-notify-event" when="LAST">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -23932,13 +23733,6 @@
 					<parameter name="p0" type="GdkEvent*"/>
 				</parameters>
 			</signal>
-			<signal name="expose-event" when="LAST">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="widget" type="GtkWidget*"/>
-					<parameter name="event" type="GdkEvent*"/>
-				</parameters>
-			</signal>
 			<signal name="focus" when="LAST">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -24238,6 +24032,23 @@
 					<parameter name="event" type="GdkEvent*"/>
 				</parameters>
 			</signal>
+			<vfunc name="adjust_size_allocation">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="allocation" type="GtkAllocation*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="adjust_size_request">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="orientation" type="GtkOrientation"/>
+					<parameter name="for_size" type="gint"/>
+					<parameter name="minimum_size" type="gint*"/>
+					<parameter name="natural_size" type="gint*"/>
+				</parameters>
+			</vfunc>
 			<vfunc name="dispatch_child_properties_changed">
 				<return-type type="void"/>
 				<parameters>
@@ -24252,6 +24063,46 @@
 					<parameter name="widget" type="GtkWidget*"/>
 				</parameters>
 			</vfunc>
+			<vfunc name="get_preferred_height">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="minimum_height" type="gint*"/>
+					<parameter name="natural_height" type="gint*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_preferred_height_for_width">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="width" type="gint"/>
+					<parameter name="minimum_height" type="gint*"/>
+					<parameter name="natural_height" type="gint*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_preferred_width">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="minimum_width" type="gint*"/>
+					<parameter name="natural_width" type="gint*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_preferred_width_for_height">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="height" type="gint"/>
+					<parameter name="minimum_width" type="gint*"/>
+					<parameter name="natural_width" type="gint*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="get_request_mode">
+				<return-type type="GtkSizeRequestMode"/>
+				<parameters>
+					<parameter name="widget" type="GtkWidget*"/>
+				</parameters>
+			</vfunc>
 			<vfunc name="hide_all">
 				<return-type type="void"/>
 				<parameters>
@@ -24269,7 +24120,6 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="activate_default" symbol="gtk_window_activate_default">
 				<return-type type="gboolean"/>
@@ -24967,8 +24817,6 @@
 				</parameters>
 			</method>
 			<property name="accept-focus" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="allow-grow" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="allow-shrink" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="decorated" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="default-height" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="default-width" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -25050,6 +24898,12 @@
 					<parameter name="device" type="GdkDevice*"/>
 				</parameters>
 			</method>
+			<method name="get_current_grab" symbol="gtk_window_group_get_current_grab">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="window_group" type="GtkWindowGroup*"/>
+				</parameters>
+			</method>
 			<method name="list_windows" symbol="gtk_window_group_list_windows">
 				<return-type type="GList*"/>
 				<parameters>
@@ -25067,6 +24921,138 @@
 				</parameters>
 			</method>
 		</object>
+		<object name="GtkWrapBox" parent="GtkContainer" type-name="GtkWrapBox" get-type="gtk_wrap_box_get_type">
+			<implements>
+				<interface name="AtkImplementor"/>
+				<interface name="GtkBuildable"/>
+				<interface name="GtkOrientable"/>
+			</implements>
+			<method name="get_allocation_mode" symbol="gtk_wrap_box_get_allocation_mode">
+				<return-type type="GtkWrapAllocationMode"/>
+				<parameters>
+					<parameter name="box" type="GtkWrapBox*"/>
+				</parameters>
+			</method>
+			<method name="get_horizontal_spacing" symbol="gtk_wrap_box_get_horizontal_spacing">
+				<return-type type="guint"/>
+				<parameters>
+					<parameter name="box" type="GtkWrapBox*"/>
+				</parameters>
+			</method>
+			<method name="get_horizontal_spreading" symbol="gtk_wrap_box_get_horizontal_spreading">
+				<return-type type="GtkWrapBoxSpreading"/>
+				<parameters>
+					<parameter name="box" type="GtkWrapBox*"/>
+				</parameters>
+			</method>
+			<method name="get_minimum_line_children" symbol="gtk_wrap_box_get_minimum_line_children">
+				<return-type type="guint"/>
+				<parameters>
+					<parameter name="box" type="GtkWrapBox*"/>
+				</parameters>
+			</method>
+			<method name="get_natural_line_children" symbol="gtk_wrap_box_get_natural_line_children">
+				<return-type type="guint"/>
+				<parameters>
+					<parameter name="box" type="GtkWrapBox*"/>
+				</parameters>
+			</method>
+			<method name="get_vertical_spacing" symbol="gtk_wrap_box_get_vertical_spacing">
+				<return-type type="guint"/>
+				<parameters>
+					<parameter name="box" type="GtkWrapBox*"/>
+				</parameters>
+			</method>
+			<method name="get_vertical_spreading" symbol="gtk_wrap_box_get_vertical_spreading">
+				<return-type type="GtkWrapBoxSpreading"/>
+				<parameters>
+					<parameter name="box" type="GtkWrapBox*"/>
+				</parameters>
+			</method>
+			<method name="insert_child" symbol="gtk_wrap_box_insert_child">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="box" type="GtkWrapBox*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="index" type="gint"/>
+					<parameter name="packing" type="GtkWrapBoxPacking"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="gtk_wrap_box_new">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="mode" type="GtkWrapAllocationMode"/>
+					<parameter name="horizontal_spreading" type="GtkWrapBoxSpreading"/>
+					<parameter name="vertical_spreading" type="GtkWrapBoxSpreading"/>
+					<parameter name="horizontal_spacing" type="guint"/>
+					<parameter name="vertical_spacing" type="guint"/>
+				</parameters>
+			</constructor>
+			<method name="reorder_child" symbol="gtk_wrap_box_reorder_child">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="box" type="GtkWrapBox*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="index" type="guint"/>
+				</parameters>
+			</method>
+			<method name="set_allocation_mode" symbol="gtk_wrap_box_set_allocation_mode">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="box" type="GtkWrapBox*"/>
+					<parameter name="mode" type="GtkWrapAllocationMode"/>
+				</parameters>
+			</method>
+			<method name="set_horizontal_spacing" symbol="gtk_wrap_box_set_horizontal_spacing">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="box" type="GtkWrapBox*"/>
+					<parameter name="spacing" type="guint"/>
+				</parameters>
+			</method>
+			<method name="set_horizontal_spreading" symbol="gtk_wrap_box_set_horizontal_spreading">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="box" type="GtkWrapBox*"/>
+					<parameter name="spreading" type="GtkWrapBoxSpreading"/>
+				</parameters>
+			</method>
+			<method name="set_minimum_line_children" symbol="gtk_wrap_box_set_minimum_line_children">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="box" type="GtkWrapBox*"/>
+					<parameter name="n_children" type="guint"/>
+				</parameters>
+			</method>
+			<method name="set_natural_line_children" symbol="gtk_wrap_box_set_natural_line_children">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="box" type="GtkWrapBox*"/>
+					<parameter name="n_children" type="guint"/>
+				</parameters>
+			</method>
+			<method name="set_vertical_spacing" symbol="gtk_wrap_box_set_vertical_spacing">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="box" type="GtkWrapBox*"/>
+					<parameter name="spacing" type="guint"/>
+				</parameters>
+			</method>
+			<method name="set_vertical_spreading" symbol="gtk_wrap_box_set_vertical_spreading">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="box" type="GtkWrapBox*"/>
+					<parameter name="spreading" type="GtkWrapBoxSpreading"/>
+				</parameters>
+			</method>
+			<property name="allocation-mode" type="GtkWrapAllocationMode" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="horizontal-spacing" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="horizontal-spreading" type="GtkWrapBoxSpreading" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="minimum-line-children" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="natural-line-children" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="vertical-spacing" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="vertical-spreading" type="GtkWrapBoxSpreading" readable="1" writable="1" construct="0" construct-only="0"/>
+		</object>
 		<interface name="GtkActivatable" type-name="GtkActivatable" get-type="gtk_activatable_get_type">
 			<requires>
 				<interface name="GObject"/>
@@ -26467,8 +26453,8 @@
 				<parameters>
 					<parameter name="chooser" type="GtkRecentChooser*"/>
 					<parameter name="sort_func" type="GtkRecentSortFunc"/>
-					<parameter name="data" type="gpointer"/>
-					<parameter name="destroy" type="GDestroyNotify"/>
+					<parameter name="sort_data" type="gpointer"/>
+					<parameter name="data_destroy" type="GDestroyNotify"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="unselect_all">
@@ -26485,99 +26471,6 @@
 				</parameters>
 			</vfunc>
 		</interface>
-		<interface name="GtkSizeRequest" type-name="GtkSizeRequest" get-type="gtk_size_request_get_type">
-			<requires>
-				<interface name="GtkObject"/>
-			</requires>
-			<method name="get_height" symbol="gtk_size_request_get_height">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="GtkSizeRequest*"/>
-					<parameter name="minimum_height" type="gint*"/>
-					<parameter name="natural_height" type="gint*"/>
-				</parameters>
-			</method>
-			<method name="get_height_for_width" symbol="gtk_size_request_get_height_for_width">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="GtkSizeRequest*"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="minimum_height" type="gint*"/>
-					<parameter name="natural_height" type="gint*"/>
-				</parameters>
-			</method>
-			<method name="get_request_mode" symbol="gtk_size_request_get_request_mode">
-				<return-type type="GtkSizeRequestMode"/>
-				<parameters>
-					<parameter name="layout" type="GtkSizeRequest*"/>
-				</parameters>
-			</method>
-			<method name="get_size" symbol="gtk_size_request_get_size">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="GtkSizeRequest*"/>
-					<parameter name="minimum_size" type="GtkRequisition*"/>
-					<parameter name="natural_size" type="GtkRequisition*"/>
-				</parameters>
-			</method>
-			<method name="get_width" symbol="gtk_size_request_get_width">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="GtkSizeRequest*"/>
-					<parameter name="minimum_width" type="gint*"/>
-					<parameter name="natural_width" type="gint*"/>
-				</parameters>
-			</method>
-			<method name="get_width_for_height" symbol="gtk_size_request_get_width_for_height">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="GtkSizeRequest*"/>
-					<parameter name="height" type="gint"/>
-					<parameter name="minimum_width" type="gint*"/>
-					<parameter name="natural_width" type="gint*"/>
-				</parameters>
-			</method>
-			<vfunc name="get_height">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="GtkSizeRequest*"/>
-					<parameter name="minimum_height" type="gint*"/>
-					<parameter name="natural_height" type="gint*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_height_for_width">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="GtkSizeRequest*"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="minimum_height" type="gint*"/>
-					<parameter name="natural_height" type="gint*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_request_mode">
-				<return-type type="GtkSizeRequestMode"/>
-				<parameters>
-					<parameter name="layout" type="GtkSizeRequest*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_width">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="GtkSizeRequest*"/>
-					<parameter name="minimum_width" type="gint*"/>
-					<parameter name="natural_width" type="gint*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_width_for_height">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="GtkSizeRequest*"/>
-					<parameter name="height" type="gint"/>
-					<parameter name="minimum_width" type="gint*"/>
-					<parameter name="natural_width" type="gint*"/>
-				</parameters>
-			</vfunc>
-		</interface>
 		<interface name="GtkToolShell" type-name="GtkToolShell" get-type="gtk_tool_shell_get_type">
 			<requires>
 				<interface name="GtkWidget"/>
@@ -27183,8 +27076,8 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="sortable" type="GtkTreeSortable*"/>
-					<parameter name="func" type="GtkTreeIterCompareFunc"/>
-					<parameter name="data" type="gpointer"/>
+					<parameter name="sort_func" type="GtkTreeIterCompareFunc"/>
+					<parameter name="user_data" type="gpointer"/>
 					<parameter name="destroy" type="GDestroyNotify"/>
 				</parameters>
 			</vfunc>
@@ -27201,20 +27094,19 @@
 				<parameters>
 					<parameter name="sortable" type="GtkTreeSortable*"/>
 					<parameter name="sort_column_id" type="gint"/>
-					<parameter name="func" type="GtkTreeIterCompareFunc"/>
-					<parameter name="data" type="gpointer"/>
+					<parameter name="sort_func" type="GtkTreeIterCompareFunc"/>
+					<parameter name="user_data" type="gpointer"/>
 					<parameter name="destroy" type="GDestroyNotify"/>
 				</parameters>
 			</vfunc>
 		</interface>
-		<constant name="GTK_BINARY_AGE" type="int" value="9004"/>
-		<constant name="GTK_BUTTONBOX_DEFAULT" type="int" value="-1"/>
+		<constant name="GTK_BINARY_AGE" type="int" value="9100"/>
 		<constant name="GTK_INPUT_ERROR" type="int" value="-1"/>
 		<constant name="GTK_INTERFACE_AGE" type="int" value="0"/>
 		<constant name="GTK_MAJOR_VERSION" type="int" value="2"/>
 		<constant name="GTK_MAX_COMPOSE_LEN" type="int" value="7"/>
-		<constant name="GTK_MICRO_VERSION" type="int" value="4"/>
-		<constant name="GTK_MINOR_VERSION" type="int" value="90"/>
+		<constant name="GTK_MICRO_VERSION" type="int" value="0"/>
+		<constant name="GTK_MINOR_VERSION" type="int" value="91"/>
 		<constant name="GTK_PAPER_NAME_A3" type="char*" value="iso_a3"/>
 		<constant name="GTK_PAPER_NAME_A4" type="char*" value="iso_a4"/>
 		<constant name="GTK_PAPER_NAME_A5" type="char*" value="iso_a5"/>
@@ -27257,6 +27149,7 @@
 		<constant name="GTK_PRINT_SETTINGS_WIN32_DRIVER_EXTRA" type="char*" value="win32-driver-extra"/>
 		<constant name="GTK_PRINT_SETTINGS_WIN32_DRIVER_VERSION" type="char*" value="win32-driver-version"/>
 		<constant name="GTK_PRIORITY_RESIZE" type="int" value="10"/>
+		<constant name="GTK_SIZE_REQUEST_CACHED_SIZES" type="int" value="3"/>
 		<constant name="GTK_STOCK_ABOUT" type="char*" value="gtk-about"/>
 		<constant name="GTK_STOCK_ADD" type="char*" value="gtk-add"/>
 		<constant name="GTK_STOCK_APPLY" type="char*" value="gtk-apply"/>
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index 1173ae6..c641303 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -317,7 +317,6 @@ gtk_message_dialog_format_secondary_text ellipsis="1"
 gtk_mount_operation_is_showing hidden="1"
 gtk_mount_operation_new.parent nullable="1"
 GtkNotebook.focus_tab hidden="1"
-GtkNotebook::switch_page.page type_name="NotebookPage"
 gtk_notebook_append_page.tab_label nullable="1"
 gtk_notebook_append_page_menu.tab_label nullable="1"
 gtk_notebook_append_page_menu.menu_label nullable="1"
@@ -815,6 +814,8 @@ gtk_widget_translate_coordinates.dest_y is_out="1"
 GtkWidget.window weak="0"
 GtkWidget:window hidden="1"
 GtkWidget::child_notify has_emitter="1"
+GtkWidget::draw has_emitter="1"
+GtkWidget::draw.cr namespace_name="Cairo" type_name="Context"
 GtkWidget::grab_focus has_emitter="1"
 GtkWidget::hide has_emitter="1"
 GtkWidget::key_press_event.event namespace_name="Gdk" type_name="EventKey"



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