[vala] gtk+-3.0: Update to 2.90.3



commit ebe10e04d587cacb770a6d86423bc7f2c5856147
Author: Jürg Billeter <j bitron ch>
Date:   Fri Jun 18 07:47:38 2010 +0200

    gtk+-3.0: Update to 2.90.3

 vapi/gdk-3.0.vapi                              |   23 +-
 vapi/gtk+-3.0.vapi                             |  247 +++++++------
 vapi/packages/gdk-3.0/gdk-3.0.gi               |   98 +-----
 vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.gi |    4 +-
 vapi/packages/gtk+-3.0/gtk+-3.0.gi             |  472 ++++++++++++-----------
 vapi/packages/gtk+-3.0/gtk+-3.0.metadata       |    1 +
 6 files changed, 392 insertions(+), 453 deletions(-)
---
diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi
index 9ec9b9a..4f16b3d 100644
--- a/vapi/gdk-3.0.vapi
+++ b/vapi/gdk-3.0.vapi
@@ -70,31 +70,21 @@ namespace Gdk {
 		public Gdk.DeviceType get_device_type ();
 		public unowned Gdk.Display get_display ();
 		public bool get_has_cursor ();
-		public virtual bool get_history (Gdk.Window window, uint32 start, uint32 stop, Gdk.TimeCoord[] events);
+		public bool get_history (Gdk.Window window, uint32 start, uint32 stop, Gdk.TimeCoord[] events);
 		public bool get_key (uint index_, uint keyval, Gdk.ModifierType modifiers);
 		public Gdk.InputMode get_mode ();
 		public uint get_n_axes ();
 		public unowned string get_name ();
 		public Gdk.InputSource get_source ();
-		public virtual void get_state (Gdk.Window window, double axes, Gdk.ModifierType mask);
-		public virtual Gdk.GrabStatus grab (Gdk.Window window, Gdk.GrabOwnership grab_ownership, bool owner_events, Gdk.EventMask event_mask, Gdk.Cursor cursor, uint32 time_);
+		public void get_state (Gdk.Window window, double axes, Gdk.ModifierType mask);
+		public Gdk.GrabStatus grab (Gdk.Window window, Gdk.GrabOwnership grab_ownership, bool owner_events, Gdk.EventMask event_mask, Gdk.Cursor cursor, uint32 time_);
 		public static bool grab_info_libgtk_only (Gdk.Display display, Gdk.Device device, out unowned Gdk.Window grab_window, bool owner_events);
 		public unowned GLib.List list_axes ();
-		[NoWrapper]
-		public virtual bool query_state (Gdk.Window window, out unowned Gdk.Window root_window, out unowned Gdk.Window child_window, int root_x, int root_y, int win_x, int win_y, Gdk.ModifierType mask);
-		[NoWrapper]
-		public virtual void select_window_events (Gdk.Window window, Gdk.EventMask event_mask);
 		public void set_axis_use (uint index_, Gdk.AxisUse use);
 		public void set_key (uint index_, uint keyval, Gdk.ModifierType modifiers);
 		public bool set_mode (Gdk.InputMode mode);
 		public void set_source (Gdk.InputSource source);
-		[NoWrapper]
-		public virtual void set_window_cursor (Gdk.Window window, Gdk.Cursor cursor);
-		public virtual void ungrab (uint32 time_);
-		[NoWrapper]
-		public virtual void warp (Gdk.Screen screen, int x, int y);
-		[NoWrapper]
-		public virtual unowned Gdk.Window window_at_position (int win_x, int win_y, Gdk.ModifierType mask, bool get_toplevel);
+		public void ungrab (uint32 time_);
 		public Gdk.Device associated_device { get; }
 		[NoAccessorMethod]
 		public Gdk.DeviceManager device_manager { owned get; construct; }
@@ -220,6 +210,7 @@ namespace Gdk {
 		public Gdk.DragAction get_actions ();
 		public unowned Gdk.Device get_device ();
 		public Gdk.DragAction get_selected_action ();
+		public unowned Gdk.Window get_source_window ();
 		public Gdk.DragAction get_suggested_action ();
 		public unowned GLib.List list_targets ();
 		public void set_device (Gdk.Device device);
@@ -1945,9 +1936,9 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool spawn_command_line_on_screen (Gdk.Screen screen, string command_line) throws GLib.Error;
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static bool spawn_on_screen (Gdk.Screen screen, string? working_directory, [CCode (array_length = false)] string[] argv, [CCode (array_length = false)] string[]? envp, GLib.SpawnFlags flags, GLib.SpawnChildSetupFunc? child_setup, out int child_pid) throws GLib.Error;
+	public static bool spawn_on_screen (Gdk.Screen screen, string? working_directory, [CCode (array_length = false)] string[] argv, [CCode (array_length = false)] string[]? envp, GLib.SpawnFlags flags, GLib.SpawnChildSetupFunc? child_setup, out GLib.Pid child_pid) throws GLib.Error;
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static bool spawn_on_screen_with_pipes (Gdk.Screen screen, string? working_directory, [CCode (array_length = false)] string[] argv, [CCode (array_length = false)] string[] envp, GLib.SpawnFlags flags, GLib.SpawnChildSetupFunc? child_setup, out int child_pid, out int standard_input, out int standard_output, out int standard_error) throws GLib.Error;
+	public static bool spawn_on_screen_with_pipes (Gdk.Screen screen, string? working_directory, [CCode (array_length = false)] string[] argv, [CCode (array_length = false)] string[] envp, GLib.SpawnFlags flags, GLib.SpawnChildSetupFunc? child_setup, out GLib.Pid child_pid, out int standard_input, out int standard_output, out int standard_error) throws GLib.Error;
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static int string_to_compound_text (string str, Gdk.Atom encoding, int format, uchar[] ctext, int length);
 	[CCode (cheader_filename = "gdk/gdk.h")]
diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 1881381..6600516 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -3,7 +3,7 @@
 [CCode (cprefix = "Gtk", lower_case_cprefix = "gtk_", gir_namespace = "Gtk", gir_version = "2.0")]
 namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class AboutDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout {
+	public class AboutDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public AboutDialog ();
 		public unowned string get_artists ();
@@ -83,7 +83,7 @@ namespace Gtk {
 		public Gtk.AccelKey key;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class AccelLabel : Gtk.Label, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout {
+	public class AccelLabel : Gtk.Label, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public AccelLabel (string str);
 		public unowned Gtk.Widget get_accel_widget ();
@@ -252,7 +252,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.ExtendedLayout {
+	public class Alignment : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		[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);
@@ -276,15 +276,18 @@ namespace Gtk {
 		public float yscale { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Application : GLib.Application {
+	public class Application : GLib.Application, GLib.Initable {
 		[CCode (has_construct_function = false)]
-		public Application ([CCode (array_length_pos = 0.9)] ref unowned string[] argv, string appid);
+		public Application (string appid, [CCode (array_length_pos = 0.9)] ref unowned string[] argv);
 		public void add_window (Gtk.Window window);
+		public virtual unowned Gtk.Window create_window ();
 		public unowned Gtk.Window get_window ();
-		public void quit ();
 		public void run ();
 		public void set_action_group (Gtk.ActionGroup group);
+		public virtual signal void action (string action_name);
 		public virtual signal void activated (GLib.Variant args);
+		[HasEmitter]
+		public virtual signal bool quit ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -293,7 +296,7 @@ namespace Gtk {
 		public GLib.Type type;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Arrow : Gtk.Misc, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout {
+	public class Arrow : Gtk.Misc, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		[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);
@@ -303,7 +306,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.ExtendedLayout {
+	public class AspectFrame : Gtk.Frame, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public Gtk.Allocation center_allocation;
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public AspectFrame (string label, float xalign, float yalign, float ratio, bool obey_child);
@@ -318,7 +321,7 @@ namespace Gtk {
 		public float yalign { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Assistant : Gtk.Window, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout {
+	public class Assistant : Gtk.Window, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public weak Gtk.Widget back;
 		public weak Gtk.Widget forward;
 		public weak Gtk.Widget last;
@@ -352,7 +355,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.ExtendedLayout {
+	public class Bin : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public weak Gtk.Widget child;
 		public unowned Gtk.Widget get_child ();
 	}
@@ -402,7 +405,7 @@ namespace Gtk {
 		public weak string signal_name;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Box : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.Orientable {
+	public class Box : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
 		public weak GLib.List<Gtk.Widget> children;
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Box (Gtk.Orientation orientation, bool homogeneous, int spacing);
@@ -449,7 +452,7 @@ namespace Gtk {
 		public string translation_domain { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Button : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.Activatable {
+	public class Button : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
 		public uint activate_timeout;
 		public uint button_down;
 		public uint constructed;
@@ -506,7 +509,7 @@ namespace Gtk {
 		public virtual signal void released ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ButtonBox : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.Orientable {
+	public class ButtonBox : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
 		public int child_ipad_x;
 		public int child_ipad_y;
 		public int child_min_height;
@@ -521,7 +524,7 @@ 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.ExtendedLayout {
+	public class Calendar : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		[CCode (array_length = false)]
 		public weak int[] day_month;
 		public Gtk.CalendarDisplayOptions display_flags;
@@ -548,14 +551,14 @@ namespace Gtk {
 		public int get_detail_height_rows ();
 		public int get_detail_width_chars ();
 		public Gtk.CalendarDisplayOptions get_display_options ();
-		public bool mark_day (uint day);
+		public void mark_day (uint day);
 		public void select_day (uint day);
-		public bool select_month (uint month, uint year);
+		public void select_month (uint month, uint year);
 		public void set_detail_func (owned Gtk.CalendarDetailFunc func);
 		public void set_detail_height_rows (int rows);
 		public void set_detail_width_chars (int chars);
 		public void set_display_options (Gtk.CalendarDisplayOptions flags);
-		public bool unmark_day (uint day);
+		public void unmark_day (uint day);
 		[NoAccessorMethod]
 		public int day { get; set; }
 		public int detail_height_rows { get; set; }
@@ -844,7 +847,7 @@ 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.ExtendedLayout, Gtk.CellLayout {
+	public class CellView : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.CellLayout {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public CellView ();
 		public unowned Gtk.TreePath get_displayed_row ();
@@ -868,7 +871,7 @@ namespace Gtk {
 		public Gtk.TreeModel model { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class CheckButton : Gtk.ToggleButton, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.Activatable {
+	public class CheckButton : Gtk.ToggleButton, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public CheckButton ();
 		[NoWrapper]
@@ -879,7 +882,7 @@ namespace Gtk {
 		public CheckButton.with_mnemonic (string label);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class CheckMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.Activatable {
+	public class CheckMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
 		public uint always_show_toggle;
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public CheckMenuItem ();
@@ -934,7 +937,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.ExtendedLayout, Gtk.Activatable {
+	public class ColorButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ColorButton ();
 		public uint16 get_alpha ();
@@ -954,7 +957,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.ExtendedLayout, Gtk.Orientable {
+	public class ColorSelection : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ColorSelection ();
 		public uint16 get_current_alpha ();
@@ -980,7 +983,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.ExtendedLayout {
+	public class ColorSelectionDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public weak Gtk.Widget colorsel;
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ColorSelectionDialog (string title);
@@ -994,7 +997,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.ExtendedLayout, Gtk.CellLayout, Gtk.CellEditable {
+	public class ComboBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.CellLayout, Gtk.CellEditable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ComboBox ();
 		public void append_text (string text);
@@ -1052,7 +1055,7 @@ namespace Gtk {
 		public virtual signal void popup ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ComboBoxEntry : Gtk.ComboBox, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.CellLayout, Gtk.CellEditable {
+	public class ComboBoxEntry : Gtk.ComboBox, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.CellLayout, Gtk.CellEditable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ComboBoxEntry ();
 		public int get_text_column ();
@@ -1064,7 +1067,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.ExtendedLayout {
+	public class Container : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public weak Gtk.Widget focus_child;
 		public uint has_focus_chain;
 		public uint need_resize;
@@ -1121,7 +1124,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.ExtendedLayout {
+	public class Dialog : Gtk.Window, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public weak Gtk.HButtonBox action_area;
 		public weak Gtk.Widget separator;
 		public weak Gtk.VBox vbox;
@@ -1150,13 +1153,13 @@ namespace Gtk {
 		public virtual signal void response (int response_id);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class DrawingArea : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout {
+	public class DrawingArea : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public void* draw_data;
 		[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.ExtendedLayout, Gtk.Editable, Gtk.CellEditable {
+	public class Entry : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Editable, Gtk.CellEditable {
 		public int ascent;
 		public uint blink_timeout;
 		public uint button;
@@ -1399,7 +1402,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.ExtendedLayout {
+	public class EventBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public EventBox ();
 		public bool get_above_child ();
@@ -1410,7 +1413,7 @@ namespace Gtk {
 		public bool visible_window { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Expander : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout {
+	public class Expander : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Expander (string label);
 		public bool get_expanded ();
@@ -1436,7 +1439,7 @@ namespace Gtk {
 		public virtual signal void activate ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FileChooserButton : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.Orientable, Gtk.FileChooser {
+	public class FileChooserButton : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable, Gtk.FileChooser {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public FileChooserButton (string title, Gtk.FileChooserAction action);
 		public bool get_focus_on_click ();
@@ -1454,12 +1457,12 @@ namespace Gtk {
 		public virtual signal void file_set ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FileChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.FileChooser {
+	public class FileChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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.ExtendedLayout, Gtk.Orientable, Gtk.FileChooser, Gtk.FileChooserEmbed {
+	public class FileChooserWidget : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable, Gtk.FileChooser, Gtk.FileChooserEmbed {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public FileChooserWidget (Gtk.FileChooserAction action);
 	}
@@ -1486,7 +1489,7 @@ namespace Gtk {
 		public weak string uri;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Fixed : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout {
+	public class Fixed : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public weak GLib.List<Gtk.Widget> children;
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Fixed ();
@@ -1501,7 +1504,7 @@ namespace Gtk {
 		public int y;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FontButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.Activatable {
+	public class FontButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public FontButton ();
 		public unowned string get_font_name ();
@@ -1527,7 +1530,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.ExtendedLayout, Gtk.Orientable {
+	public class FontSelection : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
 		public weak Pango.FontFace face;
 		public weak Gtk.Widget face_list;
 		public weak Pango.FontFamily family;
@@ -1561,7 +1564,7 @@ namespace Gtk {
 		public string preview_text { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class FontSelectionDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout {
+	public class FontSelectionDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public weak Gtk.Widget action_area;
 		public weak Gtk.Widget apply_button;
 		public bool auto_resize;
@@ -1580,7 +1583,7 @@ namespace Gtk {
 		public void set_preview_text (string text);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Frame : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout {
+	public class Frame : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public Gtk.Allocation child_allocation;
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Frame (string? label);
@@ -1605,27 +1608,27 @@ namespace Gtk {
 		public Gtk.ShadowType shadow_type { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class HBox : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.Orientable {
+	public class HBox : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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.ExtendedLayout, Gtk.Orientable {
+	public class HButtonBox : Gtk.ButtonBox, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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.ExtendedLayout, Gtk.Orientable {
+	public class HPaned : Gtk.Paned, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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.ExtendedLayout, Gtk.Orientable {
+	public class HRuler : Gtk.Ruler, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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.ExtendedLayout {
+	public class HSV : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public HSV ();
 		public void get_color (double h, double s, double v);
@@ -1638,24 +1641,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.ExtendedLayout, Gtk.Orientable {
+	public class HScale : Gtk.Scale, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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.ExtendedLayout, Gtk.Orientable {
+	public class HScrollbar : Gtk.Scrollbar, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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.ExtendedLayout, Gtk.Orientable {
+	public class HSeparator : Gtk.Separator, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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.ExtendedLayout {
+	public class HandleBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public Gtk.Allocation attach_allocation;
 		public weak Gdk.Window bin_window;
 		public int deskoff_x;
@@ -1752,6 +1755,7 @@ namespace Gtk {
 		public unowned string get_filename ();
 		public Gdk.Pixbuf load_icon () throws GLib.Error;
 		public unowned Gdk.Pixbuf load_symbolic (Gdk.Color fg, Gdk.Color success_color, Gdk.Color warning_color, Gdk.Color error_color, bool was_symbolic) throws GLib.Error;
+		public unowned Gdk.Pixbuf load_symbolic_for_style (Gtk.Style style, Gtk.StateType state, bool was_symbolic) throws GLib.Error;
 		public void set_raw_coordinates (bool raw_coordinates);
 	}
 	[Compact]
@@ -1818,7 +1822,7 @@ namespace Gtk {
 		public virtual signal void changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class IconView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.CellLayout {
+	public class IconView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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);
@@ -1905,7 +1909,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.ExtendedLayout {
+	public class Image : Gtk.Misc, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Image ();
 		public void clear ();
@@ -2004,7 +2008,7 @@ namespace Gtk {
 		public weak Gdk.Image image;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ImageMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.Activatable {
+	public class ImageMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ImageMenuItem ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -2041,7 +2045,7 @@ namespace Gtk {
 		public weak string stock_id;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class InfoBar : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.Orientable {
+	public class InfoBar : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public InfoBar ();
 		public void add_action_widget (Gtk.Widget child, int response_id);
@@ -2061,7 +2065,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.ExtendedLayout {
+	public class Invisible : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public bool has_user_ref_count;
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Invisible ();
@@ -2072,7 +2076,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.ExtendedLayout {
+	public class Item : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		[HasEmitter]
 		public virtual signal void deselect ();
 		[HasEmitter]
@@ -2081,7 +2085,7 @@ namespace Gtk {
 		public virtual signal void toggle ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Label : Gtk.Misc, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout {
+	public class Label : Gtk.Misc, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public weak Pango.AttrList attrs;
 		public weak Pango.AttrList effective_attrs;
 		public uint have_transform;
@@ -2172,7 +2176,7 @@ namespace Gtk {
 	public class LabelSelectionInfo {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Layout : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout {
+	public class Layout : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public weak Gdk.Window bin_window;
 		public weak GLib.List<Gtk.Widget> children;
 		public uint freeze_count;
@@ -2199,7 +2203,7 @@ 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.ExtendedLayout, Gtk.Activatable {
+	public class LinkButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public LinkButton (string uri);
 		public unowned string get_uri ();
@@ -2254,7 +2258,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.ExtendedLayout {
+	public class Menu : Gtk.MenuShell, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public weak Gdk.Window bin_window;
 		public uint lower_arrow_prelight;
 		public uint lower_arrow_visible;
@@ -2321,7 +2325,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.ExtendedLayout {
+	public class MenuBar : Gtk.MenuShell, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public MenuBar ();
 		public Gtk.PackDirection get_child_pack_direction ();
@@ -2332,7 +2336,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.ExtendedLayout, Gtk.Activatable {
+	public class MenuItem : Gtk.Item, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
 		public uint16 accelerator_width;
 		public weak Gdk.Window event_window;
 		public uint from_menubar;
@@ -2373,7 +2377,7 @@ namespace Gtk {
 		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.ExtendedLayout {
+	public class MenuShell : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public uint32 activate_time;
 		public uint active;
 		public weak Gtk.Widget active_menu_item;
@@ -2409,7 +2413,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.ExtendedLayout, Gtk.Activatable {
+	public class MenuToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
 		public MenuToolButton (Gtk.Widget? icon_widget, string? label);
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
@@ -2422,7 +2426,7 @@ namespace Gtk {
 		public virtual signal void show_menu ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class MessageDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout {
+	public class MessageDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public weak Gtk.Widget label;
 		[PrintfFormat]
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -2449,7 +2453,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.ExtendedLayout {
+	public class Misc : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public void get_alignment (float xalign, float yalign);
 		public void get_padding (int xpad, int ypad);
 		public void set_alignment (float xalign, float yalign);
@@ -2477,7 +2481,7 @@ namespace Gtk {
 		public Gdk.Screen screen { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Notebook : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout {
+	public class Notebook : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public uint button;
 		public uint child_has_focus;
 		public weak GLib.List children;
@@ -2574,7 +2578,7 @@ namespace Gtk {
 		public virtual signal void destroy ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class OffscreenWindow : Gtk.Window, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout {
+	public class OffscreenWindow : Gtk.Window, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public OffscreenWindow ();
 		public unowned Gdk.Pixbuf get_pixbuf ();
@@ -2618,7 +2622,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.ExtendedLayout, Gtk.Orientable {
+	public class Paned : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
 		public weak Gtk.Widget child1;
 		public uint child1_resize;
 		public uint child1_shrink;
@@ -2693,7 +2697,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.ExtendedLayout {
+	public class Plug : Gtk.Window, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public weak GLib.HashTable grabbed_keys;
 		public weak Gtk.WindowGroup modality_group;
 		public weak Gtk.Widget modality_window;
@@ -2878,7 +2882,7 @@ namespace Gtk {
 		public void unset (string key);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ProgressBar : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout {
+	public class ProgressBar : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public uint activity_blocks;
 		public uint activity_dir;
 		public uint activity_mode;
@@ -2933,7 +2937,7 @@ 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.ExtendedLayout, Gtk.Activatable {
+	public class RadioButton : Gtk.CheckButton, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public RadioButton (GLib.SList<Gtk.RadioButton>? group);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -2952,7 +2956,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.ExtendedLayout, Gtk.Activatable {
+	public class RadioMenuItem : Gtk.CheckMenuItem, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public RadioMenuItem (GLib.SList<Gtk.RadioMenuItem> group);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -2971,7 +2975,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.ExtendedLayout, Gtk.Activatable {
+	public class RadioToolButton : Gtk.ToggleToolButton, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
 		public RadioToolButton (GLib.SList<Gtk.RadioToolButton>? group);
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
@@ -2985,7 +2989,7 @@ namespace Gtk {
 		public Gtk.RadioToolButton group { set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Range : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.Orientable {
+	public class Range : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
 		public weak Gdk.Window event_window;
 		public uint flippable;
 		public uint has_stepper_a;
@@ -3120,14 +3124,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.ExtendedLayout, Gtk.RecentChooser {
+	public class RecentChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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.ExtendedLayout, Gtk.RecentChooser, Gtk.Activatable {
+	public class RecentChooserMenu : Gtk.Menu, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.RecentChooser, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public RecentChooserMenu ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -3145,7 +3149,7 @@ namespace Gtk {
 		public bool show_numbers { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class RecentChooserWidget : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.Orientable, Gtk.RecentChooser {
+	public class RecentChooserWidget : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable, Gtk.RecentChooser {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public RecentChooserWidget ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -3227,7 +3231,7 @@ namespace Gtk {
 		public virtual signal void changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Ruler : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.Orientable {
+	public class Ruler : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
 		public weak Gdk.Pixmap backing_store;
 		public weak Gdk.GC non_gr_exp_gc;
 		public int slider_size;
@@ -3263,7 +3267,7 @@ namespace Gtk {
 		public weak int[] subdivide;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Scale : Gtk.Range, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.Orientable {
+	public class Scale : Gtk.Range, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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);
@@ -3284,7 +3288,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.ExtendedLayout, Gtk.Activatable, Gtk.Orientable {
+	public class ScaleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable, Gtk.Orientable {
 		public weak Gtk.Widget minus_button;
 		public weak Gtk.Widget plus_button;
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -3309,12 +3313,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.ExtendedLayout, Gtk.Orientable {
+	public class Scrollbar : Gtk.Range, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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.ExtendedLayout {
+	public class ScrolledWindow : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public uint focus_out;
 		public weak Gtk.Widget hscrollbar;
 		public uint hscrollbar_visible;
@@ -3385,17 +3389,17 @@ namespace Gtk {
 		public bool targets_include_uri ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Separator : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.Orientable {
+	public class Separator : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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.ExtendedLayout, Gtk.Activatable {
+	public class SeparatorMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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.ExtendedLayout, Gtk.Activatable {
+	public class SeparatorToolItem : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
 		public SeparatorToolItem ();
 		public bool get_draw ();
@@ -3557,7 +3561,7 @@ namespace Gtk {
 		public Gtk.SizeGroupMode mode { get; set; }
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Socket : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout {
+	public class Socket : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public weak Gtk.AccelGroup accel_group;
 		public uint active;
 		public uint16 current_height;
@@ -3582,7 +3586,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.ExtendedLayout, Gtk.Editable, Gtk.CellEditable {
+	public class SpinButton : Gtk.Entry, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Editable, Gtk.CellEditable {
 		public uint button;
 		public uint click_child;
 		public uint in_child;
@@ -3633,7 +3637,7 @@ namespace Gtk {
 		public virtual signal void wrapped ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Spinner : Gtk.DrawingArea, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout {
+	public class Spinner : Gtk.DrawingArea, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public Spinner ();
 		public void start ();
@@ -3718,7 +3722,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.ExtendedLayout, Gtk.Orientable {
+	public class Statusbar : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Orientable {
 		public weak Gtk.Widget frame;
 		public weak Gdk.Window grip_window;
 		public weak GLib.SList keys;
@@ -3853,7 +3857,7 @@ namespace Gtk {
 		public virtual signal void unrealize ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Table : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout {
+	public class Table : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public weak GLib.List children;
 		public weak Gtk.TableRowCol cols;
 		public uint16 ncols;
@@ -3937,7 +3941,7 @@ namespace Gtk {
 		public Gdk.Atom target;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class TearoffMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.Activatable {
+	public class TearoffMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
 		public uint torn_off;
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public TearoffMenuItem ();
@@ -4298,7 +4302,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.ExtendedLayout {
+	public class TextView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public uint blink_timeout;
 		public weak Gtk.TextWindow bottom_window;
 		public weak GLib.SList children;
@@ -4453,7 +4457,7 @@ namespace Gtk {
 		public virtual signal void toggled ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ToggleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.Activatable {
+	public class ToggleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ToggleButton ();
 		public bool get_active ();
@@ -4474,7 +4478,7 @@ namespace Gtk {
 		public virtual signal void toggled ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ToggleToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.Activatable {
+	public class ToggleToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
 		public ToggleToolButton ();
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
@@ -4485,7 +4489,7 @@ namespace Gtk {
 		public virtual signal void toggled ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ToolButton : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.Activatable {
+	public class ToolButton : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
 		public ToolButton (Gtk.Widget? icon_widget, string? label);
 		[CCode (type = "GtkToolItem*", has_construct_function = false)]
@@ -4511,7 +4515,7 @@ namespace Gtk {
 		public virtual signal void clicked ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class ToolItem : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout, Gtk.Activatable {
+	public class ToolItem : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.Activatable {
 		[CCode (has_construct_function = false)]
 		public ToolItem ();
 		public Pango.EllipsizeMode get_ellipsize_mode ();
@@ -4547,7 +4551,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.ExtendedLayout, Gtk.ToolShell {
+	public class ToolItemGroup : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.ToolShell {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ToolItemGroup (string label);
 		public bool get_collapsed ();
@@ -4573,7 +4577,7 @@ 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.ExtendedLayout, Gtk.Orientable {
+	public class ToolPalette : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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);
@@ -4605,7 +4609,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.ExtendedLayout, Gtk.ToolShell, Gtk.Orientable {
+	public class Toolbar : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, Gtk.ToolShell, Gtk.Orientable {
 		public int button_maxh;
 		public int button_maxw;
 		public weak GLib.List children;
@@ -4820,7 +4824,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.ExtendedLayout {
+	public class TreeView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public TreeView ();
 		public int append_column (Gtk.TreeViewColumn column);
@@ -5076,44 +5080,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.ExtendedLayout, Gtk.Orientable {
+	public class VBox : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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.ExtendedLayout, Gtk.Orientable {
+	public class VButtonBox : Gtk.ButtonBox, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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.ExtendedLayout, Gtk.Orientable {
+	public class VPaned : Gtk.Paned, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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.ExtendedLayout, Gtk.Orientable {
+	public class VRuler : Gtk.Ruler, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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.ExtendedLayout, Gtk.Orientable {
+	public class VScale : Gtk.Scale, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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.ExtendedLayout, Gtk.Orientable {
+	public class VScrollbar : Gtk.Scrollbar, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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.ExtendedLayout, Gtk.Orientable {
+	public class VSeparator : Gtk.Separator, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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.ExtendedLayout {
+	public class Viewport : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public weak Gdk.Window bin_window;
 		public weak Gdk.Window view_window;
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -5132,12 +5136,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.ExtendedLayout, Gtk.Activatable, Gtk.Orientable {
+	public class VolumeButton : Gtk.ScaleButton, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest, 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.ExtendedLayout {
+	public class Widget : Gtk.Object, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public Gtk.Allocation allocation;
 		public Gtk.Requisition requisition;
 		public uchar saved_state;
@@ -5455,7 +5459,7 @@ namespace Gtk {
 		public weak Gdk.Bitmap shape_mask;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class Window : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.ExtendedLayout {
+	public class Window : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SizeRequest {
 		public uint configure_notify_received;
 		public uint16 configure_request_count;
 		public weak Gtk.Widget default_widget;
@@ -5716,15 +5720,6 @@ namespace Gtk {
 		public signal void insert_text (string text, int length, void* position);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public interface ExtendedLayout : Gtk.Object {
-		public abstract void get_desired_height (int minimum_height, int natural_height);
-		public void get_desired_size (bool request_natural, Gtk.Requisition minimum_size, Gtk.Requisition natural_size);
-		public abstract void get_desired_width (int minimum_width, int natural_width);
-		public abstract void get_height_for_width (int width, int minimum_height, int natural_height);
-		public abstract void get_width_for_height (int height, int minimum_width, int natural_width);
-		public abstract bool is_height_for_width ();
-	}
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public interface FileChooser : Gtk.Widget {
 		public void add_filter (Gtk.FileFilter filter);
 		public bool add_shortcut_folder (string folder) throws GLib.Error;
@@ -5869,6 +5864,15 @@ 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 ();
@@ -6781,6 +6785,11 @@ namespace Gtk {
 		VERTICAL,
 		BOTH
 	}
+	[CCode (cprefix = "GTK_SIZE_REQUEST_", cheader_filename = "gtk/gtk.h")]
+	public enum SizeRequestMode {
+		HEIGHT_FOR_WIDTH,
+		WIDTH_FOR_HEIGHT
+	}
 	[CCode (cprefix = "GTK_SORT_", cheader_filename = "gtk/gtk.h")]
 	public enum SortType {
 		ASCENDING,
diff --git a/vapi/packages/gdk-3.0/gdk-3.0.gi b/vapi/packages/gdk-3.0/gdk-3.0.gi
index 21c0efa..42906b9 100644
--- a/vapi/packages/gdk-3.0/gdk-3.0.gi
+++ b/vapi/packages/gdk-3.0/gdk-3.0.gi
@@ -1015,7 +1015,7 @@
 				<parameter name="flags" type="GSpawnFlags"/>
 				<parameter name="child_setup" type="GSpawnChildSetupFunc"/>
 				<parameter name="user_data" type="gpointer"/>
-				<parameter name="child_pid" type="gint*"/>
+				<parameter name="child_pid" type="GPid*"/>
 				<parameter name="error" type="GError**"/>
 			</parameters>
 		</function>
@@ -1029,7 +1029,7 @@
 				<parameter name="flags" type="GSpawnFlags"/>
 				<parameter name="child_setup" type="GSpawnChildSetupFunc"/>
 				<parameter name="user_data" type="gpointer"/>
-				<parameter name="child_pid" type="gint*"/>
+				<parameter name="child_pid" type="GPid*"/>
 				<parameter name="standard_input" type="gint*"/>
 				<parameter name="standard_output" type="gint*"/>
 				<parameter name="standard_error" type="gint*"/>
@@ -2940,94 +2940,6 @@
 			<property name="n-axes" type="guint" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
 			<property name="type" type="GdkDeviceType" readable="1" writable="1" construct="0" construct-only="1"/>
-			<vfunc name="get_history">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="device" type="GdkDevice*"/>
-					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="start" type="guint32"/>
-					<parameter name="stop" type="guint32"/>
-					<parameter name="events" type="GdkTimeCoord***"/>
-					<parameter name="n_events" type="guint*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_state">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="device" type="GdkDevice*"/>
-					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="axes" type="gdouble*"/>
-					<parameter name="mask" type="GdkModifierType*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="grab">
-				<return-type type="GdkGrabStatus"/>
-				<parameters>
-					<parameter name="device" type="GdkDevice*"/>
-					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="owner_events" type="gboolean"/>
-					<parameter name="event_mask" type="GdkEventMask"/>
-					<parameter name="confine_to" type="GdkWindow*"/>
-					<parameter name="cursor" type="GdkCursor*"/>
-					<parameter name="time_" type="guint32"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="query_state">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="device" type="GdkDevice*"/>
-					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="root_window" type="GdkWindow**"/>
-					<parameter name="child_window" type="GdkWindow**"/>
-					<parameter name="root_x" type="gint*"/>
-					<parameter name="root_y" type="gint*"/>
-					<parameter name="win_x" type="gint*"/>
-					<parameter name="win_y" type="gint*"/>
-					<parameter name="mask" type="GdkModifierType*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="select_window_events">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="device" type="GdkDevice*"/>
-					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="event_mask" type="GdkEventMask"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="set_window_cursor">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="device" type="GdkDevice*"/>
-					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="cursor" type="GdkCursor*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="ungrab">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="device" type="GdkDevice*"/>
-					<parameter name="time_" type="guint32"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="warp">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="device" type="GdkDevice*"/>
-					<parameter name="screen" type="GdkScreen*"/>
-					<parameter name="x" type="gint"/>
-					<parameter name="y" type="gint"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="window_at_position">
-				<return-type type="GdkWindow*"/>
-				<parameters>
-					<parameter name="device" type="GdkDevice*"/>
-					<parameter name="win_x" type="gint*"/>
-					<parameter name="win_y" type="gint*"/>
-					<parameter name="mask" type="GdkModifierType*"/>
-					<parameter name="get_toplevel" type="gboolean"/>
-				</parameters>
-			</vfunc>
 			<field name="name" type="gchar*"/>
 			<field name="source" type="GdkInputSource"/>
 			<field name="mode" type="GdkInputMode"/>
@@ -3472,6 +3384,12 @@
 					<parameter name="context" type="GdkDragContext*"/>
 				</parameters>
 			</method>
+			<method name="get_source_window" symbol="gdk_drag_context_get_source_window">
+				<return-type type="GdkWindow*"/>
+				<parameters>
+					<parameter name="context" type="GdkDragContext*"/>
+				</parameters>
+			</method>
 			<method name="get_suggested_action" symbol="gdk_drag_context_get_suggested_action">
 				<return-type type="GdkDragAction"/>
 				<parameters>
diff --git a/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.gi b/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.gi
index 17c84cd..d534ad1 100644
--- a/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.gi
+++ b/vapi/packages/gdk-pixbuf-3.0/gdk-pixbuf-3.0.gi
@@ -755,9 +755,9 @@
 		<constant name="GDK_PIXBUF_FEATURES_H" type="int" value="1"/>
 		<constant name="GDK_PIXBUF_MAGIC_NUMBER" type="int" value="1197763408"/>
 		<constant name="GDK_PIXBUF_MAJOR" type="int" value="2"/>
-		<constant name="GDK_PIXBUF_MICRO" type="int" value="3"/>
+		<constant name="GDK_PIXBUF_MICRO" type="int" value="4"/>
 		<constant name="GDK_PIXBUF_MINOR" type="int" value="90"/>
-		<constant name="GDK_PIXBUF_VERSION" type="char*" value="2.90.3"/>
+		<constant name="GDK_PIXBUF_VERSION" type="char*" value="2.90.4"/>
 		<constant name="GDK_PIXDATA_HEADER_LENGTH" type="int" value="24"/>
 	</namespace>
 </api>
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.gi b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
index ddc7d5a..b7ce113 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.gi
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.gi
@@ -2046,27 +2046,6 @@
 			<field name="start" type="gint"/>
 			<field name="end" type="gint"/>
 		</struct>
-		<struct name="GtkProgress">
-			<field name="widget" type="GtkWidget"/>
-			<field name="adjustment" type="GtkAdjustment*"/>
-			<field name="offscreen_pixmap" type="GdkPixmap*"/>
-			<field name="format" type="gchar*"/>
-			<field name="x_align" type="gfloat"/>
-			<field name="y_align" type="gfloat"/>
-			<field name="show_text" type="guint"/>
-			<field name="activity_mode" type="guint"/>
-			<field name="use_text_format" type="guint"/>
-		</struct>
-		<struct name="GtkProgressClass">
-			<field name="parent_class" type="GtkWidgetClass"/>
-			<field name="paint" type="GCallback"/>
-			<field name="update" type="GCallback"/>
-			<field name="act_mode_enter" type="GCallback"/>
-			<field name="_gtk_reserved1" type="GCallback"/>
-			<field name="_gtk_reserved2" type="GCallback"/>
-			<field name="_gtk_reserved3" type="GCallback"/>
-			<field name="_gtk_reserved4" type="GCallback"/>
-		</struct>
 		<struct name="GtkRadioActionEntry">
 			<field name="name" type="gchar*"/>
 			<field name="stock_id" type="gchar*"/>
@@ -2355,6 +2334,16 @@
 					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
+			<method name="load_symbolic_for_style" symbol="gtk_icon_info_load_symbolic_for_style">
+				<return-type type="GdkPixbuf*"/>
+				<parameters>
+					<parameter name="icon_info" type="GtkIconInfo*"/>
+					<parameter name="style" type="GtkStyle*"/>
+					<parameter name="state" type="GtkStateType"/>
+					<parameter name="was_symbolic" type="gboolean*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
 			<constructor name="new_for_pixbuf" symbol="gtk_icon_info_new_for_pixbuf">
 				<return-type type="GtkIconInfo*"/>
 				<parameters>
@@ -4437,6 +4426,10 @@
 			<member name="GTK_SIZE_GROUP_VERTICAL" value="2"/>
 			<member name="GTK_SIZE_GROUP_BOTH" value="3"/>
 		</enum>
+		<enum name="GtkSizeRequestMode" type-name="GtkSizeRequestMode" get-type="gtk_size_request_mode_get_type">
+			<member name="GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH" value="0"/>
+			<member name="GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT" value="1"/>
+		</enum>
 		<enum name="GtkSortType" type-name="GtkSortType" get-type="gtk_sort_type_get_type">
 			<member name="GTK_SORT_ASCENDING" value="0"/>
 			<member name="GTK_SORT_DESCENDING" value="1"/>
@@ -4708,7 +4701,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_artists" symbol="gtk_about_dialog_get_artists">
 				<return-type type="gchar**"/>
@@ -5045,7 +5038,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_accel_widget" symbol="gtk_accel_label_get_accel_widget">
 				<return-type type="GtkWidget*"/>
@@ -5891,7 +5884,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_padding" symbol="gtk_alignment_get_padding">
 				<return-type type="void"/>
@@ -5946,6 +5939,9 @@
 			<field name="yscale" type="gfloat"/>
 		</object>
 		<object name="GtkApplication" parent="GApplication" type-name="GtkApplication" get-type="gtk_application_get_type">
+			<implements>
+				<interface name="GInitable"/>
+			</implements>
 			<method name="add_window" symbol="gtk_application_add_window">
 				<return-type type="void"/>
 				<parameters>
@@ -5953,6 +5949,12 @@
 					<parameter name="window" type="GtkWindow*"/>
 				</parameters>
 			</method>
+			<method name="create_window" symbol="gtk_application_create_window">
+				<return-type type="GtkWindow*"/>
+				<parameters>
+					<parameter name="app" type="GtkApplication*"/>
+				</parameters>
+			</method>
 			<method name="get_window" symbol="gtk_application_get_window">
 				<return-type type="GtkWindow*"/>
 				<parameters>
@@ -5962,9 +5964,9 @@
 			<constructor name="new" symbol="gtk_application_new">
 				<return-type type="GtkApplication*"/>
 				<parameters>
+					<parameter name="appid" type="gchar*"/>
 					<parameter name="argc" type="gint*"/>
 					<parameter name="argv" type="gchar***"/>
-					<parameter name="appid" type="gchar*"/>
 				</parameters>
 			</constructor>
 			<method name="quit" symbol="gtk_application_quit">
@@ -5986,19 +5988,38 @@
 					<parameter name="group" type="GtkActionGroup*"/>
 				</parameters>
 			</method>
+			<signal name="action" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="application" 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="args" type="GVariant*"/>
+					<parameter name="args" type="GVariant"/>
 				</parameters>
 			</signal>
+			<signal name="quit" when="LAST">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="application" type="GtkApplication*"/>
+				</parameters>
+			</signal>
+			<vfunc name="create_window">
+				<return-type type="GtkWindow*"/>
+				<parameters>
+					<parameter name="application" type="GtkApplication*"/>
+				</parameters>
+			</vfunc>
 		</object>
 		<object name="GtkArrow" parent="GtkMisc" type-name="GtkArrow" get-type="gtk_arrow_get_type">
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<constructor name="new" symbol="gtk_arrow_new">
 				<return-type type="GtkWidget*"/>
@@ -6024,7 +6045,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<constructor name="new" symbol="gtk_aspect_frame_new">
 				<return-type type="GtkWidget*"/>
@@ -6060,7 +6081,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="add_action_widget" symbol="gtk_assistant_add_action_widget">
 				<return-type type="void"/>
@@ -6259,7 +6280,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_child" symbol="gtk_bin_get_child">
 				<return-type type="GtkWidget*"/>
@@ -6273,7 +6294,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="get_homogeneous" symbol="gtk_box_get_homogeneous">
@@ -6490,7 +6511,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="clicked" symbol="gtk_button_clicked">
@@ -6689,7 +6710,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="get_child_secondary" symbol="gtk_button_box_get_child_secondary">
@@ -6737,7 +6758,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="clear_marks" symbol="gtk_calendar_clear_marks">
 				<return-type type="void"/>
@@ -6773,7 +6794,7 @@
 				</parameters>
 			</method>
 			<method name="mark_day" symbol="gtk_calendar_mark_day">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="calendar" type="GtkCalendar*"/>
 					<parameter name="day" type="guint"/>
@@ -6790,7 +6811,7 @@
 				</parameters>
 			</method>
 			<method name="select_month" symbol="gtk_calendar_select_month">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="calendar" type="GtkCalendar*"/>
 					<parameter name="month" type="guint"/>
@@ -6828,7 +6849,7 @@
 				</parameters>
 			</method>
 			<method name="unmark_day" symbol="gtk_calendar_unmark_day">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="calendar" type="GtkCalendar*"/>
 					<parameter name="day" type="guint"/>
@@ -7369,7 +7390,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkCellLayout"/>
 			</implements>
 			<method name="get_displayed_row" symbol="gtk_cell_view_get_displayed_row">
@@ -7443,7 +7464,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_check_button_new">
@@ -7473,7 +7494,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_active" symbol="gtk_check_menu_item_get_active">
@@ -7776,7 +7797,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_alpha" symbol="gtk_color_button_get_alpha">
@@ -7856,7 +7877,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="get_current_alpha" symbol="gtk_color_selection_get_current_alpha">
@@ -7984,7 +8005,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_color_selection" symbol="gtk_color_selection_dialog_get_color_selection">
 				<return-type type="GtkWidget*"/>
@@ -8011,7 +8032,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkCellLayout"/>
 				<interface name="GtkCellEditable"/>
 			</implements>
@@ -8280,7 +8301,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkCellLayout"/>
 				<interface name="GtkCellEditable"/>
 			</implements>
@@ -8316,7 +8337,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="add" symbol="gtk_container_add">
 				<return-type type="void"/>
@@ -8637,7 +8658,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="add_action_widget" symbol="gtk_dialog_add_action_widget">
 				<return-type type="void"/>
@@ -8778,7 +8799,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<constructor name="new" symbol="gtk_drawing_area_new">
 				<return-type type="GtkWidget*"/>
@@ -8789,7 +8810,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkEditable"/>
 				<interface name="GtkCellEditable"/>
 			</implements>
@@ -9745,7 +9766,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_above_child" symbol="gtk_event_box_get_above_child">
 				<return-type type="gboolean"/>
@@ -9783,7 +9804,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_expanded" symbol="gtk_expander_get_expanded">
 				<return-type type="gboolean"/>
@@ -9892,7 +9913,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 				<interface name="GtkFileChooser"/>
 			</implements>
@@ -9963,7 +9984,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkFileChooser"/>
 			</implements>
 			<constructor name="new" symbol="gtk_file_chooser_dialog_new">
@@ -9980,7 +10001,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 				<interface name="GtkFileChooser"/>
 				<interface name="GtkFileChooserEmbed"/>
@@ -10057,7 +10078,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="move" symbol="gtk_fixed_move">
 				<return-type type="void"/>
@@ -10086,7 +10107,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_font_name" symbol="gtk_font_button_get_font_name">
@@ -10193,7 +10214,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="get_face" symbol="gtk_font_selection_get_face">
@@ -10295,7 +10316,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_cancel_button" symbol="gtk_font_selection_dialog_get_cancel_button">
 				<return-type type="GtkWidget*"/>
@@ -10354,7 +10375,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_label" symbol="gtk_frame_get_label">
 				<return-type type="gchar*"/>
@@ -10440,7 +10461,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_hbox_new">
@@ -10455,7 +10476,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_hbutton_box_new">
@@ -10466,7 +10487,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_hpaned_new">
@@ -10477,7 +10498,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_hruler_new">
@@ -10488,7 +10509,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_color" symbol="gtk_hsv_get_color">
 				<return-type type="void"/>
@@ -10562,7 +10583,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_hscale_new">
@@ -10584,7 +10605,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_hscrollbar_new">
@@ -10598,7 +10619,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_hseparator_new">
@@ -10609,7 +10630,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_child_detached" symbol="gtk_handle_box_get_child_detached">
 				<return-type type="gboolean"/>
@@ -11130,7 +11151,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<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">
@@ -11640,7 +11661,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="clear" symbol="gtk_image_clear">
 				<return-type type="void"/>
@@ -11881,7 +11902,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_always_show_image" symbol="gtk_image_menu_item_get_always_show_image">
@@ -11962,7 +11983,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="add_action_widget" symbol="gtk_info_bar_add_action_widget">
@@ -12063,7 +12084,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_screen" symbol="gtk_invisible_get_screen">
 				<return-type type="GdkScreen*"/>
@@ -12095,7 +12116,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="deselect" symbol="gtk_item_deselect">
 				<return-type type="void"/>
@@ -12138,7 +12159,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_angle" symbol="gtk_label_get_angle">
 				<return-type type="gdouble"/>
@@ -12509,7 +12530,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_bin_window" symbol="gtk_layout_get_bin_window">
 				<return-type type="GdkWindow*"/>
@@ -12611,7 +12632,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_uri" symbol="gtk_link_button_get_uri">
@@ -12852,7 +12873,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="attach" symbol="gtk_menu_attach">
 				<return-type type="void"/>
@@ -13085,7 +13106,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_child_pack_direction" symbol="gtk_menu_bar_get_child_pack_direction">
 				<return-type type="GtkPackDirection"/>
@@ -13123,7 +13144,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="activate" symbol="gtk_menu_item_activate">
@@ -13299,7 +13320,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="activate_item" symbol="gtk_menu_shell_activate_item">
 				<return-type type="void"/>
@@ -13461,7 +13482,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_menu" symbol="gtk_menu_tool_button_get_menu">
@@ -13516,7 +13537,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="format_secondary_markup" symbol="gtk_message_dialog_format_secondary_markup">
 				<return-type type="void"/>
@@ -13586,7 +13607,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_alignment" symbol="gtk_misc_get_alignment">
 				<return-type type="void"/>
@@ -13676,7 +13697,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="append_page" symbol="gtk_notebook_append_page">
 				<return-type type="gint"/>
@@ -14116,7 +14137,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_pixbuf" symbol="gtk_offscreen_window_get_pixbuf">
 				<return-type type="GdkPixbuf*"/>
@@ -14318,7 +14339,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="add1" symbol="gtk_paned_add1">
@@ -14461,7 +14482,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="construct" symbol="gtk_plug_construct">
 				<return-type type="void"/>
@@ -15415,7 +15436,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_ellipsize" symbol="gtk_progress_bar_get_ellipsize">
 				<return-type type="PangoEllipsizeMode"/>
@@ -15604,7 +15625,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_group" symbol="gtk_radio_button_get_group">
@@ -15673,7 +15694,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_group" symbol="gtk_radio_menu_item_get_group">
@@ -15742,7 +15763,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_group" symbol="gtk_radio_tool_button_get_group">
@@ -15790,7 +15811,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="get_adjustment" symbol="gtk_range_get_adjustment">
@@ -16143,7 +16164,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkRecentChooser"/>
 			</implements>
 			<constructor name="new" symbol="gtk_recent_chooser_dialog_new">
@@ -16168,7 +16189,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkRecentChooser"/>
 				<interface name="GtkActivatable"/>
 			</implements>
@@ -16212,7 +16233,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 				<interface name="GtkRecentChooser"/>
 			</implements>
@@ -16405,7 +16426,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="draw_pos" symbol="gtk_ruler_draw_pos">
@@ -16491,7 +16512,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="add_mark" symbol="gtk_scale_add_mark">
@@ -16610,7 +16631,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 				<interface name="GtkOrientable"/>
 			</implements>
@@ -16705,7 +16726,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_scrollbar_new">
@@ -16720,7 +16741,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="add_with_viewport" symbol="gtk_scrolled_window_add_with_viewport">
 				<return-type type="void"/>
@@ -16858,7 +16879,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_separator_new">
@@ -16872,7 +16893,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_separator_menu_item_new">
@@ -16883,7 +16904,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_draw" symbol="gtk_separator_tool_item_get_draw">
@@ -17092,7 +17113,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="add_id" symbol="gtk_socket_add_id">
 				<return-type type="void"/>
@@ -17148,7 +17169,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkEditable"/>
 				<interface name="GtkCellEditable"/>
 			</implements>
@@ -17380,7 +17401,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<constructor name="new" symbol="gtk_spinner_new">
 				<return-type type="GtkWidget*"/>
@@ -17706,7 +17727,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="get_context_id" symbol="gtk_statusbar_get_context_id">
@@ -18318,7 +18339,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="attach" symbol="gtk_table_attach">
 				<return-type type="void"/>
@@ -18449,7 +18470,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_tearoff_menu_item_new">
@@ -19415,7 +19436,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="add_child_at_anchor" symbol="gtk_text_view_add_child_at_anchor">
 				<return-type type="void"/>
@@ -20093,7 +20114,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_active" symbol="gtk_toggle_button_get_active">
@@ -20173,7 +20194,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_active" symbol="gtk_toggle_tool_button_get_active">
@@ -20210,7 +20231,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_icon_name" symbol="gtk_tool_button_get_icon_name">
@@ -20321,7 +20342,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 			</implements>
 			<method name="get_ellipsize_mode" symbol="gtk_tool_item_get_ellipsize_mode">
@@ -20520,7 +20541,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkToolShell"/>
 			</implements>
 			<method name="get_collapsed" symbol="gtk_tool_item_group_get_collapsed">
@@ -20648,7 +20669,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<method name="add_drag_dest" symbol="gtk_tool_palette_add_drag_dest">
@@ -20811,7 +20832,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkToolShell"/>
 				<interface name="GtkOrientable"/>
 			</implements>
@@ -21586,7 +21607,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="append_column" symbol="gtk_tree_view_append_column">
 				<return-type type="gint"/>
@@ -23034,7 +23055,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_vbox_new">
@@ -23049,7 +23070,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_vbutton_box_new">
@@ -23060,7 +23081,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_vpaned_new">
@@ -23071,7 +23092,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_vruler_new">
@@ -23082,7 +23103,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_vscale_new">
@@ -23104,7 +23125,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_vscrollbar_new">
@@ -23118,7 +23139,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkOrientable"/>
 			</implements>
 			<constructor name="new" symbol="gtk_vseparator_new">
@@ -23129,7 +23150,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="get_bin_window" symbol="gtk_viewport_get_bin_window">
 				<return-type type="GdkWindow*"/>
@@ -23210,7 +23231,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 				<interface name="GtkActivatable"/>
 				<interface name="GtkOrientable"/>
 			</implements>
@@ -23222,7 +23243,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="activate" symbol="gtk_widget_activate">
 				<return-type type="gboolean"/>
@@ -24932,7 +24953,7 @@
 			<implements>
 				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
-				<interface name="GtkExtendedLayout"/>
+				<interface name="GtkSizeRequest"/>
 			</implements>
 			<method name="activate_default" symbol="gtk_window_activate_default">
 				<return-type type="gboolean"/>
@@ -26356,100 +26377,6 @@
 				</parameters>
 			</vfunc>
 		</interface>
-		<interface name="GtkExtendedLayout" type-name="GtkExtendedLayout" get-type="gtk_extended_layout_get_type">
-			<requires>
-				<interface name="GtkObject"/>
-			</requires>
-			<method name="get_desired_height" symbol="gtk_extended_layout_get_desired_height">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="GtkExtendedLayout*"/>
-					<parameter name="minimum_height" type="gint*"/>
-					<parameter name="natural_height" type="gint*"/>
-				</parameters>
-			</method>
-			<method name="get_desired_size" symbol="gtk_extended_layout_get_desired_size">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="GtkExtendedLayout*"/>
-					<parameter name="request_natural" type="gboolean"/>
-					<parameter name="minimum_size" type="GtkRequisition*"/>
-					<parameter name="natural_size" type="GtkRequisition*"/>
-				</parameters>
-			</method>
-			<method name="get_desired_width" symbol="gtk_extended_layout_get_desired_width">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="GtkExtendedLayout*"/>
-					<parameter name="minimum_width" type="gint*"/>
-					<parameter name="natural_width" type="gint*"/>
-				</parameters>
-			</method>
-			<method name="get_height_for_width" symbol="gtk_extended_layout_get_height_for_width">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="GtkExtendedLayout*"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="minimum_height" type="gint*"/>
-					<parameter name="natural_height" type="gint*"/>
-				</parameters>
-			</method>
-			<method name="get_width_for_height" symbol="gtk_extended_layout_get_width_for_height">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="GtkExtendedLayout*"/>
-					<parameter name="height" type="gint"/>
-					<parameter name="minimum_width" type="gint*"/>
-					<parameter name="natural_width" type="gint*"/>
-				</parameters>
-			</method>
-			<method name="is_height_for_width" symbol="gtk_extended_layout_is_height_for_width">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="layout" type="GtkExtendedLayout*"/>
-				</parameters>
-			</method>
-			<vfunc name="get_desired_height">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="GtkExtendedLayout*"/>
-					<parameter name="minimum_height" type="gint*"/>
-					<parameter name="natural_height" type="gint*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_desired_width">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="GtkExtendedLayout*"/>
-					<parameter name="minimum_width" type="gint*"/>
-					<parameter name="natural_width" type="gint*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_height_for_width">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="GtkExtendedLayout*"/>
-					<parameter name="width" type="gint"/>
-					<parameter name="minimum_height" type="gint*"/>
-					<parameter name="natural_height" type="gint*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="get_width_for_height">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="layout" type="GtkExtendedLayout*"/>
-					<parameter name="height" type="gint"/>
-					<parameter name="minimum_width" type="gint*"/>
-					<parameter name="natural_width" type="gint*"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="is_height_for_width">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="layout" type="GtkExtendedLayout*"/>
-				</parameters>
-			</vfunc>
-		</interface>
 		<interface name="GtkFileChooser" type-name="GtkFileChooser" get-type="gtk_file_chooser_get_type">
 			<requires>
 				<interface name="GtkWidget"/>
@@ -27281,6 +27208,99 @@
 				</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"/>
@@ -27910,13 +27930,13 @@
 				</parameters>
 			</vfunc>
 		</interface>
-		<constant name="GTK_BINARY_AGE" type="int" value="9003"/>
+		<constant name="GTK_BINARY_AGE" type="int" value="9004"/>
 		<constant name="GTK_BUTTONBOX_DEFAULT" type="int" value="-1"/>
 		<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="3"/>
+		<constant name="GTK_MICRO_VERSION" type="int" value="4"/>
 		<constant name="GTK_MINOR_VERSION" type="int" value="90"/>
 		<constant name="GTK_PAPER_NAME_A3" type="char*" value="iso_a3"/>
 		<constant name="GTK_PAPER_NAME_A4" type="char*" value="iso_a4"/>
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index 302b123..22c5a8d 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -45,6 +45,7 @@ gtk_alignment_get_padding.padding_right is_out="1"
 GtkAllocation is_value_type="1"
 gtk_application_new.argc hidden="1"
 gtk_application_new.argv is_array="1" is_ref="1" array_length_pos="0.9"
+GtkApplication::quit has_emitter="1"
 GtkArg.d hidden="1"
 GtkAssistant.apply hidden="1"
 GtkAssistant.cancel hidden="1"



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